2 files changed, 24 insertions, 15 deletions

diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 258dd32d..58d2fe7c 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -62,6 +62,9 @@ in {
                 rhs = optCall rhs_ { inherit pkgs; };
               in
               recursiveUpdate lhs rhs //
+              optionalAttrs (lhs ? allowUnfreePackages) {
+                allowUnfreePackages = lhs.allowUnfreePackages ++ (attrByPath [ "allowUnfreePackages" ] [ ] rhs);
+              } //
               optionalAttrs (lhs ? packageOverrides) {
                 packageOverrides = pkgs:
                   optCall lhs.packageOverrides pkgs //
diff --git a/system-profiles/default-locale.nix b/system-profiles/default-locale.nix
index 60d338cb..68bc4240 100644
--- a/system-profiles/default-locale.nix
+++ b/system-profiles/default-locale.nix
@@ -1,23 +1,29 @@
-{ lib, options, ... }:
-
-with lib;
+{ pkgs, lib, options, config, ... }:
 
 {
-  config = foldr recursiveUpdate {} ([
+  config = lib.foldr lib.recursiveUpdate {} ([
     {
       i18n = {
-        defaultLocale = "en_DK.UTF-8";
-        extraLocaleSettings = {
-          "TIME_STYLE" = "long-iso";
-        };
-      };
-      console.keyMap = mkDefault "dvorak-programmer";
+        defaultLocale = "en_SE.UTF-8";
 
-      time.timeZone = mkDefault "Europe/Berlin";
+        glibcLocales =
+          (pkgs.glibcLocales.override {
+            allLocales = false;
+            locales = config.i18n.supportedLocales;
+          }).overrideAttrs (_: {
+            postUnpack = ''
+              cp ${pkgs.fetchurl {
+                url = "https://gist.githubusercontent.com/bmaupin/d64368e78cd359d309685fecbe2baf23/raw/e933a0fc2e727aa640f4a1cb1f699622876940fc/en_SE";
+                hash = "sha256-ArXL+rMDVWI4Mmcw8xoRlZFXhEeSQL0tLJf5pKEOx3s=";
+              }} $sourceRoot/localedata/locales/en_SE
+              echo 'en_SE.UTF-8/UTF-8 \' >> $sourceRoot/localedata/SUPPORTED
+            '';
+          });
+      };
     }
-  ] ++ (optional (options ? i18n.extraLocales) {
-    i18n.extraLocales = [ "C.UTF-8" "en_US.UTF-8" "en_DK.UTF-8" ];
-  }) ++ (optional (!(options ? i18n.extraLocales)) {
-    i18n.supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
+  ] ++ (lib.optional (options ? i18n.extraLocales) {
+    i18n.extraLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ];
+  }) ++ (lib.optional (!(options ? i18n.extraLocales)) {
+    i18n.supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ];
   }));
 }