treewide(nix): Remove duplicate attribute name usage

Found thanks to nixd showing different colors for these.

containers/wine.nix

@@ -16,12 +16,14 @@ in
 {
   modules.desktop.graphical = true;
 
-  networking.nat.forwardPorts = singleton {
+  networking = {
+    nat.forwardPorts = singleton {
       destination = "192.168.100.49:${sakayaPort}";
       sourcePort = sakayaPort;
     };
 
-  networking.firewall.allowedTCPPorts = [ sakayaPort ];
+    firewall.allowedTCPPorts = [ sakayaPort ];
+  };
 
   systemd.services.sakaya = {
     enable = true;
@@ -40,15 +42,17 @@ in
     wantedBy = [ "multi-user.target" ];
   };
 
-  environment.systemPackages =
+  environment = {
+    systemPackages =
       (with pkgs; [
         wineWowPackages.waylandFull
         winetricks
       ])
       ++ [ sakaya ];
 
-  environment.sessionVariables = {
+    sessionVariables = {
       LC_ALL = "ja_JP.UTF-8";
       TZ = "Asia/Tokyo";
     };
+  };
 }

flake.nix

@@ -113,8 +113,10 @@
           };
         };
 
-      formatter.x86_64-linux = x86_64-linux.nixfmt-rfc-style;
-      formatter.aarch64-linux = aarch64-linux.nixfmt-rfc-style;
+      formatter = {
+        x86_64-linux = x86_64-linux.nixfmt-rfc-style;
+        aarch64-linux = aarch64-linux.nixfmt-rfc-style;
+      };
     }
     // (listToAttrs (
       map (attributeName: {

home/alacritty.nix

@@ -3,9 +3,9 @@
     enable = true;
 
     settings = {
-      window = {
-        padding.x = 10;
-        padding.y = 10;
+      window.padding = {
+        x = 10;
+        y = 10;
       };
 
       mouse.hide_when_typing = true;

home/eww.nix

@@ -17,7 +17,8 @@ in
 {
   home.packages = with pkgs; [ eww ];
 
-  xdg.configFile."eww/eww.yuck".text = # yuck
+  xdg.configFile = {
+    "eww/eww.yuck".text = # yuck
       ''
         (defwidget icons []
           (box :orientation "h" :spacing 32
@@ -49,7 +50,7 @@ in
           time)
       '';
 
-  xdg.configFile."eww/eww.scss".text = # scss
+    "eww/eww.scss".text = # scss
       ''
         img {
           all: unset;
@@ -68,4 +69,5 @@ in
           opacity: 0.4;
         }
       '';
+  };
 }

home/hyprland.nix

@@ -392,7 +392,8 @@ in
     };
   };
 
-  services.hypridle = {
+  services = {
+    hypridle = {
       enable = true;
 
       settings = {
@@ -425,7 +426,6 @@ in
       };
     };
 
-  services = {
     batsignal.enable = true;
     hyprpaper.enable = mkForce false;
   };

home/qutebrowser.nix

@@ -66,8 +66,11 @@ in
       };
 
       downloads = {
-        location.directory = download;
-        location.prompt = false;
+        location = {
+          directory = download;
+          prompt = false;
+        };
+
         position = "bottom";
         remove_finished = 5000;
       };

hosts/laptop/hardware-configuration.nix

@@ -10,6 +10,8 @@
 
   boot = {
     initrd = {
+      luks.devices."root".device = "/dev/disk/by-label/nixos-luks";
+
       availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -24,17 +26,17 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems."/" = {
+  fileSystems = {
+    "/" = {
       device = "/dev/disk/by-label/nixos";
       fsType = "btrfs";
     };
 
-  boot.initrd.luks.devices."root".device = "/dev/disk/by-label/nixos-luks";
-
-  fileSystems."/boot" = {
+    "/boot" = {
       device = "/dev/disk/by-label/boot";
       fsType = "vfat";
     };
+  };
 
   swapDevices = [ ];
 

hosts/phone/configuration.nix

@@ -51,7 +51,8 @@ in
     config = {
       programs.man.generateCaches = mkForce false;
 
-      xdg.desktopEntries = {
+      xdg = {
+        desktopEntries = {
           htop = no;
           fish = no;
           nvim = no;
@@ -69,13 +70,14 @@ in
           "org.sigxcpu.Livi" = no;
         };
 
-      xdg.userDirs = {
+        userDirs = {
           download = mkForce null;
           documents = mkForce null;
           music = mkForce null;
           pictures = mkForce null;
           videos = mkForce null;
         };
+      };
 
       dconf.settings = {
         "sm/puri/phosh" = {

modules/hardware.nix

@@ -72,9 +72,10 @@ in
       };
     };
 
-    environment.systemPackages = mkIf mouseSettings [ piper ];
+    environment = {
+      systemPackages = mkIf mouseSettings [ piper ];
 
-    environment.etc.${dualFunctionKeysConfig}.text = toJSON {
+      etc.${dualFunctionKeysConfig}.text = toJSON {
         TIMING = [
           { TAP_MILLISEC = 1000; }
           { DOUBLE_TAP_MILLISEC = 0; }
@@ -90,4 +91,5 @@ in
         ];
       };
     };
+  };
 }

specializations/dwm.nix

@@ -5,7 +5,8 @@ let
 in
 {
   home-manager.sharedModules = singleton {
-    services.picom = rec {
+    services = {
+      picom = rec {
         enable = true;
         backend = "glx";
 
@@ -32,7 +33,7 @@ in
         };
       };
 
-    services.dunst = {
+      dunst = {
         enable = true;
 
         iconTheme = {
@@ -60,6 +61,7 @@ in
         };
       };
     };
+  };
 
   services = {
     xserver = {

specializations/gnome.nix

@@ -19,6 +19,8 @@ in
       enable = true;
       user = username;
     };
+
+    greetd.enable = lib.mkForce false;
   };
 
   systemd.services = {
@@ -33,5 +35,4 @@ in
 
   hardware.pulseaudio.enable = false;
   programs.hyprland.enable = lib.mkForce false;
-  services.greetd.enable = lib.mkForce false;
 }

specializations/plasma.nix

@@ -13,9 +13,11 @@ in
         user = username;
       };
     };
-  };
 
-  services.desktopManager.plasma6.enable = true;
+    desktopManager.plasma6.enable = true;
+
+    greetd.enable = lib.mkForce false;
+  };
 
   systemd.services = {
     "getty@tty1".enable = false;
@@ -23,5 +25,4 @@ in
   };
 
   programs.hyprland.enable = lib.mkForce false;
-  services.greetd.enable = lib.mkForce false;
 }