From 9940f822fb15b14a9695035bc7f5899d5b44ac1b Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 3 Mar 2023 15:26:51 +0100
Subject: [PATCH] Defaults: Use common mkDefault for everything

---
 base/defaults.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/base/defaults.nix b/base/defaults.nix
index cf70305..1387f28 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -1,14 +1,15 @@
 { lib, ... }:
-with lib;
 {
-    i18n.defaultLocale = mkDefault "en_GB.UTF-8";
-    console.keyMap = mkDefault "de";
-    services.openssh.enable = mkDefault true;
-    services.openssh.passwordAuthentication = mkDefault false;
+    config = lib.mkDefault {
+        i18n.defaultLocale = "en_GB.UTF-8";
+        console.keyMap = "de";
+        services.openssh.enable = true;
+        services.openssh.passwordAuthentication = false;
 
-    nix.gc = mkDefault {
-        automatic = true;
-        dates = "weekly";
-        options = "--delete-older-than 30d";
+        nix.gc = {
+            automatic = true;
+            dates = "weekly";
+            options = "--delete-older-than 30d";
+        };
     };
 }