refactor: replace 'with' with attrValues

common/default.nix

@@ -71,12 +71,15 @@
   };
 
   boot.supportedFilesystems = ["ext4" "xfs" "btrfs" "vfat" "ntfs"];
-  system.fsPackages = with pkgs; [
+  system.fsPackages = builtins.attrValues {
+    inherit
+      (pkgs)
       btrfs-progs
       nfs-utils
       ntfs3g
       xfsprogs
-  ];
+      ;
+  };
 
   environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
   environment.etc.npmrc.text = ''
@@ -85,13 +88,16 @@
   '';
 
   environment.systemPackages =
-    (with pkgs; [
+    (builtins.attrValues {
       # Peripherals
+      inherit
+        (pkgs)
         hdparm
         pciutils
         usbutils
         rar
-    ])
+        ;
+    })
     ++ [
       nix-melt.packages.${pkgs.system}.default
 

common/home/bash/programs.nix

@@ -46,9 +46,9 @@
       config.theme = "dracula-bat";
       themes.dracula-bat.src = self.legacyPackages.${pkgs.system}.dracula.bat;
 
-      extraPackages = with pkgs.bat-extras; [
+      extraPackages = builtins.attrValues {
-        batman
+        inherit (pkgs.bat-extras) batman;
-      ];
+      };
     };
   };
 }

common/home/git/default.nix

@@ -59,10 +59,10 @@ in {
     };
   };
 
