Tidy locale config

DanNixon · Oct 24, 2023 · 7930426 · 7930426
1 parent e6a1e98
commit 7930426
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/configurations/akane/nixos/default.nix b/configurations/akane/nixos/default.nix
@@ -11,12 +11,11 @@ inputs.nixpkgs.lib.nixosSystem {
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
     inputs.sops-nix.nixosModules.sops
-    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/base
     ../../../modules/nixos/dan
     ../../../modules/nixos/dan/secrets
     ../../../modules/nixos/desktop-environment.nix
     ../../../modules/nixos/dnscrypt-proxy.nix
-    ../../../modules/nixos/locale.nix
     ../../../modules/nixos/networkmanager.nix
     ../../../modules/nixos/peripherals/adb.nix
     ../../../modules/nixos/peripherals/scanner.nix

diff --git a/configurations/kawashiro/nixos/default.nix b/configurations/kawashiro/nixos/default.nix
@@ -11,12 +11,11 @@ inputs.nixpkgs.lib.nixosSystem {
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
     inputs.sops-nix.nixosModules.sops
-    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/base
     ../../../modules/nixos/dan
     ../../../modules/nixos/dan/secrets
     ../../../modules/nixos/desktop-environment.nix
     ../../../modules/nixos/dnscrypt-proxy.nix
-    ../../../modules/nixos/locale.nix
     ../../../modules/nixos/networkmanager.nix
     ../../../modules/nixos/peripherals/sound.nix
     ../../../modules/nixos/peripherals/sdr.nix

diff --git a/configurations/maya/nixos/default.nix b/configurations/maya/nixos/default.nix
@@ -10,12 +10,11 @@ inputs.nixpkgs.lib.nixosSystem {
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
     inputs.sops-nix.nixosModules.sops
-    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/base
     ../../../modules/nixos/dan
     ../../../modules/nixos/dan/secrets
     ../../../modules/nixos/desktop-environment.nix
     ../../../modules/nixos/dnscrypt-proxy.nix
-    ../../../modules/nixos/locale.nix
     ../../../modules/nixos/networkmanager.nix
     ../../../modules/nixos/peripherals/ddcutil.nix
     ../../../modules/nixos/peripherals/probe-rs.nix

diff --git a/configurations/yukari/nixos/default.nix b/configurations/yukari/nixos/default.nix
@@ -15,10 +15,9 @@ inputs.nixpkgs.lib.nixosSystem {
     })
     ./disk-config.nix
 
-    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/base
     ../../../modules/nixos/dan
     ../../../modules/nixos/dnscrypt-proxy.nix
-    ../../../modules/nixos/locale.nix
     ../../../modules/nixos/networkmanager.nix
     ../../../modules/nixos/ssh.nix
     ../../../modules/nixos/syncthing.nix

diff --git a/configurations/yuyuko/nixos/default.nix b/configurations/yuyuko/nixos/default.nix
@@ -14,11 +14,10 @@ inputs.nixpkgs.lib.nixosSystem {
     })
     ./disk-config.nix
 
-    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/base
     ../../../modules/nixos/dan
     ../../../modules/nixos/desktop-environment.nix
     ../../../modules/nixos/dnscrypt-proxy.nix
-    ../../../modules/nixos/locale.nix
     ../../../modules/nixos/networkmanager.nix
     ../../../modules/nixos/peripherals/sound.nix
     ../../../modules/nixos/ssh.nix

diff --git a/modules/nixos/base.nix → modules/nixos/base/default.nix b/modules/nixos/base.nix → modules/nixos/base/default.nix
@@ -5,6 +5,10 @@
   config,
   ...
 }: {
+  imports = [
+    ./locale.nix
+  ];
+
   nix = {
     # This will add each flake input as a registry
     # To make nix3 commands consistent with your flake

diff --git a/modules/nixos/locale.nix → modules/nixos/base/locale.nix b/modules/nixos/locale.nix → modules/nixos/base/locale.nix
@@ -1,9 +1,9 @@
-{...}: {
-  time.timeZone = "Europe/London";
+{lib, ...}: {
+  time.timeZone = lib.mkDefault "Europe/London";
 
-  i18n.defaultLocale = "en_GB.UTF-8";
+  i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
 
-  i18n.extraLocaleSettings = {
+  i18n.extraLocaleSettings = lib.mkDefault {
     LC_ADDRESS = "en_GB.UTF-8";
     LC_IDENTIFICATION = "en_GB.UTF-8";
     LC_MEASUREMENT = "en_GB.UTF-8";
@@ -15,5 +15,5 @@
     LC_TIME = "en_GB.UTF-8";
   };
 
-  console.keyMap = "uk";
+  console.keyMap = lib.mkDefault "uk";
 }