diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-11-20 06:00:28 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-11-20 06:00:28 -0700 |
| commit | 91e3d2e0b6a4737e4a8fbac750bfb3e4ca049fc2 (patch) | |
| tree | 608a4e9ed253a54ce86f86d8949e9fbf9a0ba3df | |
| parent | f09bf2f0d8b9e50b02c8b7d72d559aa2b3b3ee74 (diff) | |
i've decided to import hardware config from config file rather than as
> as a module, to leave the flake file less cluttered
| -rw-r--r-- | flake.nix | 19 | ||||
| -rw-r--r-- | machines/zenbook/configuration.nix | 4 |
2 files changed, 13 insertions, 10 deletions
@@ -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; diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 23947f5..e925bcb 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -5,6 +5,10 @@ { config, ... }: { + imports = [ + ./hardware-configuration.nix + ]; + # Use the systemd-boot EFI boot loader. boot.loader = { systemd-boot.enable = true; |