flake: start transitioning away from with

hosts/hermit/programs.nix

@@ -1,5 +1,7 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
       alsa-utils
       anki
       asciinema
@@ -84,5 +86,6 @@
       zapzap
       zip
       zoxide
-  ];
+      ;
+  };
 }

hosts/temperance/programs.nix

@@ -1,11 +1,14 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
       alsa-utils
       anki
       asciinema
       beets
       cachix
       calc
+      cinny-desktop
       difftastic
       dnsutils
       element-desktop
@@ -59,7 +62,6 @@
       typst
       walker
       wayneko
-    wineWowPackages.waylandFull
       wireguard-tools
       xdg-utils
       xournalpp
@@ -67,5 +69,6 @@
       zathura
       zotero
       zoxide
-  ];
+      ;
+  };
 }

modules/programs/gui/steam.nix

@@ -3,8 +3,8 @@
   lib,
   pkgs,
   ...
-}:
-with lib; let
+}: let
+  inherit (lib) mkIf;
   cfg = config.modules.system.programs.steam;
 in {
   config = mkIf cfg.enable {
@@ -17,10 +17,11 @@ in {
         };
 
         extraLibraries = p:
-          with p; [
-            atk
-          ];
+          builtins.attrValues {
+            inherit (p) atk;
           };
+      };
+
       gamescopeSession.enable = true;
       extraCompatPackages = [pkgs.proton-ge-bin.steamcompattool];
     };

modules/style/fonts.nix

@@ -47,16 +47,13 @@ in {
           monospace = ["Iosevka Nerd Font"];
         };
     };
-    packages = with pkgs; [
+    packages = builtins.attrValues {
+      inherit
+        (pkgs)
         # custom-iosevka
         material-icons
         material-design-icons
         papirus-icon-theme
-      nerd-fonts.iosevka
-      nerd-fonts.jetbrains-mono
-      nerd-fonts.comic-shanns-mono
-      nerd-fonts.symbols-only
-
         lexend
         noto-fonts
         noto-fonts-cjk-sans
@@ -64,7 +61,15 @@ in {
         noto-fonts-color-emoji
         corefonts
         font-awesome
-    ];
+        ;
+      inherit
+        (pkgs.nerd-fonts)
+        iosevka
+        jetbrains-mono
+        comic-shanns-mono
+        symbols-only
+        ;
+    };
     fontDir = {
       # Whether to create a directory with links to all fonts in
       # /run/current-system/sw/share/X11/fonts

modules/system/hardware/bluetooth.nix

@@ -12,10 +12,13 @@ in {
       enable = true;
       powerOnBoot = mkIf cfg.powerOnBoot true;
     };
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = builtins.attrValues {
+      inherit
+        (pkgs)
         bluetuith
         bluez
         blueman
-    ];
+        ;
+    };
   };
 }

modules/system/hardware/cpu/intel.nix

@@ -9,9 +9,12 @@
 in {
   hardware = {
     cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
-    graphics.extraPackages = with pkgs; [
+    graphics.extraPackages = builtins.attrValues {
+      inherit
+        (pkgs)
         intel-vaapi-driver
         intel-media-driver
-    ];
+        ;
+    };
   };
 }

modules/system/hardware/graphics.nix

@@ -11,12 +11,14 @@ in {
     hardware = {
       graphics = {
         enable = true;
-        extraPackages = with pkgs;
-          mkIf cfg.amd.enable [
+        extraPackages = mkIf cfg.amd.enable (builtins.attrValues {
+          inherit
+            (pkgs)
             mesa
             libva
             vaapiVdpa
-          ];
+            ;
+        });
       };
       nvidia = mkIf cfg.nvidia.enable {
         modesetting.enable = true;

modules/user/default.nix

@@ -11,10 +11,9 @@
   module = {
     config = {
       environment.sessionVariables.EDITOR = "hx";
-      environment.systemPackages = with packages; [
-        fish
-        helix
-      ];
+      environment.systemPackages = builtins.attrValues {
+        inherit (packages) fish helix;
+      };
     };
   };
 }

modules/user/kakoune/default.nix

@@ -31,11 +31,9 @@
       ln -s --relative "$autoload_target" autoload
     '';
   };
-
-  plugins = with kakounePlugins; [
-    fzf-kak
-    kakoune-catppuccin
-  ];
+  plugins = builtins.attrValues {
+    inherit (kakounePlugins) fzf-kak kakoune-catppuccin;
+  };
 
   kakoune-wrapped = symlinkJoin {
     name = "kakoune-wrapped";

modules/user/shell/packages.nix

@@ -1,20 +1,20 @@
-pkgs: (with pkgs; [
+pkgs:
+builtins.attrValues {
+  inherit
+    (pkgs)
     # better cd
     zoxide
     #better ls
     eza
     atuin
-
     # better cat
     bat
-
     # clipboard
     # yazi
     serpl
     diff-so-fancy
     tig
     direnv
-
     sesh
     mprocs
     curlie
@@ -23,20 +23,15 @@ pkgs: (with pkgs; [
     sd
     # mult
     glow
-
     # dua-cli
     dust
     kondo
-
     # better grep
     ripgrep
-
     # better dig
     dogdns
-
     # simply the best fetch tool out there
     microfetch
-
     fzf
     element
     carapace
@@ -54,18 +49,17 @@ pkgs: (with pkgs; [
     cpufetch
     yt-dlp
     tealdeer
-  glow
     hyperfine
     imagemagick
     ffmpeg-full
     # catimg
     timg
     nmap
-  wget
     fd
     jq
     rsync
     figlet
     unzip
     zip
-])
+    ;
+}