From 1e2f4bb6f1c7c9094575c29b6704cf0042d98732 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 9 Oct 2025 19:30:39 -0700
Subject: import home-manager.nix and user.nix by default on nixos

---
 machines/nixos/x86_64-linux/do-rproxy/default.nix  |  2 --
 .../nixos/x86_64-linux/synology-vm/default.nix     |  2 --
 modules/nixos/default.nix                          |  2 ++
 modules/nixos/home-manager.nix                     | 12 ++++++++++++
 modules/nixos/user.nix                             | 22 ++++++++++++++++++++++
 profiles/admin-user/home-manager.nix               | 12 ------------
 profiles/admin-user/user.nix                       | 22 ----------------------
 7 files changed, 36 insertions(+), 38 deletions(-)
 create mode 100644 modules/nixos/home-manager.nix
 create mode 100644 modules/nixos/user.nix
 delete mode 100644 profiles/admin-user/home-manager.nix
 delete mode 100644 profiles/admin-user/user.nix

diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index eb40396..b0ff7dc 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -22,8 +22,6 @@
         ];
       };
     }
-    "${self}/profiles/admin-user/user.nix"
-    "${self}/profiles/admin-user/home-manager.nix"
     "${self}/profiles/services/podman.nix"
     ./profiles/nginx.nix
   ];
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 925d52d..f757451 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -18,8 +18,6 @@
         ];
       };
     }
-    "${self}/profiles/admin-user/user.nix"
-    "${self}/profiles/admin-user/home-manager.nix"
     "${self}/profiles/services/podman.nix"
     ./profiles/forgejo.nix
     ./profiles/keycloak.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 1cf2c5d..9c0a6f1 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,7 +3,9 @@
   imports = [
     ./base.nix
     ./cgroups.nix
+    ./home-manager.nix
     ./nix.nix
     ./ssh.nix
+    ./user.nix
   ];
 }
diff --git a/modules/nixos/home-manager.nix b/modules/nixos/home-manager.nix
new file mode 100644
index 0000000..7a9ae43
--- /dev/null
+++ b/modules/nixos/home-manager.nix
@@ -0,0 +1,12 @@
+{
+  adminUser,
+  ...
+}:
+{
+  home-manager = {
+    users.${adminUser.name} = {
+      home.username = "${adminUser.name}";
+      inherit (adminUser) userinfo;
+    };
+  };
+}
diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix
new file mode 100644
index 0000000..d500650
--- /dev/null
+++ b/modules/nixos/user.nix
@@ -0,0 +1,22 @@
+{
+  adminUser,
+  pkgs,
+  ...
+}:
+{
+  nix.settings.trusted-users = [ adminUser.name ];
+  users = {
+    users.${adminUser.name} = {
+      inherit (adminUser) uid;
+      shell = pkgs.fish;
+      isNormalUser = true;
+      hashedPassword = "$6$Llw8m62nKMLLN9mm$3.a4CKUFlqwkG8vjBryLlBNwTwgH63vpg2nhYwRoQzG76Q91vTXnlYDujS4G5yGrWoatkKZx5epCx4/NAvRh2/";
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
+      ];
+      extraGroups = [
+        "wheel"
+      ];
+    };
+  };
+}
diff --git a/profiles/admin-user/home-manager.nix b/profiles/admin-user/home-manager.nix
deleted file mode 100644
index 7a9ae43..0000000
--- a/profiles/admin-user/home-manager.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  adminUser,
-  ...
-}:
-{
-  home-manager = {
-    users.${adminUser.name} = {
-      home.username = "${adminUser.name}";
-      inherit (adminUser) userinfo;
-    };
-  };
-}
diff --git a/profiles/admin-user/user.nix b/profiles/admin-user/user.nix
deleted file mode 100644
index d500650..0000000
--- a/profiles/admin-user/user.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  adminUser,
-  pkgs,
-  ...
-}:
-{
-  nix.settings.trusted-users = [ adminUser.name ];
-  users = {
-    users.${adminUser.name} = {
-      inherit (adminUser) uid;
-      shell = pkgs.fish;
-      isNormalUser = true;
-      hashedPassword = "$6$Llw8m62nKMLLN9mm$3.a4CKUFlqwkG8vjBryLlBNwTwgH63vpg2nhYwRoQzG76Q91vTXnlYDujS4G5yGrWoatkKZx5epCx4/NAvRh2/";
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
-      ];
-      extraGroups = [
-        "wheel"
-      ];
-    };
-  };
-}
-- 
cgit v1.2.3