chore: Fix nixd / statix errors

I'm okay with editing hardware-configuration.nix now that I understand
how it works.

flake.nix

@@ -90,7 +90,7 @@
             let
               directory = replaceStrings flakeOutputs flakeDirectories attributeName;
 
-              attributeValue = (listToAttrs
+              attributeValue = listToAttrs
                 (map
                   (file: {
                     name = replaceStrings [ ".nix" ] [ "" ] file;
@@ -107,9 +107,9 @@
                             }
                         else import ./${directory}/${file};
                   })
-                  (attrNames (readDir ./${directory}))));
+                  (attrNames (readDir ./${directory})));
 
-              aarch64Packages = (listToAttrs
+              aarch64Packages = listToAttrs
                 (map
                   (file: {
                     name = replaceStrings [ ".nix" ] [ "" ] file;
@@ -118,7 +118,7 @@
                       then aarch64-linux.callPackage ./${directory}/${file} { }
                       else null;
                   })
-                  (attrNames (readDir ./${directory}))));
+                  (attrNames (readDir ./${directory})));
 
               attributeSet =
                 if directory == "packages"
@@ -133,7 +133,7 @@
                   }
                   else attributeValue;
             in
-            (attributeSet);
+            attributeSet;
         })
-        (flakeOutputs)));
+        flakeOutputs));
 }

home/hyprland.nix

@@ -261,7 +261,8 @@ in
     '';
   };
 
-  xdg.configFile.${gapsScript} = {
+  xdg.configFile = {
+    ${gapsScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -273,7 +274,7 @@ in
       '';
     };
 
-  xdg.configFile.${setBackgroundScript} = {
+    ${setBackgroundScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -299,7 +300,7 @@ in
       '';
     };
 
-  xdg.configFile.${randomBackgroundScript} = {
+    ${randomBackgroundScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -310,7 +311,7 @@ in
       '';
     };
 
-  xdg.configFile.${swapBackgroundScript} = {
+    ${swapBackgroundScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -324,7 +325,7 @@ in
       '';
     };
 
-  xdg.configFile.${monitorScript} = {
+    ${monitorScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -336,6 +337,7 @@ in
         end
       '';
     };
+  };
 
   programs.hyprlock = {
     enable = true;

home/ironbar.nix

@@ -13,7 +13,8 @@ in
 {
   home.packages = [ ironbar ];
 
-  xdg.configFile."ironbar/config.json".text = toJSON {
+  xdg.configFile = {
+    "ironbar/config.json".text = toJSON {
       name = "main";
       icon_theme = "Fluent-dark";
       position = "bottom";
@@ -68,7 +69,7 @@ in
       ];
     };
 
-  xdg.configFile."ironbar/style.css".text = /* css */ ''
+    "ironbar/style.css".text = /* css */ ''
       * {
         font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid";
         font-size: 16px;
@@ -175,7 +176,7 @@ in
       }
     '';
 
-  xdg.configFile.${mullvadScript} = {
+    ${mullvadScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -243,7 +244,7 @@ in
       '';
     };
 
-  xdg.configFile.${volumeScript} = {
+    ${volumeScript} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -259,7 +260,7 @@ in
       '';
     };
 
-  xdg.configFile.${volumeGet} = {
+    ${volumeGet} = {
       executable = true;
       text = /* fish */ ''
         #!/usr/bin/env fish
@@ -268,4 +269,5 @@ in
         echo "音量：$(math "$VOLUME * 100")%"
       '';
     };
+  };
 }

hosts/laptop/hardware-configuration.nix

@@ -5,10 +5,15 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd = {
-  boot.kernelModules = [ "kvm-amd" ];
+      availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-  boot.extraModulePackages = [ ];
+      kernelModules = [ ];
+    };
+
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";

modules/desktop.nix

@@ -171,18 +171,19 @@ in
     fonts = {
       enableDefaultPackages = false;
 
-      packages = with pkgs; [
+      packages = [
-        noto-fonts
         noto-fonts-cjk-sans
-        noto-fonts-cjk-serif
         noto-fonts-emoji
         maple-mono
+        aleo-fonts
+      ] ++ (with pkgs; [
+        noto-fonts
+        noto-fonts-cjk-serif
         font-awesome
         (nerdfonts.override { fonts = [ "Noto" ]; })
         kanji-stroke-order-font
         liberation_ttf
-        aleo-fonts
+      ]);
-      ];
 
       fontconfig = {
         defaultFonts = {

modules/shell.nix

@@ -6,11 +6,12 @@ let
   inherit (builtins) attrValues;
 in
 {
-  config = {
   users.defaultUserShell = fish;
-    environment.shells = [ fish ];
 
-    environment.sessionVariables = {
+  environment = {
+    shells = [ fish ];
+
+    sessionVariables = {
       GIT_DISCOVERY_ACROSS_FILESYSTEM = "1";
       FZF_DEFAULT_OPTS = "--height 40% --reverse --border --color=16";
       NODE_OPTIONS = "--max-old-space-size=16384";
@@ -18,7 +19,7 @@ in
       GATSBY_TELEMETRY_DISABLED = "1";
     };
 
-    environment.systemPackages = mkMerge [
+    systemPackages = mkMerge [
       (attrValues {
         inherit (pkgs)
           wget
@@ -119,6 +120,7 @@ in
           ;
       })
     ];
+  };
 
   programs = {
     fish.enable = true;
@@ -129,5 +131,4 @@ in
       silent = true;
     };
   };
-  };
 }