code rules

modules/services/network.nix

@@ -38,18 +38,6 @@ in
           "${config.my.localhost6}:53"
         ]
         ++ lib.optionals config.my.services.wireguard.enable wgListenAddrs;
-        query_log = {
-          file = "/var/lib/dnscrypt-proxy/query.log";
-          format = "tsv";
-        };
-        sources.public-resolvers = {
-          urls = [
-            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-          ];
-          cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
-          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
-        };
         server_names = [
           "adfilter-adl"
           "adfilter-adl-ipv6"
@@ -65,6 +53,18 @@ in
           "quad9-dnscrypt-ip6-filter-pri"
           "ibksturm"
         ];
+        query_log = {
+          file = "/var/lib/dnscrypt-proxy/query.log";
+          format = "tsv";
+        };
+        sources.public-resolvers = {
+          urls = [
+            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
+            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
+          ];
+          cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
+          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
+        };
       };
     };
   };

modules/services/nvidia.nix

@@ -29,8 +29,10 @@
         open = config.networking.hostName == "workstation";
         package = config.boot.kernelPackages.nvidiaPackages.stable;
         modesetting.enable = true;
-        powerManagement.enable = true;
-        powerManagement.finegrained = false;
+        powerManagement = {
+          enable = true;
+          finegrained = false;
+        };
       };
     };
   };

modules/services/sound.nix

@@ -11,10 +11,12 @@
     security.rtkit.enable = true; # make pipewire realtime-capable
     services.pipewire = {
       enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
       pulse.enable = true;
       wireplumber.enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
       # lowLatency = {
       #   enable = true;
       #   quantum = 64;

modules/services/syncthing.nix

@@ -49,10 +49,6 @@ in
           relaysEnabled = false;
           globalAnnounceEnabled = false;
         };
-        gui = {
-          user = "jawz";
-          password = config.sops.secrets.syncthing_password.path;
-        };
         devices =
           let
             mkWgDevice = name: id: {
@@ -75,6 +71,10 @@ in
             wg-friend4 = mkWgDevice "wg-friend4" "7YPUQ4Y-2UVEAXI-KBQVU7R-B6R5O36-GDQPTOY-3R3OG7H-BVWVOTD-EX52VQM";
             wg-friend6 = mkWgDevice "wg-friend6" "STQGYJV-YNFX6PB-NK63JBV-7HS74L4-AMF2QWA-KAFLXZA-3FELLSB-TE65ZQI";
           };
+        gui = {
+          user = "jawz";
+          password = config.sops.secrets.syncthing_password.path;
+        };
         folders = {
           cache = mkMobile "~/Downloads/cache/";
           friends = mkMobile "~/Pictures/Artist/friends/";