diff --git a/devshells/default/default.nix b/devshells/default/default.nix
index 4ab7fc3..e237b23 100644
--- a/devshells/default/default.nix
+++ b/devshells/default/default.nix
@@ -2,12 +2,15 @@
 pkgs.mkShell {
   name = "default";
 
-  buildInputs = with pkgs; [
-    git
-    vim
-    nixos-anywhere
-    ssh-to-age
-  ];
+  buildInputs = builtins.attrValues {
+    inherit
+      (pkgs)
+      git
+      vim
+      nixos-anywhere
+      ssh-to-age
+      ;
+  };
 
   shellHook = ''
     git pull
diff --git a/home/crow/common/optional/comms/default.nix b/home/crow/common/optional/comms/default.nix
index 1fe51f1..c69861b 100644
--- a/home/crow/common/optional/comms/default.nix
+++ b/home/crow/common/optional/comms/default.nix
@@ -1,9 +1,12 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    ferdium
-    discord
-    mattermost
-    slack
-    zoom
-  ];
+  home.packages = builtins.attrValues {
+    inherit
+      (pkgs)
+      ferdium
+      discord
+      mattermost
+      slack
+      zoom
+      ;
+  };
 }
diff --git a/home/crow/common/optional/media/default.nix b/home/crow/common/optional/media/default.nix
index 7f20964..5f99530 100644
--- a/home/crow/common/optional/media/default.nix
+++ b/home/crow/common/optional/media/default.nix
@@ -1,7 +1,10 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    spotify
-    vlc
-    libreoffice-qt6-fresh
-  ];
+  home.packages = builtins.attrValues {
+    inherit
+      (pkgs)
+      spotify
+      vlc
+      libreoffice-qt6-fresh
+      ;
+  };
 }
diff --git a/home/crow/common/optional/misc/gromit-mpx.nix b/home/crow/common/optional/misc/gromit-mpx.nix
index 06a570e..c2973b0 100644
--- a/home/crow/common/optional/misc/gromit-mpx.nix
+++ b/home/crow/common/optional/misc/gromit-mpx.nix
@@ -10,8 +10,11 @@
 in {
   home.file.".config/makima/Wacom One by Wacom S Pen.toml".text = makimaConfig;
 
-  home.packages = with pkgs; [
-    makima
-    gromit-mpx
-  ];
+  home.packages = builtins.attrValues {
+    inherit
+      (pkgs)
+      makima
+      gromit-mpx
+      ;
+  };
 }
diff --git a/hosts/common/optional/pentesting.nix b/hosts/common/optional/pentesting.nix
index 28ea2b0..9f78ef8 100644
--- a/hosts/common/optional/pentesting.nix
+++ b/hosts/common/optional/pentesting.nix
@@ -7,18 +7,20 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    metasploit
-    exploitdb
-    termshark
-    nmap
-    dirstalk
-    hashcat
-    trufflehog
-    python313
-    python313Packages.pyftdi
-    flashrom
-    sigrok-cli
-    pulseview
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      metasploit
+      exploitdb
+      termshark
+      nmap
+      dirstalk
+      hashcat
+      trufflehog
+      python313
+      flashrom
+      sigrok-cli
+      pulseview
+      ;
+  };
 }
diff --git a/hosts/droid/Siren/default.nix b/hosts/droid/Siren/default.nix
index b3184a7..7a0c901 100644
--- a/hosts/droid/Siren/default.nix
+++ b/hosts/droid/Siren/default.nix
@@ -5,11 +5,14 @@
   pkgs,
   ...
 }: {
-  environment.packages = with pkgs; [
-    inputs.nvix.packages.${pkgs.system}.default
-    git
-    openssh
-  ];
+  environment.packages = builtins.attrValues {
+    inherit (inputs.nvix.packages.${pkgs.system}) default;
+    inherit
+      (pkgs)
+      git
+      openssh
+      ;
+  };
 
   environment.etcBackupExtension = ".bak";
 
diff --git a/hosts/nixos/Natsirt/default.nix b/hosts/nixos/Natsirt/default.nix
index 202c722..d8bd5e1 100644
--- a/hosts/nixos/Natsirt/default.nix
+++ b/hosts/nixos/Natsirt/default.nix
@@ -77,7 +77,8 @@
 
   services.cups.enable = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
+    inherit (pkgs)
     wine
     krita
     appimage-run
@@ -93,6 +94,6 @@
         pcsx-rearmed
       ];
     })
-    supermariowar
+    supermariowar;
   ];
 }
diff --git a/nixos-bootstrap/installer-config.nix b/nixos-bootstrap/installer-config.nix
index 6d33596..3f4a6ea 100644
--- a/nixos-bootstrap/installer-config.nix
+++ b/nixos-bootstrap/installer-config.nix
@@ -6,15 +6,18 @@
 }: let
   loginKey = builtins.readFile ./installer.pub;
 in {
-  environment.systemPackages = with pkgs; [
-    inputs.nvix.packages.${pkgs.system}.default
-    vim
-    git
-    just
-    curl
-    wget
-    disko
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit (inputs.nvix.packages.${pkgs.system}) default;
+    inherit
+      (pkgs)
+      vim
+      git
+      just
+      curl
+      wget
+      disko
+      ;
+  };
 
   boot.supportedFilesystems = lib.mkForce ["zfs" "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs"];