From 5e55e00c6441d9d36b43f078b68bc6faf2cce6b8 Mon Sep 17 00:00:00 2001
From: Finn Markwitz <finn.markwitz@smoothcloud.de>
Date: Mon, 3 Jul 2023 07:26:22 +0000
Subject: [PATCH] Moved Locale Settings

---
 .gitlab-ci.yml             |  1 +
 machines/configuration.nix | 20 --------------------
 machines/core/core.nix     | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44eafbe..19922ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,5 +8,6 @@ jupiter-build:
   script:
     - ls -la
     - nix-build --version
+    - nix flake show --extra-experimental-features flakes
     - nix build --extra-experimental-features nix-command --extra-experimental-features flakes
     
diff --git a/machines/configuration.nix b/machines/configuration.nix
index 67ea4ee..326bda8 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -13,26 +13,6 @@ let
       config.allowUnfree = true;
     };
   };
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
 
   customModules = import ./core/default.nix;
   baseModules = [
diff --git a/machines/core/core.nix b/machines/core/core.nix
index db080a2..794cb67 100644
--- a/machines/core/core.nix
+++ b/machines/core/core.nix
@@ -41,4 +41,23 @@
 
   time.timeZone = "Europe/Berlin";
   services.timesyncd.enable = true;
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
 }
\ No newline at end of file