nix: stop using with

namespace pollution

nix/home/_/cmus/default.nix

@@ -6,9 +6,9 @@
 }:
 {
   home = lib.mkIf config.cmus.enable {
-    packages = with pkgs; [
-      cmus
-      cmusfm
+    packages = [
+      pkgs.cmus
+      pkgs.cmusfm
     ];
     file.cmus = {
       recursive = true;

nix/home/_/default.nix

@@ -38,41 +38,41 @@
   };
 
   home.packages =
-    with pkgs;
     [
       # shell and script dependencies
-      figlet
-      gnused
-      stow
-      fd
-      vivid
-      rsync
+      pkgs.figlet
+      pkgs.gnused
+      pkgs.stow
+      pkgs.fd
+      pkgs.vivid
+      pkgs.rsync
+
       # coreutils
-      uutils-coreutils-noprefix
-      parallel
+      pkgs.uutils-coreutils-noprefix
 
       # nix
       unstable.nixfmt-rfc-style
 
       # utils
-      tree
-      tldr
-      irssi
+      pkgs.tree
+      pkgs.tldr
+      pkgs.irssi
+      pkgs.parallel
     ]
     ++ lib.lists.optionals config.extraUtils.enable [
-      jq
-      hyperfine
-      watchexec
-      tea
-      tokei
-      gnumake
-      just
-      sd
-      ghostscript
-      act
-      forgejo-actions-runner
-      nurl
-      onefetch
+      pkgs.jq
+      pkgs.hyperfine
+      pkgs.watchexec
+      pkgs.tea
+      pkgs.tokei
+      pkgs.gnumake
+      pkgs.just
+      pkgs.sd
+      pkgs.ghostscript
+      pkgs.act
+      pkgs.forgejo-actions-runner
+      pkgs.nurl
+      pkgs.onefetch
     ]
     ++ lib.lists.optionals config.universityTools.enable [
       pkgs.rars

nix/home/_/neovim/default.nix

@@ -11,22 +11,21 @@
     enable = true;
     defaultEditor = true;
     extraPackages =
-      with pkgs;
       [
-        lua-language-server
-        stylua
-        nodePackages.bash-language-server
-        shellcheck
-        shfmt
-        nil
-        yaml-language-server
+        pkgs.lua-language-server
+        pkgs.stylua
+        pkgs.nodePackages.bash-language-server
+        pkgs.shellcheck
+        pkgs.shfmt
+        pkgs.nil
+        pkgs.yaml-language-server
       ]
       ++ lib.lists.optionals config.extraLanguageServers.enable [
-        nodePackages.vim-language-server
-        vscode-langservers-extracted # HTML/CSS/JSON/ESLint
-        marksman
-        taplo
-        lemminx
+        pkgs.nodePackages.vim-language-server
+        pkgs.vscode-langservers-extracted # HTML/CSS/JSON/ESLint
+        pkgs.marksman
+        pkgs.taplo
+        pkgs.lemminx
       ];
   };
 

nix/home/_/vim/default.nix

@@ -7,15 +7,19 @@
     {
       enable = true;
       extraConfig = readFile ./vimrc;
-      plugins = with pkgs.vimPlugins; [
-        vim-sleuth
-        vim-surround
-        vim-fugitive
-        vim-commentary
-        undotree
-        tabular
-        vim-wakatime
-        vim-caddyfile
-      ];
+      plugins =
+        let
+          vpkgs = pkgs.vimPlugins;
+        in
+        [
+          vpkgs.vim-sleuth
+          vpkgs.vim-surround
+          vpkgs.vim-fugitive
+          vpkgs.vim-commentary
+          vpkgs.undotree
+          vpkgs.tabular
+          vpkgs.vim-wakatime
+          vpkgs.vim-caddyfile
+        ];
     };
 }