treewide: apply nix fmt

linyinfeng · Dec 7, 2024 · fa34d29 · fa34d29
1 parent 84cd63f
commit fa34d29
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 47 deletions.
diff --git a/home-manager/profiles/niri/default.nix b/home-manager/profiles/niri/default.nix
@@ -43,9 +43,8 @@ lib.mkMerge [
             dwt = true; # disable touchpad while typing
             dwtp = true; # disable touchpad while the trackpoint is in use
           };
-          mouse =
-            {
-            };
+          mouse = {
+          };
           warp-mouse-to-focus = true;
           focus-follows-mouse = {
             enable = true;

diff --git a/nixos/modules/networking/fw-proxy/default.nix b/nixos/modules/networking/fw-proxy/default.nix
@@ -641,12 +641,10 @@ with lib;
 
             jump filter
 
-            ${
-              lib.concatMapStringsSep "\n" (
-                level:
-                "meta l4proto { tcp, udp } socket cgroupv2 level ${toString level} @cgroups meta mark set ${toString cfg.tproxy.fwmark}"
-              ) (lib.range 1 cfg.tproxy.maxCgroupLevel)
-            }
+            ${lib.concatMapStringsSep "\n" (
+              level:
+              "meta l4proto { tcp, udp } socket cgroupv2 level ${toString level} @cgroups meta mark set ${toString cfg.tproxy.fwmark}"
+            ) (lib.range 1 cfg.tproxy.maxCgroupLevel)}
           }
 
           chain filter {

diff --git a/nixos/modules/networking/mesh/default.nix b/nixos/modules/networking/mesh/default.nix
@@ -330,26 +330,22 @@ in
           }
           filter filter_mesh_kernel_v4 {
             if source = RTS_STATIC then reject;
-            ${
-              lib.concatMapStringsSep "\n  " (
-                cidr:
-                "if net ~ [ ${cidr.prefix}+ ] then krt_prefsrc = ${
-                  cfg.thisHost.cidrs.${cidr.name}.preferredAddress
-                };"
-              ) (lib.attrValues cfg.cidrsV4)
-            }
+            ${lib.concatMapStringsSep "\n  " (
+              cidr:
+              "if net ~ [ ${cidr.prefix}+ ] then krt_prefsrc = ${
+                cfg.thisHost.cidrs.${cidr.name}.preferredAddress
+              };"
+            ) (lib.attrValues cfg.cidrsV4)}
             accept;
           }
           filter filter_mesh_kernel_v6 {
             if source = RTS_STATIC then reject;
-            ${
-              lib.concatMapStringsSep "\n  " (
-                cidr:
-                "if net ~ [ ${cidr.prefix}+ ] then krt_prefsrc = ${
-                  cfg.thisHost.cidrs.${cidr.name}.preferredAddress
-                };"
-              ) (lib.attrValues cfg.cidrsV6)
-            }
+            ${lib.concatMapStringsSep "\n  " (
+              cidr:
+              "if net ~ [ ${cidr.prefix}+ ] then krt_prefsrc = ${
+                cfg.thisHost.cidrs.${cidr.name}.preferredAddress
+              };"
+            ) (lib.attrValues cfg.cidrsV6)}
             accept;
           }
           protocol kernel kernel_mesh_v4 {
@@ -384,16 +380,14 @@ in
               type tunnel;
               ${cfg.bird.babelInterfaceConfig}
             };
-            ${
-              lib.concatStringsSep "\n" (
-                lib.mapAttrsToList (pattern: ifCfg: ''
-                  interface "${pattern}" {
-                    type ${ifCfg.type};
-                    ${ifCfg.extraConfig}
-                  };
-                '') cfg.extraInterfaces
-              )
-            }
+            ${lib.concatStringsSep "\n" (
+              lib.mapAttrsToList (pattern: ifCfg: ''
+                interface "${pattern}" {
+                  type ${ifCfg.type};
+                  ${ifCfg.extraConfig}
+                };
+              '') cfg.extraInterfaces
+            )}
           }
         '';
         networking.firewall.allowedUDPPorts = [ config.ports.babel ];

diff --git a/nixos/profiles/boot/kernel/intel.nix b/nixos/profiles/boot/kernel/intel.nix
@@ -22,9 +22,7 @@ in
       let
         source = pkgs.nur.repos.linyinfeng.sources."linux-intel-${cfg.type}";
         intelVersion = source.version;
-        version =
-          lib.elemAt (lib.strings.match "${cfg.type}-v([0-9\\.]+)-linux-([0-9]+T[0-9]+Z)" intelVersion)
-            0;
+        version = lib.elemAt (lib.strings.match "${cfg.type}-v([0-9\\.]+)-linux-([0-9]+T[0-9]+Z)" intelVersion) 0;
         major = lib.versions.major version;
         minor = lib.versions.minor version;
         linux_intel_fn =

diff --git a/nixos/profiles/graphical/gnome/default.nix b/nixos/profiles/graphical/gnome/default.nix
@@ -50,12 +50,13 @@ lib.mkIf config.services.xserver.desktopManager.gnome.enable {
           inherit (ownerOptions) user group;
         };
       };
-      "${config.users.users.gnome-remote-desktop.home}/.local/share/gnome-remote-desktop/credentials.ini" = {
-        "L+" = {
-          argument = config.sops.templates."gnome-remote-desktop-credentials".path;
-          inherit (ownerOptions) user group;
+      "${config.users.users.gnome-remote-desktop.home}/.local/share/gnome-remote-desktop/credentials.ini" =
+        {
+          "L+" = {
+            argument = config.sops.templates."gnome-remote-desktop-credentials".path;
+            inherit (ownerOptions) user group;
+          };
         };
-      };
       "${config.users.users.gnome-remote-desktop.home}/.local/share/gnome-remote-desktop/grd.conf" = {
         "L+" = {
           argument = toString (

diff --git a/nixos/profiles/services/prebuilt-zip/default.nix b/nixos/profiles/services/prebuilt-zip/default.nix
@@ -23,8 +23,11 @@ in
   };
   security.acme.certs."prebuilt-zip" = {
     domain = "prebuilt.zip";
-    extraDomainNames = [
-      "*.prebuilt.zip"
-    ] ++ lib.lists.map (n: "*.${toString n}.prebuilt.zip") (lib.range 0 9) ++ explicitRickRolls;
+    extraDomainNames =
+      [
+        "*.prebuilt.zip"
+      ]
+      ++ lib.lists.map (n: "*.${toString n}.prebuilt.zip") (lib.range 0 9)
+      ++ explicitRickRolls;
   };
 }
diff --git a/nixos/profiles/services/transmission/default.nix b/nixos/profiles/services/transmission/default.nix
@@ -19,7 +19,8 @@ in
   services.nginx.virtualHosts."transmission.*" = {
     forceSSL = true;
     inherit (config.security.acme.tfCerts."li7g_com".nginxSettings) sslCertificate sslCertificateKey;
-    locations."/transmission".proxyPass = "http://localhost:${toString config.services.transmission.settings.rpc-port}";
+    locations."/transmission".proxyPass =
+      "http://localhost:${toString config.services.transmission.settings.rpc-port}";
     locations."/files/" = {
       alias = "/var/lib/transmission/Downloads/";
       extraConfig = ''