From b9d444e78d43032a0b257cfde6a4e2c04a16cb78 Mon Sep 17 00:00:00 2001
From: 0xTux <0xtux@pm.me>
Date: Mon, 21 Oct 2024 16:25:00 +0530
Subject: [PATCH] refactor: move home-manager module to their respective hosts

---
 flake.nix                  | 128 +++----------------------------------
 hosts/alpha/default.nix    |   6 ++
 hosts/arcturus/default.nix |   6 ++
 hosts/canopus/default.nix  |   7 ++
 hosts/capella/default.nix  |   7 ++
 hosts/common/default.nix   |  12 ++++
 hosts/isoImage/default.nix |  10 +++
 hosts/sirius/default.nix   |   6 ++
 hosts/vega/default.nix     |  12 +++-
 hosts/vps/default.nix      |   7 ++
 10 files changed, 80 insertions(+), 121 deletions(-)

diff --git a/flake.nix b/flake.nix
index a446c68..b1d7244 100755
--- a/flake.nix
+++ b/flake.nix
@@ -53,154 +53,42 @@
     nixosConfigurations = {
       arcturus = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/arcturus
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/arcturus/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/arcturus];
       };
 
       canopus = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/canopus
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/canopus/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/canopus];
       };
 
       alpha = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/alpha
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/alpha/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/alpha];
       };
 
       sirius = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/sirius
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/sirius/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/sirius];
       };
 
       vega = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/vega
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/vega/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/vega];
       };
 
       capella = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/capella
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/capella/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/capella];
       };
 
       vps = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/vps
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/vps/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/vps];
       };
 
       isoImage = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
-        modules = [
-          ./hosts/isoImage
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {inherit inputs outputs username;};
-            home-manager.users.${username} = {
-              imports = [
-                ./hosts/isoImage/home.nix
-              ];
-            };
-          }
-        ];
+        modules = [./hosts/isoImage];
       };
     };
 
diff --git a/hosts/alpha/default.nix b/hosts/alpha/default.nix
index 3b32415..55877c9 100644
--- a/hosts/alpha/default.nix
+++ b/hosts/alpha/default.nix
@@ -103,5 +103,11 @@
     enable = false;
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/hosts/arcturus/default.nix b/hosts/arcturus/default.nix
index 024a1aa..2c0b867 100644
--- a/hosts/arcturus/default.nix
+++ b/hosts/arcturus/default.nix
@@ -142,5 +142,11 @@
     enable = false;
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix
index 78227c2..eab8b90 100755
--- a/hosts/canopus/default.nix
+++ b/hosts/canopus/default.nix
@@ -1,5 +1,6 @@
 {
   inputs,
+  username,
   pkgs,
   lib,
   config,
@@ -300,5 +301,11 @@
     ];
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "24.11";
 }
diff --git a/hosts/capella/default.nix b/hosts/capella/default.nix
index a8a33b4..45e8732 100644
--- a/hosts/capella/default.nix
+++ b/hosts/capella/default.nix
@@ -1,6 +1,7 @@
 {
   modulesPath,
   inputs,
+  username,
   ...
 }: {
   imports = [
@@ -28,5 +29,11 @@
     enable = false;
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "24.11";
 }
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 79aef91..7e9846f 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -13,6 +13,7 @@
 in {
   imports = [
     inputs.impermanence.nixosModules.impermanence
+    inputs.home-manager.nixosModules.home-manager
 
     ../../modules/nixos/sops.nix
   ];
@@ -121,4 +122,15 @@ in {
       ];
     };
   };
+
+  home-manager = {
+    backupFileExtension = "backup";
+    useUserPackages = true;
+    extraSpecialArgs = {inherit inputs outputs username;};
+    users.${username} = {
+      imports = [
+        ./home.nix
+      ];
+    };
+  };
 }
diff --git a/hosts/isoImage/default.nix b/hosts/isoImage/default.nix
index 8c59f01..ca5bb29 100644
--- a/hosts/isoImage/default.nix
+++ b/hosts/isoImage/default.nix
@@ -1,10 +1,14 @@
 {
   pkgs,
   modulesPath,
+  inputs,
+  username,
   ...
 }: {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
+    inputs.home-manager.nixosModules.home-manager
+
     ../../modules/nixos/default.nix
     ../../modules/nixos/desktop/awesome
   ];
@@ -72,5 +76,11 @@
 
   fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})];
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/hosts/sirius/default.nix b/hosts/sirius/default.nix
index 4466b9c..7882591 100644
--- a/hosts/sirius/default.nix
+++ b/hosts/sirius/default.nix
@@ -47,5 +47,11 @@
     enable = false;
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/hosts/vega/default.nix b/hosts/vega/default.nix
index 8555669..b513e71 100644
--- a/hosts/vega/default.nix
+++ b/hosts/vega/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  username,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
     ../common
@@ -51,5 +55,11 @@
     enable = false;
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "24.11";
 }
diff --git a/hosts/vps/default.nix b/hosts/vps/default.nix
index fc9fe06..2a3dd03 100644
--- a/hosts/vps/default.nix
+++ b/hosts/vps/default.nix
@@ -10,6 +10,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
     inputs.disko.nixosModules.default
+    inputs.home-manager.nixosModules.home-manager
     (import ./disko.nix {device = "/dev/sda";})
   ];
 
@@ -114,5 +115,11 @@
     };
   };
 
+  home-manager.users.${username} = {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   system.stateVersion = "24.11";
 }