Moved home configurations to a per host basis

common/fastfetch/default.nix

@@ -1,8 +1,7 @@
-{ lib, pkgs, osConfig, ... }:
+{ lib, pkgs, config, ... }:
 {
     programs.fastfetch = let
-            # TODO: move home mnager out of standalone so i dont need so use --impure for this
+            hostname = config.home.sessionVariables.HOSTNAME;
-            hostname = builtins.getEnv "HOSTNAME";
             logoFile = ./. + "/host/${hostname}.txt";
         in {
         enable = true;

common/home/default.nix

@@ -1,32 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, hostName, ... }:
 {  
   # Module imports
   imports = [
-    ./modules/fastfetch
+    # Common Modules
-    ./modules/fish
+      ../fish
+      ../fastfetch
   ];
 
   home = {
     username = "toph";
     homeDirectory = "/home/toph";
     stateVersion = "24.05";
-    # Packages
-    packages = with pkgs; [
-      fastfetch
-      fish
-      fishPlugins.grc
-      fishPlugins.tide
-      grc
-    ];
-
-    # file = {
-    #   ".config" = {
-    #     recursive = true;
-    #     source = ../.config;
-    #   };
-    # };
-
     sessionVariables = {
+      HOSTNAME = hostName;
       EDITOR = "micro";
       VISUAL = "micro";
       XDG_CONFIG_HOME = "$HOME/.config";

flake.nix

@@ -67,29 +67,54 @@
           # overlays = [ (import ./nixos/overlays) ];
         };
       in {
-      "toph@caenus" = home-manager.lib.homeManagerConfiguration {
+      "toph@caenus" = let
-        pkgs = armPkgs;
+          hostName = "caenus";
-        modules = [ ./home ];
+          pkgs = armPkgs;
+          home = ./. + "/host/${hostName}/home"; 
+      in home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit hostName; };  
+        modules = [ home ];
       };
 
-      "toph@cloud" = home-manager.lib.homeManagerConfiguration {
+      "toph@cloud" = let
-        pkgs = x86Pkgs;
+          hostName = "cloud";
-        modules = [ ./home ];
+          pkgs = x86Pkgs;
+          home = ./. + "/host/${hostName}/home"; 
+      in home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit hostName; };  
+        modules = [ home ];
       };
 
-      "toph@dockge" = home-manager.lib.homeManagerConfiguration {
+      "toph@dockge" = let
-        pkgs = x86Pkgs;
+          hostName = "dockge";
-        modules = [ ./home ];
+          pkgs = x86Pkgs;
+          home = ./. + "/host/${hostName}/home"; 
+      in home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit hostName; };  
+        modules = [ home ];
       };
 
-      "toph@nix" = home-manager.lib.homeManagerConfiguration {
+      "toph@nix" = let
-        pkgs = x86Pkgs;
+          hostName = "nix";
-        modules = [ ./home ];
+          pkgs = x86Pkgs;
+          home = ./. + "/host/${hostName}/home"; 
+      in home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit hostName; };  
+        modules = [ home ];
       };
       
-      "toph@proxy" = home-manager.lib.homeManagerConfiguration {
+      "toph@proxy" = let
-        pkgs = x86Pkgs;
+          hostName = "proxy";
-        modules = [ ./home ];
+          pkgs = x86Pkgs;
+          home = ./. + "/host/${hostName}/home"; 
+      in home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit hostName; };  
+        modules = [ home ];
       };
     };
   };

host/caenus/home/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{  
+  # Module imports
+  imports = [
+    # Common Modules
+      ../../../common/home
+  ];
+
+  home.packages = with pkgs; [
+      fastfetch
+      fish
+      fishPlugins.grc
+      fishPlugins.tide
+      grc
+    ];
+}

host/cloud/home/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{  
+  # Module imports
+  imports = [
+    # Common Modules
+      ../../../common/home
+  ];
+
+  home.packages = with pkgs; [
+      fastfetch
+      fish
+      fishPlugins.grc
+      fishPlugins.tide
+      grc
+    ];
+}

host/dockge/home/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{  
+  # Module imports
+  imports = [
+    # Common Modules
+      ../../../common/home
+  ];
+
+  home.packages = with pkgs; [
+      fastfetch
+      fish
+      fishPlugins.grc
+      fishPlugins.tide
+      grc
+    ];
+}

host/nix/default.nix

@@ -43,11 +43,8 @@ in {
   environment.systemPackages = with pkgs; [
     git
     micro
-    nodejs_22
     openbox
     openssh
-    pnpm
-    prettierd
     ranger
     sshfs
     wget

host/nix/home/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{  
+  # Module imports
+  imports = [
+    # Common Modules
+      ../../../common/home
+  ];
+
+  home.packages = with pkgs; [
+      fastfetch
+      fish
+      fishPlugins.grc
+      fishPlugins.tide
+      grc
+      nodejs_22
+      pnpm
+      prettierd
+    ];
+}

host/proxy/home/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{  
+  # Module imports
+  imports = [
+    # Common Modules
+      ../../../common/home
+  ];
+
+  home.packages = with pkgs; [
+      fastfetch
+      fish
+      fishPlugins.grc
+      fishPlugins.tide
+      grc
+    ];
+}