consistent home-manager configuration for all nixos hosts

7 files changed, 21 insertions, 52 deletions

diff --git a/flake/hosts.nix b/flake/hosts.nix
index 2739051..5d77415 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -154,6 +154,11 @@ let
                 pkgs.git
               ];
             }
+            {
+              home-manager.users.${adminUser.name}.imports = [
+                "${self}/home/programs/bat.nix"
+              ];
+            }
           ]
           ++ defaultModules
           ++ [
@@ -164,6 +169,15 @@ let
       );
     }
   ) (mapHosts (mapSystems "${self}/machines/nixos"));
+
+  adminUser = {
+    name = "fcuny";
+    uid = 1000;
+    userinfo = {
+      email = "franck@fcuny.net";
+      fullName = "Franck Cuny";
+    };
+  };
 in
 {
   flake = {
@@ -181,14 +195,7 @@ in
 
         specialArgs = {
           inherit inputs self;
-          adminUser = {
-            name = "fcuny";
-            uid = 1000;
-            userinfo = {
-              email = "franck@fcuny.net";
-              fullName = "Franck Cuny";
-            };
-          };
+          adminUser = adminUser;
         };
       };
 
@@ -200,6 +207,12 @@ in
           imports = defaultModules ++ [
             inputs.my-go-tools.nixosModules.default
             inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.users.${adminUser.name}.imports = [
+                "${self}/home/programs/bat.nix"
+                { home.stateVersion = "25.05"; }
+              ];
+            }
           ];
         };
 
diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index f89acda..877f4c5 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -1,5 +1,4 @@
 {
-  adminUser,
   config,
   lib,
   modulesPath,
@@ -13,14 +12,6 @@
     ./disks.nix
     ./digitalocean.nix
     ./secrets.nix
-    {
-      home-manager.users.${adminUser.name} = {
-        imports = [
-          ./home.nix
-          { home.stateVersion = "25.05"; }
-        ];
-      };
-    }
     ./profiles/nginx.nix
   ];
 
diff --git a/machines/nixos/x86_64-linux/do-rproxy/home.nix b/machines/nixos/x86_64-linux/do-rproxy/home.nix
deleted file mode 100644
index 8f0935e..0000000
--- a/machines/nixos/x86_64-linux/do-rproxy/home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ self, ... }:
-{
-  imports = [
-    "${self}/home/programs/bat.nix"
-  ];
-}
diff --git a/machines/nixos/x86_64-linux/rivendell/default.nix b/machines/nixos/x86_64-linux/rivendell/default.nix
index 8e54b4c..7c94470 100644
--- a/machines/nixos/x86_64-linux/rivendell/default.nix
+++ b/machines/nixos/x86_64-linux/rivendell/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  adminUser,
   config,
   modulesPath,
   inputs,
@@ -11,14 +10,6 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     inputs.nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
     ./disks.nix
-    {
-      home-manager.users.${adminUser.name} = {
-        imports = [
-          ./home.nix
-          { home.stateVersion = "25.05"; }
-        ];
-      };
-    }
   ];
 
   services.fwupd.enable = true;
diff --git a/machines/nixos/x86_64-linux/rivendell/home.nix b/machines/nixos/x86_64-linux/rivendell/home.nix
deleted file mode 100644
index 8f0935e..0000000
--- a/machines/nixos/x86_64-linux/rivendell/home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ self, ... }:
-{
-  imports = [
-    "${self}/home/programs/bat.nix"
-  ];
-}
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 7ddd69b..cbf9f13 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -9,14 +9,6 @@
     ./disks.nix
     ./hardware.nix
     ./secrets.nix
-    {
-      home-manager.users.${adminUser.name} = {
-        imports = [
-          ./home.nix
-          { home.stateVersion = "25.05"; }
-        ];
-      };
-    }
     ./profiles/forgejo.nix
     ./profiles/keycloak.nix
     ./profiles/goget.nix
diff --git a/machines/nixos/x86_64-linux/synology-vm/home.nix b/machines/nixos/x86_64-linux/synology-vm/home.nix
deleted file mode 100644
index 8f0935e..0000000
--- a/machines/nixos/x86_64-linux/synology-vm/home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ self, ... }:
-{
-  imports = [
-    "${self}/home/programs/bat.nix"
-  ];
-}