treewide: apply suggestions by nixd

inclyc · Apr 23, 2024 · 0f66425 · 0f66425
1 parent 598971e
commit 0f66425
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 45 deletions.
diff --git a/flake.nix b/flake.nix
@@ -34,7 +34,6 @@
     { self
     , nixpkgs
     , nur
-    , home-manager
     , flake-utils
     , flake-parts
     , sops-nix

diff --git a/home/lyc/configurations/aplaz/default.nix b/home/lyc/configurations/aplaz/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, ... }:
 {
   services.kdeconnect.enable = true;
 

diff --git a/home/lyc/modules/default.nix b/home/lyc/modules/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   imports = [
     ./programs/direnv.nix

diff --git a/nixos/configurations/adrastea/default.nix b/nixos/configurations/adrastea/default.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, lib, inputs, ... }:
+{ pkgs, lib, ... }:
 
 {
   inclyc = {

diff --git a/nixos/configurations/adrastea/networking.nix b/nixos/configurations/adrastea/networking.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ ... }:
 let
   mkTapDev = name: {
     "20-${name}" = {
@@ -22,29 +22,29 @@ in
 
   services.dante.enable = true;
   services.dante.config = ''
-    internal: 0.0.0.0 port = 20179
-    external: br0
-    clientmethod: none
-    socksmethod: none
-      client pass {
-	    from: 0.0.0.0/0 to: 0.0.0.0/0
-	    log: error connect disconnect
-    }
-    socks pass {
-	    from: 0.0.0.0/0 to: 10.3.2.104/32
-	    command: bind connect udpassociate bindreply udpreply
-	    log: error connect disconnect iooperation
-    }
-    socks pass {
-	    from: 0.0.0.0/0 to: 10.3.2.130/32
-	    command: bind connect udpassociate bindreply udpreply
-	    log: error connect disconnect iooperation
-    }
-    socks pass {
-	    from: 0.0.0.0/0 to: 10.208.130.239/32
-	    command: bind connect udpassociate bindreply udpreply
-	    log: error connect disconnect iooperation
-    }
+        internal: 0.0.0.0 port = 20179
+        external: br0
+        clientmethod: none
+        socksmethod: none
+          client pass {
+    	    from: 0.0.0.0/0 to: 0.0.0.0/0
+    	    log: error connect disconnect
+        }
+        socks pass {
+    	    from: 0.0.0.0/0 to: 10.3.2.104/32
+    	    command: bind connect udpassociate bindreply udpreply
+    	    log: error connect disconnect iooperation
+        }
+        socks pass {
+    	    from: 0.0.0.0/0 to: 10.3.2.130/32
+    	    command: bind connect udpassociate bindreply udpreply
+    	    log: error connect disconnect iooperation
+        }
+        socks pass {
+    	    from: 0.0.0.0/0 to: 10.208.130.239/32
+    	    command: bind connect udpassociate bindreply udpreply
+    	    log: error connect disconnect iooperation
+        }
   '';
 
   systemd.network.enable = true;

diff --git a/nixos/configurations/adrastea/vm.nix b/nixos/configurations/adrastea/vm.nix
@@ -20,7 +20,6 @@ let
     , enableEmulatedGPU ? false
     , enableGPUPassthrough ? true
     , enableEvdevInputs ? true
-    , enableUSB ? true
     , memory
     }:
     let

diff --git a/nixos/configurations/metis/default.nix b/nixos/configurations/metis/default.nix
@@ -1,5 +1,4 @@
-{ config
-, pkgs
+{ pkgs
 , lib
 , inputs
 , ...

diff --git a/nixos/configurations/metis/hardware-configuration.nix b/nixos/configurations/metis/hardware-configuration.nix
@@ -1,11 +1,12 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
@@ -16,25 +17,29 @@
   zramSwap.enable = true;
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
+    {
+      device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
       fsType = "btrfs";
       options = [ "subvol=root" "compress=zstd" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
+    {
+      device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
       fsType = "btrfs";
       options = [ "subvol=home" "compress=zstd" ];
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
+    {
+      device = "/dev/disk/by-uuid/30f213a7-0d61-4053-9e50-e02f43c16d38";
       fsType = "btrfs";
       options = [ "subvol=nix" "compress=zstd" "noatime" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B094-B461";
+    {
+      device = "/dev/disk/by-uuid/B094-B461";
       fsType = "vfat";
     };
 

diff --git a/nixos/configurations/metis/minecraft/caketower.nix b/nixos/configurations/metis/minecraft/caketower.nix
@@ -22,7 +22,7 @@ in
     after = [ "systemd-networkd-wait-online.service" ];
     description = "Minecraft Server (Cake Tower)";
     requires = [ "${serviceName}.socket" ];
-    serviceConfig = rec {
+    serviceConfig = {
       Type = "simple";
       DynamicUser = true;
       StateDirectory = directory;

diff --git a/nixos/configurations/metis/minecraft/construct.nix b/nixos/configurations/metis/minecraft/construct.nix
@@ -22,7 +22,7 @@ in
     after = [ "systemd-networkd-wait-online.service" ];
     description = "Minecraft Server (Constructions)";
     requires = [ "${serviceName}.socket" ];
-    serviceConfig = rec {
+    serviceConfig = {
       Type = "simple";
       DynamicUser = true;
       StateDirectory = directory;

diff --git a/nixos/configurations/metis/minecraft/dawncraft.nix b/nixos/configurations/metis/minecraft/dawncraft.nix
@@ -22,7 +22,7 @@ in
     after = [ "systemd-networkd-wait-online.service" ];
     description = "Minecraft Server (DawnCraft 1.33f)";
     requires = [ "${serviceName}.socket" ];
-    serviceConfig = rec {
+    serviceConfig = {
       Type = "simple";
       DynamicUser = true;
       StateDirectory = directory;

diff --git a/nixos/configurations/metis/minecraft/msd.nix b/nixos/configurations/metis/minecraft/msd.nix
@@ -22,7 +22,7 @@ in
     after = [ "systemd-networkd-wait-online.service" ];
     description = "Minecraft Server (Modern Skyblock 3: Departed)";
     requires = [ "${serviceName}.socket" ];
-    serviceConfig = rec {
+    serviceConfig = {
       Type = "simple";
       DynamicUser = true;
       StateDirectory = directory;

diff --git a/nixos/configurations/metis/wireguard.nix b/nixos/configurations/metis/wireguard.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   sops.secrets."wireguard/privkeys/metis" = {
     owner = config.users.users.systemd-network.name;

diff --git a/nixos/modules/clash/default.nix b/nixos/modules/clash/default.nix
@@ -35,7 +35,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "systemd-networkd-wait-online.service" ];
         description = "Clash Daemon";
-        serviceConfig = rec {
+        serviceConfig = {
           Type = "simple";
           DynamicUser = "yes";
           LoadCredential = "config.yaml:${cfg.configPath}";

diff --git a/pkgs/topsap/default.nix b/pkgs/topsap/default.nix
@@ -3,15 +3,14 @@
 , perl
 , dpkg
 , libuuid
-, buildFHSUserEnvBubblewrap
 , autoPatchelfHook
 , ...
 }:
 stdenv.mkDerivation rec {
   pname = "topsap";
   version = "3.5.2.36.2";
   src = fetchurl {
-    urls =  [
+    urls = [
       "https://github.com/inclyc/containerized-topsap/releases/download/topsec-v${version}/TopSAP-${version}-x86_64.deb"
       "https://app.topsec.com.cn/vpn/sslvpnclient/TopSAP-${version}-x86_64.deb"
     ];