style: remove unnecessary parentheses around primitive expressions an…

…d add inherits
yunfachi · Dec 24, 2023 · 37c82f9 · 37c82f9
1 parent baacf8f
commit 37c82f9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
@@ -25,12 +25,14 @@ in {
 
       settings = lib.mkMerge [
         {
-          monitor = map (
-            m: let
-              resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}";
-              position = "${toString m.x}x${toString m.y}";
-            in "${m.name},${resolution},${position},${toString m.scale}"
-          ) (config.yunfachi.monitors);
+          monitor =
+            map (
+              m: let
+                resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}";
+                position = "${toString m.x}x${toString m.y}";
+              in "${m.name},${resolution},${position},${toString m.scale}"
+            )
+            config.yunfachi.monitors;
 
           input = {
             kb_layout = "${

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -12,7 +12,7 @@
   hosts = builtins.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir ./.));
 
   mkHost = host: let
-    config = specialArgs.self.nixosConfigurations."${host}".config;
+    inherit (specialArgs.self.nixosConfigurations."${host}") config;
 
     nixosModules = [
       ./${host}/hardware.nix
@@ -25,12 +25,12 @@
         ../options
         ../home
       ]
-      ++ builtins.map (host: (import ./${host}/shared.nix {host = host;})) hosts;
+      ++ builtins.map (host: (import ./${host}/shared.nix {inherit host;})) hosts;
 
     extraSpecialArgs =
       {
         inherit host isNixOS;
-        type = config.yunfachi.type;
+        inherit (config.yunfachi) type;
       }
       // specialArgs;
   in

diff --git a/hosts/dekomori/hardware.nix b/hosts/dekomori/hardware.nix
@@ -7,10 +7,14 @@
 }: {
   imports = [];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";

diff --git a/hosts/mitama/hardware.nix b/hosts/mitama/hardware.nix
@@ -9,10 +9,14 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/66b29ea1-e3d5-4e5f-b0e9-298b3ea7c10f";
@@ -29,7 +33,6 @@
   ];
 
   networking.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "${system}";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/nixos/wireguard.nix b/nixos/wireguard.nix
@@ -20,9 +20,7 @@ in {
       };
       wg-quick.interfaces = {
         wg0 =
-          {
-            privateKey = cfg.privateKey;
-          }
+          {inherit (cfg) privateKey;}
           // (
             if cfg.type == "server"
             then {

diff --git a/options/services.nix b/options/services.nix
@@ -29,7 +29,7 @@ in {
         description = "The private key of the current host.";
       };
       routedIPs = mkOption {
-        type = types.listOf (types.str);
+        type = types.listOf types.str;
         default = ["0.0.0.0/0" "::/0"];
         example = [];
         description = "A list of IP addresses or CIDR blocks that will be routed through the VPN. Only needed for the client.";