services: refactor

modules/shared/nixos/services.nix

@@ -1,40 +1,38 @@
-{
+{lib, ...}: {
-  services = {
+  services =
+    lib.attrsets.recursiveUpdate {
       # hardware.openrgb.enable = true;
       avahi.enable = true;
-    dnscrypt-proxy2 = {
+      dnscrypt-proxy.enable = true;
-      enable = true;
+      flatpak.enable = true;
-      settings = {
+      fstrim.enable = true;
+      fwupd.enable = true;
+      kmscon.enable = true;
+      opensnitch.enable = false;
+      openssh.enable = true;
+      scx.enable = true;
+      userborn.enable = true;
+    } {
+      dnscrypt-proxy.settings = {
         bootstrap_resolvers = ["9.9.9.11:53" "9.9.9.9:53"];
         require_dnssec = true;
         server_names = ["mullvad-doh"];
       };
+      fstrim.interval = "daily";
+      kmscon = {
+        hwRender = true;
+        extraOptions = "--drm";
       };
-    flatpak.enable = true;
+      logind.settings.Login = {
-    fstrim = {
+        HandleLidSwitch = "ignore";
-      enable = true;
+        HandlePowerKey = "suspend";
-      interval = "daily";
       };
-    fwupd.enable = true;
+      opensnitch.settings = {
-    logind = {
-      lidSwitch = "ignore";
-      powerKey = "suspend";
-    };
-    opensnitch = {
-      enable = false;
-      settings = {
         DefaultAaction = "deny";
         Firewall = "iptables";
         InterceptUnknown = true;
         ProcMonitorMethod = "ebpf";
       };
-    };
+      scx.scheduler = "scx_flash";
-    openssh.enable = true;
-    scx = {
-      enable = true;
-      scheduler = "scx_flash";
-    };
-    syncthing.openDefaultPorts = true;
-    userborn.enable = true;
     };
 }