refactor: make nixd happy

modules/android.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{config, ...}: let
   inherit (config.vars) mainUser;
 in {
   programs.adb.enable = true;

modules/borgbackup/module.nix

@@ -26,7 +26,7 @@ in {
           }: {
             options = {
               paths = mkOption {
-                type = with types; nullOr (coercedTo str lib.singleton (listOf str));
+                type = types.nullOr (types.coercedTo types.str lib.singleton (types.listOf types.str));
                 default = null;
               };
               dumpCommand = mkOption {
@@ -177,18 +177,17 @@ in {
     };
 
     existingRepos = mkOption {
-      type = with types;
-        listOf (submodule {
-          options = {
-            name = mkOption {
-              type = str;
-            };
-            authorizedKeys = mkOption {
-              type = listOf str;
-              default = [];
-            };
+      type = types.listOf (types.submodule {
+        options = {
+          name = mkOption {
+            type = types.str;
           };
-        });
+          authorizedKeys = mkOption {
+            type = types.listOf types.str;
+            default = [];
+          };
+        };
+      });
       default = [];
     };
   };

modules/dolphin.nix

@@ -27,7 +27,7 @@ in {
 
   home-manager.users.${mainUser}.home.packages = with pkgs;
     []
-    ++ (with pkgs.plasma5Packages; [
+    ++ (with plasma5Packages; [
       ark
       kcharselect
       kdenlive
@@ -43,7 +43,7 @@ in {
       kio-extras
       kmime
     ])
-    ++ (with pkgs.gnome; [
+    ++ (with gnome; [
       gnome-calculator
     ]);
 }

modules/hyprland/default.nix

@@ -34,7 +34,9 @@ in {
     xserver.wacom.enable = isTouchscreen;
   };
 
-  programs.hyprland = with hyprland.packages.${pkgs.system}; {
+  programs.hyprland = let
+    inherit (hyprland.packages.${pkgs.system}) default xdg-desktop-portal-hyprland;
+  in {
     enable = true;
     package = default;
     portalPackage = xdg-desktop-portal-hyprland;

modules/hyprland/security.nix

@@ -33,8 +33,8 @@ in {
       hypridle.homeManagerModules.default
     ];
 
-    home.packages = with pkgs; [
-      gnome.seahorse
+    home.packages = [
+      pkgs.gnome.seahorse
       lockPkg
     ];
 

modules/nvidia.nix

@@ -62,9 +62,9 @@ in {
 
       open = cfg.enableWayland;
 
-      package = with config.boot.kernelPackages.nvidiaPackages;
+      package =
         if !cfg.enableWayland
-        then stable
+        then config.boot.kernelPackages.nvidiaPackages.stable
         else let
           rcu_patch = pkgs.fetchpatch {
             url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
@@ -74,7 +74,7 @@ in {
           # Keep the driver version at 535.xx.xx for Wayland desktop
           # games stutter on more recent versions
           # https://github.com/NixOS/nixpkgs/blob/e256f39bec8e01808c0a3e411d961cbced3f4e09/pkgs/os-specific/linux/nvidia-x11/default.nix#L70
-          mkDriver rec {
+          config.boot.kernelPackages.nvidiaPackages.mkDriver rec {
             version = "535.43.28";
             persistencedVersion = "535.98";
             settingsVersion = "535.98";
@@ -88,14 +88,15 @@ in {
           };
     };
 
-    environment.systemPackages = with pkgs; ([
+    environment.systemPackages =
+      optionals cfg.enableCUDA [pkgs.cudaPackages.cudatoolkit]
+      ++ (with pkgs; [
         libva-utils
         nvidia-vaapi-driver
         nvtopPackages.nvidia
         pciutils
         vdpauinfo
-      ]
-      ++ optionals cfg.enableCUDA [cudaPackages.cudatoolkit]);
+      ]);
 
     boot.kernelModules = optionals cfg.enableCUDA ["nvidia-uvm"];
   };

modules/ratbag-mice.nix

@@ -13,8 +13,8 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    (piper.overrideAttrs {
+  environment.systemPackages = [
+    (pkgs.piper.overrideAttrs {
       name = "piper-${piper-src.shortRev}";
       src = piper-src;