diff options
| -rw-r--r-- | hosts/carmel/default.nix | 11 | ||||
| -rw-r--r-- | hosts/tahoe/default.nix | 10 | ||||
| -rw-r--r-- | modules/system/default.nix | 1 | ||||
| -rw-r--r-- | profiles/default.nix (renamed from modules/system/locale/default.nix) | 4 | ||||
| -rw-r--r-- | profiles/server.nix | 6 | ||||
| -rw-r--r-- | profiles/workstation.nix | 4 |
6 files changed, 28 insertions, 8 deletions
diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index 83d6317..cbad04d 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -1,8 +1,13 @@ -{ ... }: +{ self, ... }: { - imports = - [ ./hardware.nix ./boot.nix ./networking.nix ./services.nix ]; + imports = [ + ./hardware.nix + ./boot.nix + ./networking.nix + ./services.nix + "${self}/profiles/server.nix" + ]; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/tahoe/default.nix b/hosts/tahoe/default.nix index f31135b..4b0408b 100644 --- a/hosts/tahoe/default.nix +++ b/hosts/tahoe/default.nix @@ -1,9 +1,15 @@ -{ config, pkgs, hostname, ... }: +{ config, pkgs, hostname, self, ... }: let sshPub = builtins.fromTOML (builtins.readFile ../../configs/ssh-pubkeys.toml); in { - imports = [ ./boot.nix ./hardware.nix ./networking.nix ./services.nix ]; + imports = [ + ./boot.nix + ./hardware.nix + ./networking.nix + ./services.nix + "${self}/profiles/server.nix" + ]; users.groups.nas.gid = 5000; users.users.nas = { diff --git a/modules/system/default.nix b/modules/system/default.nix index bf3e367..22ba97e 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -7,7 +7,6 @@ ./console ./documentation ./fonts - ./locale ./nix ./packages ./security diff --git a/modules/system/locale/default.nix b/profiles/default.nix index 2026764..f415edf 100644 --- a/modules/system/locale/default.nix +++ b/profiles/default.nix @@ -1,5 +1,5 @@ -# Language settings -{ ... }: { +{ pkgs, config, lib, ... }: +{ # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/profiles/server.nix b/profiles/server.nix new file mode 100644 index 0000000..5b96d56 --- /dev/null +++ b/profiles/server.nix @@ -0,0 +1,6 @@ +{ pkgs, config, lib, ... }: +{ + imports = [ + ./default.nix + ]; +} diff --git a/profiles/workstation.nix b/profiles/workstation.nix index ae9423b..fc888d3 100644 --- a/profiles/workstation.nix +++ b/profiles/workstation.nix @@ -1,5 +1,9 @@ { pkgs, config, lib, ... }: { + imports = [ + ./default.nix + ]; + virtualisation.docker.enable = false; virtualisation.podman.enable = true; virtualisation.podman.dockerCompat = true; |