summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2023-11-20 06:00:28 -0700
committerDevin Finlinson <devin.finlinson@pm.me>2023-11-20 06:00:28 -0700
commit91e3d2e0b6a4737e4a8fbac750bfb3e4ca049fc2 (patch)
tree608a4e9ed253a54ce86f86d8949e9fbf9a0ba3df /flake.nix
parentf09bf2f0d8b9e50b02c8b7d72d559aa2b3b3ee74 (diff)
i've decided to import hardware config from config file rather than as
> as a module, to leave the flake file less cluttered
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index ede1201..75520e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -192,12 +192,10 @@
# inherit system;
modules = [
./machines/zenbook/configuration.nix
-
- ./machines/zenbook/hardware-configuration.nix
# Default users
- ./modules/user-profiles/defin.nix
- # ./modules/user-profiles/root.nix
+ ./modules/users/defin.nix
+ ./modules/users/root.nix
home-manager.nixosModules.home-manager {
@@ -235,21 +233,23 @@
doretta = nixpkgs.lib.nixosSystem { # this is my build server
modules = [
./machines/doretta/configuration.nix
- ./machines/doretta/hardware-configuration.nix
./modules/nixos/nix-common.nix
./modules/nixos/environment.nix
./modules/nixos/system-packages.nix
+ ./modules/users/defin.nix
+ ./modules/users/root.nix
];
};
bosco = nixpkgs.lib.nixosSystem { # this is my networking server
modules = [
./machines/bosco/configuration.nix
- ./machines/bosco/hardware-configuration.nix
./modules/nixos/nix-common.nix
./modules/nixos/environment.nix
./modules/nixos/system-packages.nix
+ ./modules/users/defin.nix
+ ./modules/users/root.nix
./modules/nixos/headscale.nix
];
@@ -257,10 +257,9 @@
khad = nixpkgs.lib.nixosSystem {
modules = [
./machines/khad/configuration.nix
-
- ./machines/khad/hardware-configuration.nix
-
- ./modules/user-profiles/defin.nix
+
+ ./modules/users/defin.nix
+ ./modules/users/root.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;