From 269e9d20bf4188504a9fe0cfbea92b56f1738b48 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Fri, 22 Aug 2025 11:57:16 +0100
Subject: [PATCH] hosts: import users in individual hosts

---
 hosts/atlas/default.nix   | 1 +
 hosts/desktop.nix         | 6 +++++-
 hosts/eos/default.nix     | 1 +
 hosts/helios/default.nix  | 1 +
 hosts/hypnos/default.nix  | 1 +
 hosts/odyssey/default.nix | 1 +
 users/jordan/default.nix  | 1 -
 7 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index 979fe81..98c55c6 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index e79c5e0..d45ee21 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -1,4 +1,6 @@
 {
+  inputs,
+  config,
   pkgs,
   ...
 }:
@@ -6,7 +8,6 @@
 {
   imports = [
     ./common.nix
-    ../users/jordan
   ];
 
   services.printing.enable = true;
@@ -44,6 +45,9 @@
     randomizedDelaySec = "10min";
   };
 
+  age.secrets."passwords/users/root".file = "${inputs.secrets}/passwords/users/jordan.age";
+  users.users.root.hashedPasswordFile = config.age.secrets."passwords/users/root".path;
+
   systemd.services.NetworkManager-wait-online.enable = false;
 
   modules = {
diff --git a/hosts/eos/default.nix b/hosts/eos/default.nix
index b6db7b3..84ee56d 100644
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
diff --git a/hosts/helios/default.nix b/hosts/helios/default.nix
index 9162d6f..c3a84f4 100644
--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@@ -11,6 +11,7 @@ in
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
diff --git a/hosts/hypnos/default.nix b/hosts/hypnos/default.nix
index e1ced49..f287173 100644
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@@ -11,6 +11,7 @@
     ./hardware-configuration.nix
     ./disko-config.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs = {
diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix
index 18e012b..ecccdd4 100644
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -10,6 +10,7 @@
     ./gitea-runner.nix
     ./nix-serve.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs = {
diff --git a/users/jordan/default.nix b/users/jordan/default.nix
index 0dd3683..9fcb98e 100644
--- a/users/jordan/default.nix
+++ b/users/jordan/default.nix
@@ -15,7 +15,6 @@ in
 {
   age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
 
-  users.users.root.hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
   users.users.${name} = {
     description = "Jordan Holt";
     extraGroups = [