the great with purge

modules/packages/hardware.nix

@@ -5,9 +5,4 @@
   ...
 }: let
 in {
-  # environment.systemPackages = with pkgs; lib.mkMerge [
-  #   (mkIf cfg.bluetooth.enable [
-
-  #   ])
-  # ];
 }

modules/packages/module.nix

@@ -5,15 +5,18 @@
     # ./media.nix
   ];
   # These are some standard packages I want to have installed on every system, regardless of type or use case.
-  environment.systemPackages = with pkgs; [
-    calc # Calculator device
-    coreutils-full # All of the GNU coreutils
-    curl # I sometimes need to curl stuff
-    git # take a guess
-    inetutils # internet stuff I need/want on every system.
-    wget
-    unzip # zipping and unzipping stuff
-    zip
-    util-linux
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      calc # Calculator device
+      coreutils-full # All of the GNU coreutils
+      curl # I sometimes need to curl stuff
+      git # take a guess
+      inetutils # internet stuff I need/want on every system.
+      wget
+      unzip # zipping and unzipping stuff
+      zip
+      util-linux
+      ;
+  };
 }

modules/packages/wayland.nix

@@ -1,13 +1,15 @@
 {
   config,
-  lig,
+  lib,
   pkgs,
   ...
-}: let
-in {
+}: {
   # These are packages I only need in wayland environments, nowhere else.
-  environment.systemPackages = with pkgs; [
-    wl-clipboard
-    grimblast
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      wl-clipboard
+      grimblast
+      ;
+  };
 }

modules/programs/gui/foot.nix

@@ -95,27 +95,27 @@
       select-word = "BTN_LEFT-2";
       select-word-whitespace = "Control+BTN_LEFT-2";
     };
-    colors = with colours; {
-      background = base00; # base color
-      foreground = base05; # text color
+    colors = {
+      background = colours.base00; # base color
+      foreground = colours.base05; # text color
 
-      regular0 = base03; # black
-      regular1 = base08; # red
-      regular2 = base0B; # green
-      regular3 = base0A; # yellow
-      regular4 = base0D; # blue
-      regular5 = base0F; #magenta
-      regular6 = base0C; #cyan
-      regular7 = base06; #white
+      regular0 = colours.base03; # black
+      regular1 = colours.base08; # red
+      regular2 = colours.base0B; # green
+      regular3 = colours.base0A; # yellow
+      regular4 = colours.base0D; # blue
+      regular5 = colours.base0F; #magenta
+      regular6 = colours.base0C; #cyan
+      regular7 = colours.base06; #white
 
-      bright0 = base04; # Surface 2
-      bright1 = base08; # red
-      bright2 = base0B; # green
-      bright3 = base0A; # yellow
-      bright4 = base0D; # blue
-      bright5 = base0F; # pink
-      bright6 = base0C; # teal
-      bright7 = base07; # Subtext 0
+      bright0 = colours.base04; # Surface 2
+      bright1 = colours.base08; # red
+      bright2 = colours.base0B; # green
+      bright3 = colours.base0A; # yellow
+      bright4 = colours.base0D; # blue
+      bright5 = colours.base0F; # pink
+      bright6 = colours.base0C; # teal
+      bright7 = colours.base07; # Subtext 0
 
       alpha = 1.0;
     };

modules/programs/gui/minecraft.nix

@@ -3,9 +3,10 @@
   lib,
   pkgs,
   ...
-}:
-with lib; let
+}: let
   cfg = config.modules.programs.minecraft;
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.modules) mkIf;
 in {
   options.modules.programs.minecraft = {
     enable = mkEnableOption "minecraft";

modules/services/locate.nix

@@ -10,7 +10,7 @@
 in {
   options.modules.services.locate.enable = mkEnableOption "Locate service";
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [plocate];
+    environment.systemPackages = [pkgs.plocate];
     services.locate = {
       enable = true;
       interval = "hourly";

modules/services/pipewire.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib; let
+}: let
   cfg = config.modules.system.sound;
+  inherit (lib.modules) mkIf;
 in {
   config = mkIf cfg.enable {
     services.pulseaudio.enable = false;

modules/style/quickshell/module.nix

@@ -8,7 +8,7 @@
   #   inherit (inputs) quickshell;
   #   inherit (lib.generators) toKeyValue;
 in {
-  #   environment.systemPackages = with pkgs; [
+  #   environment.systemPackages =  [
   #     qt6.qtimageformats # amog
   #     qt6.qt5compat # shader fx
   #     (quickshell.packages.x86_64-linux.default.override {