more twiddle

4 files changed, 18 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index e9bd29c..2004038 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,18 +26,7 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          inputs.disko.nixosModules.disko
           ./labsrv01/configuration.nix
-          inputs.sops-nix.nixosModules.sops
-          inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.kjtsanaktsidis = ./labsrv01/home.nix;
-            home-manager.sharedModules = [
-              inputs.sops-nix.homeManagerModules.sops
-            ];
-          }
         ];
       };
 
diff --git a/labsrv01/configuration.nix b/labsrv01/configuration.nix
index d1b20ec..83dae2f 100644
--- a/labsrv01/configuration.nix
+++ b/labsrv01/configuration.nix
@@ -10,10 +10,15 @@
 {
   imports = [
     inputs.determinate.nixosModules.default
+    inputs.disko.nixosModules.disko
     ./disk-config.nix
+    inputs.sops-nix.nixosModules.sops
     ./secureboot.nix
-    ./alt-arrow-vt.nix
     ./network.nix
+    ./alt-arrow-vt.nix
+
+    inputs.home-manager.nixosModules.home-manager
+    ./homes.nix
   ];
   hardware.facter.reportPath = ./facter.json;
 
diff --git a/labsrv01/home.nix b/labsrv01/home-kjtsanaktsidis.nix
index c5b5989..c5b5989 100644
--- a/labsrv01/home.nix
+++ b/labsrv01/home-kjtsanaktsidis.nix
diff --git a/labsrv01/homes.nix b/labsrv01/homes.nix
new file mode 100644
index 0000000..6e6cdb4
--- /dev/null
+++ b/labsrv01/homes.nix
@@ -0,0 +1,12 @@
+{
+  inputs,
+  ...
+}:
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.kjtsanaktsidis = ./home-kjtsanaktsidis.nix;
+  home-manager.sharedModules = [
+    inputs.sops-nix.homeManagerModules.sops
+  ];
+}