From ee19a1722a33e28d3203c67d299516b3199ee201 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Thu, 19 Feb 2026 20:23:46 +0100
Subject: [PATCH] Fix default setting precedence

---
 base/defaults.nix | 48 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/base/defaults.nix b/base/defaults.nix
index 74e9d01..0b1882b 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -1,30 +1,28 @@
 { lib, ... }:
 {
-    config = lib.mkDefault {
-        i18n.defaultLocale = "en_GB.UTF-8";
-        console.keyMap = "us";
-        services.xserver.xkb.layout = "us-fruchti";
-        services.openssh = {
-            enable = true;
-            settings = {
-                PasswordAuthentication = false;
-                KbdInteractiveAuthentication = false;
-                X11Forwarding = true;
-            };
-        };
-
-        programs.command-not-found.enable = true;
-
-        programs.direnv.enable = true;
-
-        nix.gc = {
-            automatic = true;
-            dates = "weekly";
-            options = "--delete-older-than 30d";
-        };
-        services.angrr = {
-            enable = true;
-            period = "2weeks";
+    i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
+    console.keyMap = lib.mkDefault "us";
+    services.xserver.xkb.layout = lib.mkDefault "us-fruchti";
+    services.openssh = {
+        enable = lib.mkDefault true;
+        settings = {
+            PasswordAuthentication = lib.mkDefault false;
+            KbdInteractiveAuthentication = lib.mkDefault false;
+            X11Forwarding = lib.mkDefault true;
         };
     };
+
+    programs.command-not-found.enable = lib.mkDefault true;
+
+    programs.direnv.enable = lib.mkDefault true;
+
+    nix.gc = {
+        automatic = lib.mkDefault true;
+        dates = lib.mkDefault "weekly";
+        options = lib.mkDefault "--delete-older-than 30d";
+    };
+    services.angrr = {
+        enable = lib.mkDefault true;
+        period = lib.mkDefault "2weeks";
+    };
 }