aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--machines/nixos/x86_64-linux/do-rproxy/default.nix2
-rw-r--r--machines/nixos/x86_64-linux/synology-vm/default.nix2
-rw-r--r--modules/nixos/default.nix2
-rw-r--r--modules/nixos/home-manager.nix (renamed from profiles/admin-user/home-manager.nix)0
-rw-r--r--modules/nixos/user.nix (renamed from profiles/admin-user/user.nix)0
5 files changed, 2 insertions, 4 deletions
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/profiles/admin-user/home-manager.nix b/modules/nixos/home-manager.nix
index 7a9ae43..7a9ae43 100644
--- a/profiles/admin-user/home-manager.nix
+++ b/modules/nixos/home-manager.nix
diff --git a/profiles/admin-user/user.nix b/modules/nixos/user.nix
index d500650..d500650 100644
--- a/profiles/admin-user/user.nix
+++ b/modules/nixos/user.nix