-  home.packages = with pkgs; [
+  home.packages = [
-    (writeShellApplication {
+    (pkgs.writeShellApplication {
       name = "chore";
-      runtimeInputs = [git];
+      runtimeInputs = [pkgs.git];
 
       text = ''
         DIR=''${1:-"$FLAKE"}

common/home/neovim/default.nix

@@ -2,9 +2,7 @@
   config,
   pkgs,
   ...
-}: let
+}: {
-  inherit (pkgs) vimPlugins;
-in {
   imports = [
     ./git.nix
     ./langs
@@ -63,11 +61,11 @@ in {
         '';
 
       plugins = [
-        vimPlugins.fzfWrapper
+        pkgs.vimPlugins.fzfWrapper
-        vimPlugins.fzf-vim
+        pkgs.vimPlugins.fzf-vim
 
         {
-          plugin = vimPlugins.todo-comments-nvim;
+          plugin = pkgs.vimPlugins.todo-comments-nvim;
           type = "lua";
           config =
             # lua
@@ -76,7 +74,7 @@ in {
             '';
         }
         {
-          plugin = vimPlugins.mini-nvim;
+          plugin = pkgs.vimPlugins.mini-nvim;
           type = "lua";
           config =
             # lua

common/home/neovim/git.nix

@@ -1,13 +1,11 @@
-{pkgs, ...}: let
+{pkgs, ...}: {
-  inherit (pkgs) vimPlugins;
-in {
   programs = {
     neovim = {
       plugins = [
-        vimPlugins.fugitive
+        pkgs.vimPlugins.fugitive
 
         {
-          plugin = vimPlugins.gitsigns-nvim;
+          plugin = pkgs.vimPlugins.gitsigns-nvim;
           type = "lua";
           config =
             # lua

common/home/neovim/langs/bash.nix

@@ -4,6 +4,7 @@
   lib,
   ...
 }: let
+  inherit (lib) getExe mkIf;
   inherit (config.vars) neovimIde;
 in {
   programs = {
@@ -18,13 +19,13 @@ in {
       viAlias = true;
       vimAlias = true;
 
-      extraPackages = lib.mkIf neovimIde [
+      extraPackages = mkIf neovimIde [
         pkgs.nodePackages.bash-language-server
         pkgs.shellcheck
       ];
 
       extraLuaConfig =
-        lib.mkIf neovimIde
+        mkIf neovimIde
         # lua
         ''
           vim.api.nvim_create_autocmd('FileType', {
@@ -37,7 +38,7 @@ in {
 
               settings = {
                   bashIde = {
-                      shellcheckPath = '${lib.getExe pkgs.shellcheck}',
+                      shellcheckPath = '${getExe pkgs.shellcheck}',
                   },
               },
           });

common/home/neovim/langs/clang.nix

@@ -4,17 +4,20 @@
   lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
-  inherit (pkgs) vimPlugins;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
-        extraPackages = with pkgs; [
+        extraPackages = builtins.attrValues {
+          inherit
+            (pkgs)
             gcc
             clang-tools
             cmake-language-server
-        ];
+            ;
+        };
 
         extraLuaConfig =
           # lua
@@ -41,9 +44,9 @@ in
             });
           '';
 
-        plugins = [
+        plugins = builtins.attrValues {
-          vimPlugins.clangd_extensions-nvim
+          inherit (pkgs.vimPlugins) clangd_extensions-nvim;
-        ];
+        };
       };
     };
   }

common/home/neovim/langs/default.nix

@@ -4,9 +4,8 @@
   pkgs,
   ...
 }: let
+  inherit (lib) fileContents mkBefore mkIf;
   inherit (config.vars) neovimIde;
-  inherit (pkgs) vimPlugins;
-  inherit (lib) fileContents;
 in {
   imports = [
     ./bash.nix
@@ -22,10 +21,10 @@ in {
     ./web.nix
   ];
 
-  programs = lib.mkIf neovimIde {
+  programs = mkIf neovimIde {
     neovim = {
       extraLuaConfig =
-        lib.mkBefore
+        mkBefore
         # lua
         ''
           -- Start completion / snippet stuff
@@ -69,30 +68,34 @@ in {
         '';
 
       plugins =
-        (with vimPlugins; [
+        (builtins.attrValues {
+          inherit
+            (pkgs.vimPlugins)
             nvim-lspconfig
             lsp-status-nvim
             lsp_lines-nvim
-
             cmp-buffer
             cmp-nvim-lsp
             cmp-path
             cmp-spell
             vim-vsnip
-        ])
+            ;
+        })
         ++ [
           {
-            plugin = vimPlugins.nvim-cmp;
+            plugin = pkgs.vimPlugins.nvim-cmp;
             type = "lua";
             config = fileContents ../plugins/cmp.lua;
           }
 
           {
-            plugin = vimPlugins.nvim-autopairs;
+            plugin = pkgs.vimPlugins.nvim-autopairs;
             type = "lua";
             config =
               # lua
-              "require('nvim-autopairs').setup({})";
+              ''
+                require('nvim-autopairs').setup({});
+              '';
           }
         ];
     };

common/home/neovim/langs/hyprlang.nix

@@ -3,9 +3,10 @@
   lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
         extraLuaConfig =

common/home/neovim/langs/java.nix

@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  inherit (pkgs) vimPlugins;
+  inherit (lib) getExe mkIf;
   inherit (config.vars) neovimIde;
 
   javaSdk = pkgs.temurin-bin-17;
-  javaPkgs = with pkgs; [gradle maven];
+  javaPkgs = builtins.attrValues {inherit (pkgs) gradle maven;};
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     home.packages = javaPkgs;
 
     xdg.dataFile.".gradle/gradle.properties".text = ''
@@ -38,7 +38,7 @@ in
         plugins = [
           {
             # TOOD: setup debugger https://github.com/mfussenegger/nvim-jdtls#debugger-via-nvim-dap
-            plugin = vimPlugins.nvim-jdtls;
+            plugin = pkgs.vimPlugins.nvim-jdtls;
             type = "lua";
             config =
               # lua
@@ -48,7 +48,7 @@ in
                     local config = {
                         capabilities = require('cmp_nvim_lsp').default_capabilities(),
 
-                        cmd = { '${lib.getExe pkgs.jdt-language-server}' },
+                        cmd = { '${getExe pkgs.jdt-language-server}' },
                         root_dir = vim.fs.dirname(vim.fs.find(
                             { 'gradlew', '.git', 'mvnw', 'pom.xml' },
                             { upward = true }

common/home/neovim/langs/json.nix

@@ -4,15 +4,19 @@
   pkgs,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
-        extraPackages = [
+        extraPackages = builtins.attrValues {
-          pkgs.vscode-langservers-extracted
+          inherit
-          pkgs.yaml-language-server
+            (pkgs)
-        ];
+            vscode-langservers-extracted
+            yaml-language-server
+            ;
+        };
 
         extraLuaConfig =
           # lua

common/home/neovim/langs/lua.nix

@@ -4,21 +4,21 @@
   lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
-  inherit (pkgs) vimPlugins;
 
   flakeEnv = config.programs.bash.sessionVariables.FLAKE;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
-        extraPackages = [
+        extraPackages = builtins.attrValues {
-          pkgs.lua-language-server
+          inherit (pkgs) lua-language-server;
-        ];
+        };
 
         plugins = [
           {
-            plugin = vimPlugins.neodev-nvim;
+            plugin = pkgs.vimPlugins.neodev-nvim;
             type = "lua";
             config =
               # lua

common/home/neovim/langs/markdown.nix

@@ -6,22 +6,23 @@
   vimplugin-easytables-src,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
-  inherit (pkgs) vimPlugins;
 
   inherit (import "${self}/lib" {inherit pkgs;}) buildPlugin;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
-        extraPackages = [
+        extraPackages = builtins.attrValues {
-          pkgs.pandoc
+          inherit
-
+            (pkgs)
-          # LaTeX packages
+            pandoc
-          pkgs.texlab
+            texlab
-          pkgs.texliveFull
+            texliveFull
-          pkgs.rubber
+            rubber
-        ];
+            ;
+        };
 
         extraLuaConfig =
           # lua
@@ -56,7 +57,7 @@ in
           }
 
           {
-            plugin = vimPlugins.knap;
+            plugin = pkgs.vimPlugins.knap;
             type = "lua";
             config =
               # lua

common/home/neovim/langs/nix.nix

@@ -6,8 +6,8 @@
   self,
   ...
 }: let
+  inherit (lib) getExe hasPrefix mkIf removePrefix;
   inherit (config.vars) hostName mainUser neovimIde;
-  inherit (lib) getExe hasPrefix removePrefix;
 
   defaultFormatter = self.formatter.${pkgs.system};
 
@@ -16,7 +16,7 @@
   flakeEnv = config.programs.bash.sessionVariables.FLAKE;
   flakeDir = "${removePrefix "/home/${mainUser}/" flakeEnv}";
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     assertions = [
       {
         assertion =

common/home/neovim/langs/python.nix

@@ -4,9 +4,10 @@
   pkgs,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
         withPython3 = true;

common/home/neovim/langs/rust.nix

@@ -4,17 +4,21 @@
   lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
-        extraPackages = with pkgs; [
+        extraPackages = builtins.attrValues {
+          inherit
+            (pkgs)
             cargo
             rustc
             rust-analyzer
             rustfmt
-        ];
+            ;
+        };
 
         extraLuaConfig =
           # lua

common/home/neovim/langs/web.nix

@@ -6,23 +6,29 @@
   vimplugin-ts-error-translator-src,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.vars) neovimIde;
-  inherit (pkgs) vimPlugins;
 
   inherit (import "${self}/lib" {inherit pkgs;}) buildPlugin;
 in
-  lib.mkIf neovimIde {
+  mkIf neovimIde {
     programs = {
       neovim = {
         withNodeJs = true;
 
-        extraPackages = [
+        extraPackages = builtins.attrValues {
-          pkgs.nodejs_latest
+          inherit
-          pkgs.nodePackages.npm
+            (pkgs)
-          pkgs.nodePackages.neovim
+            nodejs_latest
+            vscode-langservers-extracted
+            ;
 
-          pkgs.vscode-langservers-extracted
+          inherit
-        ];
+            (pkgs.nodePackages)
+            npm
+            neovim
+            ;
+        };
 
         extraLuaConfig =
           # lua
@@ -122,11 +128,11 @@ in
           '';
 
         plugins = [
-          vimPlugins.typescript-tools-nvim
+          pkgs.vimPlugins.typescript-tools-nvim
           (buildPlugin "ts-error-translator" vimplugin-ts-error-translator-src)
 
           {
-            plugin = vimPlugins.package-info-nvim;
+            plugin = pkgs.vimPlugins.package-info-nvim;
             type = "lua";
             config =
               # lua

common/home/neovim/theme.nix

@@ -5,20 +5,19 @@
   nvim-theme-src,
   ...
 }: let
-  inherit (config.vars) neovimIde;
   inherit (lib) fileContents optionals;
-  inherit (pkgs) vimPlugins;
+  inherit (config.vars) neovimIde;
 in {
   programs = {
     neovim = {
-      extraPackages = with pkgs; [
+      extraPackages = builtins.attrValues {
-        bat
+        inherit (pkgs) bat;
-      ];
+      };
 
       plugins =
         [
           {
-            plugin = vimPlugins.dracula-nvim.overrideAttrs {
+            plugin = pkgs.vimPlugins.dracula-nvim.overrideAttrs {
               src = nvim-theme-src;
             };
             type = "lua";
@@ -43,7 +42,7 @@ in {
               '';
           }
           {
-            plugin = vimPlugins.indent-blankline-nvim;
+            plugin = pkgs.vimPlugins.indent-blankline-nvim;
             type = "lua";
             config =
               # lua
@@ -80,21 +79,21 @@ in {
           }
 
           # Deps of heirline config
-          vimPlugins.nvim-web-devicons
+          pkgs.vimPlugins.nvim-web-devicons
           {
-            plugin = vimPlugins.heirline-nvim;
+            plugin = pkgs.vimPlugins.heirline-nvim;
             type = "lua";
             config = fileContents ./plugins/heirline.lua;
           }
         ]
         ++ optionals neovimIde [
           {
-            plugin = vimPlugins.neo-tree-nvim;
+            plugin = pkgs.vimPlugins.neo-tree-nvim;
             type = "lua";
             config = fileContents ./plugins/neotree.lua;
           }
           {
-            plugin = vimPlugins.codewindow-nvim;
+            plugin = pkgs.vimPlugins.codewindow-nvim;
             type = "lua";
             config =
               # lua
@@ -123,7 +122,7 @@ in {
               '';
           }
           {
-            plugin = vimPlugins.transparent-nvim;
+            plugin = pkgs.vimPlugins.transparent-nvim;
             type = "lua";
             config =
               # lua

common/home/neovim/treesitter.nix

@@ -1,11 +1,7 @@
-{pkgs, ...}: let
+{pkgs, ...}: {
-  inherit (pkgs) vimPlugins;
+  programs.neovim.plugins = [
-in {
-  programs = {
-    neovim = {
-      plugins = [
     {
-          plugin = vimPlugins.nvim-treesitter-context;
+      plugin = pkgs.vimPlugins.nvim-treesitter-context;
       type = "lua";
       config =
         # lua
@@ -20,10 +16,10 @@ in {
         '';
     }
 
-        vimPlugins.nvim-treesitter-textobjects
+    pkgs.vimPlugins.nvim-treesitter-textobjects
 
     {
-          plugin = vimPlugins.nvim-treesitter.withAllGrammars;
+      plugin = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
       type = "lua";
       config =
         # lua
@@ -35,6 +31,4 @@ in {
         '';
     }
   ];
-    };
-  };
 }

common/home/tmux/default.nix

@@ -11,7 +11,9 @@
       newSession = true;
       historyLimit = 30000;
 
-      plugins = with pkgs.tmuxPlugins; [dracula];
+      plugins = builtins.attrValues {
+        inherit (pkgs.tmuxPlugins) dracula;
+      };
 
       extraConfig =
         # bash

common/modules/locale.nix

@@ -10,8 +10,9 @@
       };
     };
 
-    packages = with pkgs; [
+    packages =
-      (nerdfonts.override {
+      [
+        (pkgs.nerdfonts.override {
           fonts = [
             "JetBrainsMono"
             "Go-Mono"
@@ -22,6 +23,10 @@
             "Noto"
           ];
         })
+      ]
+      ++ (builtins.attrValues {
+        inherit
+          (pkgs)
           noto-fonts
           noto-fonts-cjk
           noto-fonts-emoji
@@ -30,7 +35,8 @@
           meslo-lgs-nf
           jetbrains-mono
           ubuntu_font_family
-    ];
+          ;
+      });
   };
 
   # Select internationalisation properties.

common/packages.nix

@@ -4,17 +4,23 @@
   ...
 }: {
   environment.systemPackages =
-    (with self.packages.${pkgs.system}; [
+    (builtins.attrValues {
+      inherit
+        (self.packages.${pkgs.system})
         pokemon-colorscripts
         repl
-    ])
+        ;
-    ++ (with pkgs.nodePackages; [
+
+      inherit
+        (pkgs.nodePackages)
         undollar
-    ])
+        ;
-    ++ (with pkgs; [
+
-      alejandra
+      inherit (pkgs) alejandra;
 
       # Archiving
+      inherit
+        (pkgs)
         zip
         unzip
         p7zip
@@ -22,35 +28,48 @@
         gzip
         gnutar
         xz
+        ;
 
       # File management
+      inherit
+        (pkgs)
         findutils
         diffutils
         utillinux
         which
         imagemagick
+        ;
 
       # Networking
-      dig.dnsutils
+      inherit (pkgs.dig) dnsutils;
+      inherit
+        (pkgs)
         openssh
         rsync
         wget
         gnupg
+        ;
 
       # Misc CLI stuff
+      inherit
+        (pkgs)
         killall
         nix-output-monitor
         progress
         tree
         gnugrep
         gnused
+        ;
 
       # Expected Stuff
+      inherit
+        (pkgs)
         hostname
         man
         perl
         tzdata
-    ])
+        ;
+    })
     ++ [
       # This could help as well: nix derivation show -r /run/current-system
       (pkgs.writeShellApplication {
@@ -63,10 +82,13 @@
       (pkgs.writeShellApplication {
         name = "from";
 
-        runtimeInputs = with pkgs; [
+        runtimeInputs = builtins.attrValues {
+          inherit
+            (pkgs)
             coreutils
             which
-        ];
+            ;
+        };
 
         text = ''
           for var do

devices/android/default.nix

@@ -21,11 +21,14 @@
   environment.packages = [
     (pkgs.writeShellApplication {
       name = "switch";
-      runtimeInputs = with pkgs; [
+      runtimeInputs = builtins.attrValues {
+        inherit
+          (pkgs)
           coreutils
           nix-output-monitor
           nvd
-      ];
+          ;
+      };
       text = ''
         oldProfile=$(realpath /nix/var/nix/profiles/per-user/nix-on-droid/profile)
 

devices/bbsteamie/modules/desktop/default.nix

@@ -17,14 +17,18 @@ in {
   services.flatpak.enable = true;
   services.packagekit.enable = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
-    # Misc Apps
+    inherit
+      (pkgs)
       firefox
-    kdePackages.discover
-    kdePackages.krfb
-
-    # Libs
       wl-clipboard
       xclip
-  ];
+      ;
+
+    inherit
+      (pkgs.kdePackages)
+      discover
+      krfb
+      ;
+  };
 }

devices/bbsteamie/modules/desktop/steam.nix

@@ -46,18 +46,19 @@ defaultSession: {
       stateDir = "/home/${mainUser}/.local/share/decky"; # Keep scoped to user
       # https://github.com/Jovian-Experiments/Jovian-NixOS/blob/1171169117f63f1de9ef2ea36efd8dcf377c6d5a/modules/decky-loader.nix#L80-L84
 
-      extraPackages = with pkgs; [
+      extraPackages = builtins.attrValues {
-        # Generic packages
+        inherit
+          (pkgs)
           curl
           unzip
           util-linux
           gnugrep
-
+          readline
-        readline.out
           procps
           pciutils
           libpulseaudio
-      ];
+          ;
+      };
     };
 
     # Takes way too long to shutdown

devices/binto/hardware-configuration.nix

@@ -14,10 +14,13 @@
     kernelModules = ["kvm-amd"];
 
     # Zenpower for ryzen cpu monitoring
-    extraModulePackages = with config.boot.kernelPackages; [
+    extraModulePackages = builtins.attrValues {
+      inherit
+        (config.boot.kernelPackages)
         v4l2loopback
         zenpower
-    ];
+        ;
+    };
     blacklistedKernelModules = ["k10temp"];
 
     supportedFilesystems = ["ntfs"];
@@ -85,10 +88,13 @@
     libvirtd.enable = true;
     spiceUSBRedirection.enable = true;
   };
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
       qemu
       virtiofsd
-  ];
+      ;
+  };
 
   nvidia = {
     enable = true;

devices/cluster/modules/nfs-client.nix

@@ -2,7 +2,9 @@
   # NFS client setup
   services.rpcbind.enable = true;
   boot.supportedFilesystems = ["nfs"];
-  environment.systemPackages = with pkgs; [nfs-utils];
+  environment.systemPackages = builtins.attrValues {
+    inherit (pkgs) nfs-utils;
+  };
 
   systemd.mounts = let
     host = "10.0.0.249";

devices/nos/modules/docker/freshrss/images/rss-bridge.nix

@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "rssbridge/rss-bridge";
-  imageDigest = "sha256:327315251d038d2ddae7eb088569470f52255f8a0cdc4df41eab47dab4624318";
+  imageDigest = "sha256:ffc5966ca95af2d031a5c7561d3144454898e330a68862bb0299db6349806c25";
-  sha256 = "03w1jnhxahbvlmnby7c5v47sm1ypz98v0w5inm8bdwi765r7db60";
+  sha256 = "059qly0brjsh3ch6b2kmsn2rfsvlvayiaqkpiiydr6fyh85ryrvj";
   finalImageName = "rssbridge/rss-bridge";
   finalImageTag = "latest";
 }

devices/nos/modules/jellyfin/packages.nix

@@ -19,9 +19,12 @@ in {
     ffmpegPackage = jellyPkgs.jellyfin-ffmpeg;
   };
 
-  environment.systemPackages = with config.services.jellyfin; [
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (config.services.jellyfin)
       finalPackage
       webPackage
       ffmpegPackage
-  ];
+      ;
+  };
 }

devices/nos/modules/mergerfs.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  fsPkgs = with pkgs; [mergerfs cifs-utils];
+  fsPkgs = builtins.attrValues {inherit (pkgs) mergerfs cifs-utils;};
 in {
   system.fsPackages = fsPkgs;
   environment.systemPackages = fsPkgs;

devices/nos/modules/subtitles/cleanup.nix

@@ -15,11 +15,14 @@ in
   pkgs.writeShellApplication {
     name = "sub-clean";
 
-    runtimeInputs = with pkgs; [
+    runtimeInputs = builtins.attrValues {
+      inherit
+        (pkgs)
         findutils
         gnugrep
         gawk
-    ];
+        ;
+    };
 
     text = ''
       exec ${script} "$@"

devices/nos/modules/subtitles/convert.nix

@@ -2,9 +2,12 @@
 pkgs.writeShellApplication {
   name = "convertMkv";
 
-  runtimeInputs = with pkgs; [
+  runtimeInputs = builtins.attrValues {
+    inherit
+      (pkgs)
       ffmpeg-full
-  ];
+      ;
+  };
 
   text = ''
     extension="$1"

devices/servivi/hardware-configuration.nix

@@ -13,7 +13,13 @@
     kernelModules = ["kvm-amd"];
 
     # Zenpower for ryzen cpu monitoring
-    extraModulePackages = with config.boot.kernelPackages; [zenpower];
+    extraModulePackages = builtins.attrValues {
+      inherit
+        (config.boot.kernelPackages)
+        zenpower
+        ;
+    };
+
     blacklistedKernelModules = ["k10temp"];
 
     initrd.availableKernelModules = [

devices/servivi/modules/7-days-to-die.nix

@@ -14,10 +14,13 @@ in {
       wantedBy = ["multi-user.target"];
       serviceConfig.User = "matt";
 
-      path = with pkgs; [
+      path = builtins.attrValues {
+        inherit
+          (pkgs)
           steam-run
           steamcmd
-      ];
+          ;
+      };
 
       script = ''
         # Make sure gamePath exists and cd to it

devices/servivi/modules/binary-cache.nix

@@ -40,13 +40,18 @@ in {
       };
 
       path =
-        [nix-fast-buildPkg]
+        [
-        ++ (with pkgs; [
+          nix-fast-buildPkg
-          bash
           config.nix.package
+        ]
+        ++ (builtins.attrValues {
+          inherit
+            (pkgs)
+            bash
             git
             openssh
-        ]);
+            ;
+        });
 
       script = ''
         cd /tmp

devices/wim/hardware-configuration.nix

@@ -15,10 +15,13 @@
     ];
     kernelModules = ["amdgpu" "kvm-amd" "acpi_call"];
 
-    extraModulePackages = with config.boot.kernelPackages; [
+    extraModulePackages = builtins.attrValues {
+      inherit
+        (config.boot.kernelPackages)
         acpi_call
         zenpower
-    ];
+        ;
+    };
     blacklistedKernelModules = ["k10temp"];
 
     initrd = {
@@ -94,10 +97,13 @@
     libvirtd.enable = true;
     waydroid.enable = true;
   };
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
       qemu
       powertop
-  ];
+      ;
+  };
 
   # enable brightness control
   programs.light.enable = true;

homeManagerModules/firefox/default.nix

@@ -195,7 +195,9 @@ in {
           ];
         };
 
-        extensions = with firefoxAddons; [
+        extensions = builtins.attrValues {
+          inherit
+            (firefoxAddons)
             auto-refresh-page
             bitwarden
             checkmarks-web-ext
@@ -213,7 +215,8 @@ in {
             ttv-lol-pro
             ublock-origin
             undoclosetabbutton
-        ];
+            ;
+        };
       };
     };
   };

legacyPackages/dracula/hyprcursor.nix

@@ -11,7 +11,13 @@ stdenv.mkDerivation {
 
   src = "${gtk-theme-src}/kde/cursors";
 
-  buildInputs = with pkgs; [hyprcursor xcur2png];
+  buildInputs = builtins.attrValues {
+    inherit
+      (pkgs)
+      hyprcursor
+      xcur2png
+      ;
+  };
 
   installPhase = ''
     hyprcursor-util --extract ./Dracula-cursors

lib/flake-lib.nix

@@ -11,10 +11,13 @@ inputs: rec {
           "jovian"
           "nixpkgs-wayland"
         ])
-        ++ (with inputs.self.overlays; [
+        ++ (builtins.attrValues {
+          inherit
+            (inputs.self.overlays)
             broken-packages
             xdg-desktop-portal-kde
-        ]);
+            ;
+        });
     };
 
   # Function that makes the attrs that make up the specialArgs
@@ -43,10 +46,12 @@ inputs: rec {
       home-manager-path = inputs.home-manager.outPath;
       pkgs = extraSpecialArgs.pkgs;
 
-      modules =
+      modules = let
+        inherit (pkgs.lib) mkOption types;
+      in
         [
           ({config, ...}: {
-            options = with pkgs.lib; {
+            options = {
               environment.variables.FLAKE = mkOption {
                 type = with types; nullOr str;
               };

nixosModules/ags/default.nix

@@ -111,23 +111,26 @@ in {
 
             packages =
               [
+                (pkgs.callPackage ./clipboard {})
                 # TODO: replace with matugen
                 self.packages.${pkgs.system}.coloryou
               ]
-              ++ (with pkgs; [
+              ++ (builtins.attrValues {
-                # ags
+                inherit
+                  (pkgs)
                   dart-sass
                   bun
                   playerctl
-                (callPackage ./clipboard {})
-
-                ## gui
                   pavucontrol # TODO: replace with ags widget
-              ])
+                  ;
-              ++ (optionals cfgDesktop.isTouchscreen (with pkgs; [
+              })
+              ++ (optionals cfgDesktop.isTouchscreen (builtins.attrValues {
+                inherit
+                  (pkgs)
                   lisgd
                   ydotool
-              ]));
+                  ;
+              }));
           };
 
           wayland.windowManager.hyprland = {

nixosModules/desktop/environment/default.nix

@@ -51,8 +51,8 @@ in {
     xdg.portal = {
       enable = true;
 
-      extraPortals = with pkgs; [
+      extraPortals = [
-        kdePackages.xdg-desktop-portal-kde
+        pkgs.kdePackages.xdg-desktop-portal-kde
       ];
 
       config.hyprland = {
@@ -203,23 +203,27 @@ in {
       };
 
       # libs
-      home.packages = with pkgs; [
+      home.packages =
-        # tools
+        (builtins.attrValues {
+          inherit
+            (pkgs)
             bluez-tools
             brightnessctl
             pulseaudio
             alsa-utils
-
-        qt5.qtwayland
-        qt6.qtwayland
             libayatana-appindicator
             xdg-utils
             evtest
             glib
-        xorg.xrandr
             libinput
             xclip
             libnotify
+            ;
+        })
+        ++ [
+          pkgs.qt5.qtwayland
+          pkgs.qt6.qtwayland
+          pkgs.xorg.xrandr
         ];
     };
   };

nixosModules/desktop/environment/home/mpv.nix

@@ -3,24 +3,32 @@ self: {pkgs, ...}: {
     inherit (self.legacyPackages.${pkgs.system}) mpvScripts;
   in {
     # For kdialog-open-files
-    home.packages = with pkgs; [
+    home.packages = [
-      kdialog
+      pkgs.kdialog
     ];
 
     programs.mpv = {
       enable = true;
 
       # https://github.com/mpv-player/mpv/wiki/User-Scripts
-      scripts = with mpvScripts; [
+      scripts = builtins.attrValues {
+        inherit
+          (mpvScripts)
           modernx
-        # Dep of touch-gestures
-        pointer-event
-        touch-gestures
-        # Ctrl + o
-        kdialog-open-files
           persist-properties
           undo-redo
-      ];
+          ;
+
+        # touch-gestures & deps
+        inherit
+          (mpvScripts)
+          pointer-event
+          touch-gestures
+          ;
+
+        # Ctrl + o
+        inherit (mpvScripts) kdialog-open-files;
+      };
 
       scriptOpts = {
         persist_properties = {

nixosModules/desktop/environment/modules/dolphin.nix

@@ -6,8 +6,8 @@
   config = let
     cfg = config.roles.desktop;
   in {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
-      plasma5Packages.kio-admin
+      pkgs.plasma5Packages.kio-admin
     ];
 
     # To make it work with firefox
@@ -26,20 +26,22 @@
       };
     };
 
-    home-manager.users.${cfg.user}.home.packages = with pkgs;
+    home-manager.users.${cfg.user}.home.packages = builtins.attrValues {
-      [
+      inherit
+        (pkgs)
         gnome-calculator
-      ]
+        ;
-      ++ (with kdePackages; [
+      inherit
+        (pkgs.kdePackages)
         kde-cli-tools
-      ])
+        ;
-      ++ (with plasma5Packages; [
+
+      inherit
+        (pkgs.plasma5Packages)
         ark
         kcharselect
         kdenlive
         okular
-
-        # Dolphin & co
         dolphin
         dolphin-plugins
         kdegraphics-thumbnailers
@@ -48,7 +50,8 @@
         kio-admin # needs to be both here and in system pkgs
         kio-extras
         kmime
-      ]);
+        ;
+    };
   };
 
   # For accurate stack trace

nixosModules/desktop/environment/modules/packages.nix

@@ -76,34 +76,57 @@ in {
       };
 
       home.packages =
-        (with pkgs; [
+        (builtins.attrValues {
           # School
+          inherit (pkgs.hunspellDicts) en_CA;
+          inherit
+            (pkgs)
             xournalpp
             virt-manager
             libreoffice-fresh # TODO: declarative conf?
             hunspell
-          hunspellDicts.en_CA
+            ;
 
           # Apps
+          inherit
+            (pkgs)
             protonmail-desktop
             protonmail-bridge
             spotifywm
             photoqt
             nextcloud-client
             prismlauncher
+            ;
+
+          # tools
+          inherit
+            (pkgs)
+            wl-color-picker
+            wl-clipboard
+            cliphist
+            grim-hyprland
+            slurp
+            satty
+            ;
+        })
+        ++ [
+          (jellyfin-flake
+            .packages
+            .${pkgs.system}
+            .jellyfin-media-player
+            .override {isNvidiaWayland = isNvidia;})
 
           /*
           Discord themes for Vencord
           https://markchan0225.github.io/RoundedDiscord/RoundedDiscord.theme.css
           https://raw.githubusercontent.com/dracula/BetterDiscord/master/Dracula_Official.theme.css
           */
-          (discord.override {withVencord = true;})
+          (pkgs.discord.override {withVencord = true;})
+
+          # GParted
+          (let
+            inherit (pkgs) writeShellScriptBin libsForQt5 gparted makeWrapper symlinkJoin;
 
-          (symlinkJoin {
-            name = "gparted";
-            paths = [gparted];
-            buildInputs = [makeWrapper];
-            postBuild = let
             newWrapper = writeShellScriptBin "Gparted" ''
               (
                   sleep 1.5
@@ -117,6 +140,12 @@ in {
               ) &
               exec env SUDO_ASKPASS="${libsForQt5.ksshaskpass}/bin/ksshaskpass" sudo -k -EA "${getExe gparted}" "$@"
             '';
+          in
+            symlinkJoin {
+              name = "gparted";
+              paths = [gparted];
+              buildInputs = [makeWrapper];
+              postBuild = let
               in ''
                 mkdir $out/.wrapped
                 mv $out/bin/gparted $out/.wrapped
@@ -125,21 +154,6 @@ in {
                 sed -i "s#Exec.*#Exec=$out/bin/gparted %f#" $out/share/applications/gparted.desktop
               '';
             })
-
-          # tools
-          wl-color-picker
-          wl-clipboard
-          cliphist
-          grim-hyprland
-          slurp
-          satty
-        ])
-        ++ [
-          (jellyfin-flake
-            .packages
-            .${pkgs.system}
-            .jellyfin-media-player
-            .override {isNvidiaWayland = isNvidia;})
         ];
 
       wayland.windowManager.hyprland = {

nixosModules/desktop/environment/modules/printer.nix

@@ -4,8 +4,9 @@
       # Enable CUPS to print documents.
       printing = {
         enable = true;
-        drivers = with pkgs; [
+
-          hplip
+        drivers = [
+          pkgs.hplip
         ];
       };
     };

nixosModules/desktop/manager/ags/default.nix

@@ -58,10 +58,13 @@ in {
             ];
           };
 
-          buildInputs = with pkgs; [
+          buildInputs = builtins.attrValues {
+            inherit
+              (pkgs)
               bun
               dart-sass
-          ];
+              ;
+          };
 
           buildPhase = ''
             sass ./scss/greeter.scss style.css

nixosModules/desktop/theme/gtk/default.nix

@@ -9,8 +9,8 @@
 
     cfg = osConfig.roles.desktop;
   in {
-    home.packages = with pkgs; [
+    home.packages = [
-      gnomeExtensions.user-themes
+      pkgs.gnomeExtensions.user-themes
     ];
 
     # Gtk settings

nixosModules/desktop/theme/hyprpaper.nix

@@ -6,7 +6,7 @@ self: {
   config = let
     wallpaper = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper;
   in {
-    home.packages = with pkgs; [hyprpaper];
+    home.packages = [pkgs.hyprpaper];
 
     xdg.configFile."hypr/hyprpaper.conf" = {
       text = lib.hm.generators.toHyprconf {

nixosModules/desktop/theme/qt.nix

@@ -9,9 +9,9 @@ self: {
 
     cfg = osConfig.roles.desktop;
   in {
-    home.packages = with pkgs; [
+    home.packages = [
-      libsForQt5.qtstyleplugin-kvantum
+      pkgs.libsForQt5.qtstyleplugin-kvantum
-      kdePackages.qtstyleplugin-kvantum
+      pkgs.kdePackages.qtstyleplugin-kvantum
     ];
 
     qt = {

nixosModules/docker/default.nix

@@ -38,8 +38,8 @@ in {
     };
 
     # Script for updating the images of all images of a compose.nix file
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
-      (callPackage ./updateImage.nix {})
+      (pkgs.callPackage ./updateImage.nix {})
     ];
   };
 

nixosModules/nvidia/default.nix

@@ -33,12 +33,15 @@ in {
       enable = true;
       enable32Bit = true;
 
-      extraPackages = with pkgs; [
+      extraPackages = builtins.attrValues {
+        inherit
+          (pkgs)
           vaapiVdpau
           libvdpau-va-gl
           nvidia-vaapi-driver
-      ];
+          ;
-      extraPackages32 = with pkgs; [vaapiVdpau];
+      };
+      extraPackages32 = [pkgs.vaapiVdpau];
     };
 
     services.xserver.videoDrivers = ["nvidia"];
@@ -71,13 +74,16 @@ in {
 
     environment.systemPackages =
       optionals cfg.enableCUDA [pkgs.cudaPackages.cudatoolkit]
-      ++ (with pkgs; [
+      ++ (builtins.attrValues {
+        inherit (pkgs.nvtopPackages) nvidia;
+        inherit
+          (pkgs)
           libva-utils
           nvidia-vaapi-driver
-        nvtopPackages.nvidia
           pciutils
           vdpauinfo
-      ]);
+          ;
+      });
 
     boot.kernelModules =
       optionals cfg.enableCUDA ["nvidia-uvm"]

outputs.nix

@@ -129,8 +129,8 @@
 
     devShells = perSystem (pkgs: {
       default = pkgs.mkShell {
-        packages = with pkgs; [
+        packages = [
-          (writeShellScriptBin "mkIso" ''
+          (pkgs.writeShellScriptBin "mkIso" ''
             isoConfig="nixosConfigurations.live-image.config.system.build.isoImage"
             nom build $(realpath /etc/nixos)#$isoConfig
           '')
@@ -138,13 +138,24 @@
       };
 
       node = pkgs.mkShell {
-        packages = with pkgs; [
+        packages =
+          (builtins.attrValues {
+            inherit
+              (pkgs)
               nodejs_latest
               typescript
-
+              ;
-          (writeShellApplication {
+          })
+          ++ [
+            (pkgs.writeShellApplication {
               name = "updateNpmDeps";
-            runtimeInputs = [prefetch-npm-deps nodejs_latest];
+              runtimeInputs = builtins.attrValues {
+                inherit
+                  (pkgs)
+                  prefetch-npm-deps
+                  nodejs_latest
+                  ;
+              };
 
               text = ''
                 npm i --package-lock-only || true # this command will fail but still updates the main lockfile
@@ -155,15 +166,19 @@
       };
 
       subtitles-dev = pkgs.mkShell {
-        packages = with pkgs;
+        packages = builtins.attrValues {
-          [
+          inherit
+            (pkgs)
             nodejs_latest
             ffmpeg-full
             typescript
-          ]
+            ;
-          ++ (with nodePackages; [
+
+          inherit
+            (pkgs.nodePackages)
             ts-node
-          ]);
+            ;
+        };
       };
     });
 

overlays/broken-packages/default.nix

@@ -1,94 +1 @@
-final: prev: {
+final: prev: {}
-  # FIXME: https://pr-tracker.nelim.org/?pr=334866
-  rubber = prev.python3Packages.buildPythonApplication rec {
-    pname = "rubber";
-    version = "1.6.6";
-    pyproject = true;
-
-    src = prev.fetchFromGitLab {
-      owner = "latex-rubber";
-      repo = "rubber";
-      rev = version;
-      hash = "sha256-C26PN3jyV6qwSjgPem54bykZrpKj+n8iHYYUyR+8dgI=";
-    };
-
-    postPatch = ''
-      sed -i -e '/texi2dvi/d' hatch_build.py
-
-      substituteInPlace tests/run.sh \
-        --replace-fail /var/tmp /tmp
-    '';
-
-    nativeBuildInputs = [prev.python3Packages.hatchling prev.texinfo];
-
-    checkPhase = ''
-      runHook preCheck
-
-      pushd tests >/dev/null
-      ${prev.stdenv.shell} run.sh
-      popd >/dev/null
-
-      runHook postCheck
-    '';
-    meta.mainProgram = "rubber";
-  };
-
-  # FIXME: https://pr-tracker.nelim.org/?pr=334814
-  delta = prev.rustPlatform.buildRustPackage rec {
-    pname = "delta";
-    version = "0.17.0-unstable-2024-08-12";
-
-    src = prev.fetchFromGitHub {
-      owner = "dandavison";
-      repo = pname;
-      rev = "a01141b72001f4c630d77cf5274267d7638851e4";
-      hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0=";
-    };
-
-    cargoHash = "sha256-Rlc3Bc6Jh89KLLEWBWQB5GjoeIuHnwIVZN/MVFMjY24=";
-
-    nativeBuildInputs = with prev; [
-      installShellFiles
-      pkg-config
-    ];
-
-    buildInputs = with prev;
-      [
-        oniguruma
-      ]
-      ++ lib.optionals stdenv.isDarwin [
-        darwin.apple_sdk_11_0.frameworks.Foundation
-      ];
-
-    nativeCheckInputs = [prev.git];
-
-    env.RUSTONIG_SYSTEM_LIBONIG = true;
-
-    postInstall = ''
-      installShellCompletion --cmd delta \
-        etc/completion/completion.{bash,fish,zsh}
-    '';
-
-    # test_env_parsing_with_pager_set_to_bat sets environment variables,
-    # which can be flaky with multiple threads:
-    # https://github.com/dandavison/delta/issues/1660
-    dontUseCargoParallelTests = true;
-
-    checkFlags = with prev;
-      lib.optionals stdenv.isDarwin [
-        "--skip=test_diff_same_non_empty_file"
-      ];
-
-    meta.mainProgram = "delta";
-  };
-
-  egl-wayland = prev.egl-wayland.overrideAttrs (o: {
-    version = "1.1.15-f30cb0e";
-    src = prev.fetchFromGitHub {
-      owner = "Nvidia";
-      repo = "egl-wayland";
-      rev = "f30cb0e4c9a215e933dc8250f5dad4e96d4f2136";
-      hash = "sha256-EwMj3PqU4yzSucYhx8Yy/MqOwZbfsGkhSA+yNwOh4U0=";
-    };
-  });
-}

packages/coloryou/default.nix

@@ -1,11 +1,13 @@
-{python3Packages, ...}:
+{python3Packages, ...}: let
-python3Packages.buildPythonPackage {
+  inherit (python3Packages) buildPythonPackage utils material-color-utilities;
+in
+  buildPythonPackage {
     pname = "coloryou";
     version = "0.0.1";
 
     src = ./.;
 
-  propagatedBuildInputs = with python3Packages; [utils material-color-utilities];
+    propagatedBuildInputs = [utils material-color-utilities];
 
     postInstall = ''
       mv -v $out/bin/coloryou.py $out/bin/coloryou

packages/coloryou/shell.nix

@@ -1,7 +0,0 @@
-with import <nixpkgs> {};
-with pkgs.python311Packages;
-  buildPythonPackage {
-    name = "coloryou";
-    src = ./.;
-    propagatedBuildInputs = [material-color-utilities utils];
-  }