move locale stuff into base

2 files changed, 18 insertions, 18 deletions

diff --git a/roles/base.nix b/roles/base.nix
index 4128579..4fe0692 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -17,4 +17,22 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCiljUOLUIywzNfQpAGtIXwleFeLvb7Vk+Gsvzlr9Oq jras@work"
     ];
   };
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "nl_NL.UTF-8";
+    LC_IDENTIFICATION = "nl_NL.UTF-8";
+    LC_MEASUREMENT = "nl_NL.UTF-8";
+    LC_MONETARY = "nl_NL.UTF-8";
+    LC_NAME = "nl_NL.UTF-8";
+    LC_NUMERIC = "nl_NL.UTF-8";
+    LC_PAPER = "nl_NL.UTF-8";
+    LC_TELEPHONE = "nl_NL.UTF-8";
+    LC_TIME = "nl_NL.UTF-8";
+  };
+
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
 }
diff --git a/roles/server.nix b/roles/server.nix
index b9511de..bd82f5a 100644
--- a/roles/server.nix
+++ b/roles/server.nix
@@ -13,22 +13,4 @@
     };
     openFirewall = true;
   };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_NL.UTF-8";
-    LC_IDENTIFICATION = "nl_NL.UTF-8";
-    LC_MEASUREMENT = "nl_NL.UTF-8";
-    LC_MONETARY = "nl_NL.UTF-8";
-    LC_NAME = "nl_NL.UTF-8";
-    LC_NUMERIC = "nl_NL.UTF-8";
-    LC_PAPER = "nl_NL.UTF-8";
-    LC_TELEPHONE = "nl_NL.UTF-8";
-    LC_TIME = "nl_NL.UTF-8";
-  };
-
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-  };
 }