refactor: move away from with pkgs;

roles/desktop.nix

@@ -16,13 +16,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ cifs-utils ];
+    environment.systemPackages = [ pkgs.cifs-utils ];
     home-manager = {
       users.${username} = {
-        home.packages = with pkgs; [
+        home.packages = [
           # Home packages
-          swaylock
-          lm_sensors
+          pkgs.swaylock
+          pkgs.lm_sensors
         ];
       };
     };

roles/gui.nix

@@ -65,48 +65,48 @@ in
           };
         };
       };
-      home.packages = with pkgs; [
-        dconf
-        element-desktop
-        dino
-        signal-desktop
-        mumble
-        anki
-        wdisplays
-        librewolf
-        ungoogled-chromium
-        nsxiv
-        imv
-        libreoffice
-        nautilus
-        spotify-player
-        thunderbird
-        lxqt.pavucontrol-qt
-        mpv
-        kdePackages.kdeconnect-kde
-        libgnome-keyring
-        foot
-        nautilus
-        tesseract
-        yubikey-touch-detector
-        wireguard-tools
-        openresolv
-        xdg-utils
-        killall
-        libnotify
-        openssl
-        pamixer
-        playerctl
-        wl-clipboard
-        cliphist
-        poweralertd
+      home.packages = [
+        pkgs.dconf
+        pkgs.element-desktop
+        pkgs.dino
+        pkgs.signal-desktop
+        pkgs.mumble
+        pkgs.anki
+        pkgs.wdisplays
+        pkgs.librewolf
+        pkgs.ungoogled-chromium
+        pkgs.nsxiv
+        pkgs.imv
+        pkgs.libreoffice
+        pkgs.nautilus
+        pkgs.spotify-player
+        pkgs.thunderbird
+        pkgs.lxqt.pavucontrol-qt
+        pkgs.mpv
+        pkgs.kdePackages.kdeconnect-kde
+        pkgs.libgnome-keyring
+        pkgs.foot
+        pkgs.nautilus
+        pkgs.tesseract
+        pkgs.yubikey-touch-detector
+        pkgs.wireguard-tools
+        pkgs.openresolv
+        pkgs.xdg-utils
+        pkgs.killall
+        pkgs.libnotify
+        pkgs.openssl
+        pkgs.pamixer
+        pkgs.playerctl
+        pkgs.wl-clipboard
+        pkgs.cliphist
+        pkgs.poweralertd
 
         # Gaming
         # lunar-client
 
         # Not GUI but specific to GUI usage
-        sshuttle
-        sshfs
+        pkgs.sshuttle
+        pkgs.sshfs
 
         # pkgs.nerdfonts
         # (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })

roles/laptop.nix

@@ -16,17 +16,17 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      cifs-utils
-      powertop
+    environment.systemPackages = [
+      pkgs.cifs-utils
+      pkgs.powertop
     ];
     home-manager = {
       users.${username} = {
-        home.packages = with pkgs; [
-          acpi
-          brightnessctl
-          powertop
-          lm_sensors
+        home.packages = [
+          pkgs.acpi
+          pkgs.brightnessctl
+          pkgs.powertop
+          pkgs.lm_sensors
         ];
       };
     };

roles/nvidia.nix

@@ -27,22 +27,22 @@ in
       enableRedistributableFirmware = true;
       graphics = {
         enable = true;
-        extraPackages = with pkgs; [
+        extraPackages = [
           # amdvlk would be the package that would be required for AMD on desktop, since none of the hosts use NVIDIA as a desktop GPU, this is open and uncertain.
         ];
         # For 32 bit applications as well
-        extraPackages32 = with pkgs; [
+        extraPackages32 = [
           # driversi686Linux.amdvlk would be the package that would be required for AMD on desktop, since none of the hosts use NVIDIA as a desktop GPU, this is open and uncertain.
         ];
       };
     };
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
       # amdvlk
       #nvidia-x11
       #nvidia-settings
       #nvidia-persistenced
-      nvtopPackages.nvidia
+      pkgs.nvtopPackages.nvidia
     ];
   };
 }

roles/router.nix

@@ -16,10 +16,10 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
       pkgs.kitty.terminfo
-      powertop
-      bind
+      pkgs.powertop
+      pkgs.bind
     ];
 
     services = {

roles/server.nix

@@ -16,11 +16,11 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      kitty.terminfo
-      foot.terminfo
-      powertop
-      lm_sensors
+    environment.systemPackages = [
+      pkgs.kitty.terminfo
+      pkgs.foot.terminfo
+      pkgs.powertop
+      pkgs.lm_sensors
     ];
 
     services = {

roles/wine.nix

@@ -1,19 +1,27 @@
-{ lib, pkgs, config, username, home-manager, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  username,
+  home-manager,
+  ...
+}:
 with lib;
 let
   cfg = config.liv.wine;
-in {
+in
+{
   options.liv.wine = {
     enable = mkEnableOption "Enable wine";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      wineWowPackages.stable
-      wineWowPackages.waylandFull
-      winetricks
-      mono5
-      mono
+    environment.systemPackages = [
+      pkgs.wineWowPackages.stable
+      pkgs.wineWowPackages.waylandFull
+      pkgs.winetricks
+      pkgs.mono5
+      pkgs.mono
     ];
   };
 }