modularize config

flake.lock

@@ -467,22 +467,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1732238832,
-        "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -577,7 +561,9 @@
         "flake-utils": "flake-utils_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_2",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",

flake.nix

@@ -19,7 +19,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    stylix.url = "github:danth/stylix";
+    stylix = {
+      url ="github:danth/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     nixvim = {
       url = "github:nix-community/nixvim";
@@ -73,7 +76,7 @@
           attrs.stylix.nixosModules.stylix
           attrs.nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
-          ./hosts
+          ./hosts/Lenni
           ./users/willifan
           ./pkgs
         ];
@@ -104,7 +107,7 @@
           attrs.nixos-hardware.nixosModules.common-cpu-amd
           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
-          ./hosts
+          ./hosts/Puenktchen
           ./users/willifan
           ./pkgs
         ];
@@ -135,7 +138,7 @@
           attrs.nixos-hardware.nixosModules.common-cpu-amd
           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
-          ./hosts
+          ./hosts/Anton
           ./users/willifan
           ./pkgs
         ];
@@ -164,7 +167,7 @@
           attrs.stylix.nixosModules.stylix
           attrs.nixvim.nixosModules.nixvim
           attrs.jovian.nixosModules.default
-          ./hosts
+          ./hosts/Lillie
           ./users/willifan
           ./pkgs
         ];

hosts/Anton/default.nix

@@ -16,6 +16,9 @@
     ./radicale.nix
     ./syncthing.nix
 
+    ../../modules/common
+    ../../modules/server
+
   ];
 
 }

hosts/Lenni/default.nix

@@ -4,5 +4,8 @@
     ./hardware-configuration.nix
     #./disko.nix
     ./syncthing.nix
+
+    ../../modules/common
+    ../../modules/desktop
   ];
 }

hosts/Lillie/default.nix

@@ -3,5 +3,9 @@
   imports = [
     ./hardware-configuration.nix
     ./disko.nix
+
+    ../../modules/common
+    ../../modules/desktop
+
   ];
 }

hosts/Puenktchen/default.nix

@@ -3,8 +3,10 @@
   imports = [
     ./hardware-configuration.nix
     ./disko.nix
-    ./syncthing.nix
+
+    ../../modules/common
+    ../../modules/desktop
+  
   ];
 
-  boot.initrd.kernelModules = [ "amdgpu" ];
 }

hosts/default.nix

@@ -1,8 +0,0 @@
-{ hostname, type, ... }:
-{
-  imports = [
-    ./common
-    ./${type}
-    ./${hostname}
-  ];
-}

modules/common/syncthing.nix

@@ -0,0 +1,70 @@
+{ lib, config, ... }:
+{
+
+  options = {
+
+    syncthing.devices = lib.mkOption {
+      default = { };
+      type = lib.types.attrsOf (lib.types.submodule {
+        options = {
+
+          id = lib.mkOption {
+            type = lib.types.str;
+            default = null;
+          };
+
+        };
+      });
+    };
+  };
+
+  services.syncthing = {
+    enable =  true;
+    user = "willifan";
+    dataDir = "/mnt/data";
+    configDir = "/mnt/data/.config/syncthing";
+    overrideDevices = true;
+    overrideFolders = true;
+    settings = {
+      gui = {
+        user = "willifan";
+        password = "temppassword";
+      };
+      devices = {
+        Anton = { id = "WCDBADD-UPKCACI-X2YJOIO-5QC44PL-DBCR6TS-ADVQV33-HSMF32O-FOKMKAU"; };
+      };
+      folders = {
+        "Documents" = {
+          id = "jtl6g-qjmwo";
+          path = "/mnt/data/Documents";
+          devices = [ "Anton" ];
+        };
+        "Enpass" = {
+          id = "ciksm-xsw4m";
+          path = "/mnt/data/Enpass";
+          devices = [ "Anton" ];
+        };
+        "Pictures" = {
+          id = "po4qj-q9t0t";
+          path = "/mnt/data/Pictures";
+          devices = [ "Anton" ];
+        };
+        "Videos" = {
+          id = "4wqf5-xasng";
+          path = "/mnt/data/Videos";
+          devices = [ "Anton" ];
+        };
+        "Notes" = {
+          id = "oc61n-iewgj";
+          path = "/mnt/data/Notes";
+          devices = [ "Anton" ];
+        };
+        "Music" = {
+          id = "xxh8a-3y2tq";
+          path = "/mnt/data/Music";
+          devices = [ "Anton" ];
+        };
+      };
+    };
+  };
+}