7 files changed, 52 insertions, 36 deletions
diff --git a/modules/by-name/fo/fonts/module.nix b/modules/by-name/fo/fonts/module.nix
index f8752ae6..c76557cc 100644
--- a/modules/by-name/fo/fonts/module.nix
+++ b/modules/by-name/fo/fonts/module.nix
@@ -20,10 +20,14 @@ in {
 
     fonts = lib.mkOption {
       type = lib.types.listOf lib.types.package;
-      example = lib.literalExpression ''with pkgs.nerdfonts; [SourceCodePro Overpass FiraCode]'';
-      default = with pkgs.nerd-fonts; [
-        sauce-code-pro
-        overpass
+      example = lib.literalExpression ''        [
+                pkgs.nerd-fonts.source-code-pro
+                pkgs.nerd-fonts.overpass
+                pkgs.nerd-fonts.fira-code
+            ]'';
+      default = [
+        pkgs.nerd-fonts.sauce-code-pro
+        pkgs.nerd-fonts.overpass
       ];
       description = "The nerd-fonts to install";
     };
@@ -35,7 +39,7 @@ in {
     fonts = {
       packages =
         cfg.fonts
-        ++ (with pkgs; [liberation_ttf])
+        ++ [pkgs.liberation_ttf]
         ++ lib.optional cfg.enableEmoji pkgs.noto-fonts-emoji;
 
       fontconfig = {
diff --git a/modules/by-name/lf/lf/commands/default.nix b/modules/by-name/lf/lf/commands/default.nix
index f953834b..5d5277d6 100644
--- a/modules/by-name/lf/lf/commands/default.nix
+++ b/modules/by-name/lf/lf/commands/default.nix
@@ -48,20 +48,20 @@
 in {
   archive_compress = shell {
     name = "archive_compress";
-    dependencies = with pkgs; [
-      fzf
-      gnutar
-      xz
-      p7zip
-      zip
+    dependencies = [
+      pkgs.fzf
+      pkgs.gnutar
+      pkgs.xz
+      pkgs.p7zip
+      pkgs.zip
     ];
   };
   archive_decompress = pipe {
     name = "archive_decompress";
-    dependencies = with pkgs; [
-      gnutar
-      unzip
-      p7zip
+    dependencies = [
+      pkgs.gnutar
+      pkgs.unzip
+      pkgs.p7zip
     ];
   };
 
@@ -122,10 +122,10 @@ in {
   };
   set_wallpaper = pipe {
     name = "set_wallpaper";
-    dependencies = with pkgs; [
-      river # for `riverctl`
-      swaybg
-      procps
+    dependencies = [
+      pkgs.river # for `riverctl`
+      pkgs.swaybg
+      pkgs.procps
     ];
   };
 
@@ -140,16 +140,28 @@ in {
   };
   trash_clear = shell {
     name = "trash_clear";
-    dependencies = with pkgs; [conceal fzf gawk trashy gnused];
+    dependencies = [
+      pkgs.conceal
+      pkgs.fzf
+      pkgs.gawk
+      pkgs.trashy
+      pkgs.gnused
+    ];
   };
   trash_restore = shell {
     name = "trash_restore";
-    dependencies = with pkgs; [conceal fzf gawk trashy gnused];
+    dependencies = [
+      pkgs.conceal
+      pkgs.fzf
+      pkgs.gawk
+      pkgs.trashy
+      pkgs.gnused
+    ];
   };
 
   view_file = async {
     name = "view_file";
-    dependencies = with pkgs; [file];
+    dependencies = [pkgs.file];
     keepPath = true;
   };
 }
diff --git a/modules/by-name/mp/mpv/module.nix b/modules/by-name/mp/mpv/module.nix
index 7c8435d5..4416b295 100644
--- a/modules/by-name/mp/mpv/module.nix
+++ b/modules/by-name/mp/mpv/module.nix
@@ -46,8 +46,8 @@ in {
           max_width = 250;
         };
       };
-      scripts = with pkgs.mpvScripts; [
-        thumbfast
+      scripts = [
+        pkgs.mpvScripts.thumbfast
       ];
     };
   };
diff --git a/modules/by-name/nv/nvim/module.nix b/modules/by-name/nv/nvim/module.nix
index 29488662..81d7febf 100644
--- a/modules/by-name/nv/nvim/module.nix
+++ b/modules/by-name/nv/nvim/module.nix
@@ -73,21 +73,21 @@ in {
           ---------------------------------------------------------------------------
         '';
 
-        extraPackages = with pkgs; [
+        extraPackages = [
           /*
           These are mostly linters and formatters used for different file types.
           Including them here is fine, as they are not necessarily-sync able to different people.
           */
           # nix
-          alejandra
-          statix
+          pkgs.alejandra
+          pkgs.statix
 
           # yaml
-          yamllint
+          pkgs.yamllint
 
           # shell
-          shellcheck
-          shfmt
+          pkgs.shellcheck
+          pkgs.shfmt
         ];
       };
     };
diff --git a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/openscad.nix b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/openscad.nix
index fba1113f..3d55adfa 100644
--- a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/openscad.nix
+++ b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/openscad.nix
@@ -25,9 +25,9 @@ in {
           cmd = {"openscad-lsp", "--stdio", "--fmt-style", "WebKit"},
         }
       '';
-    extraPackages = with pkgs; [
-      openscad-lsp
-      clang-tools # Need to satisfy `clang-format` (which is used by openscad-lsp)
+    extraPackages = [
+      pkgs.openscad-lsp
+      pkgs.clang-tools # Need to satisfy `clang-format` (which is used by openscad-lsp)
     ];
   };
 }
diff --git a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/quick-lint-js.nix b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
index 82d3b5a9..404784f1 100644
--- a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
+++ b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
@@ -24,8 +24,8 @@ in {
         require('lspconfig').quick_lint_js.setup{
         }
       '';
-    extraPackages = with pkgs; [
-      quick-lint-js
+    extraPackages = [
+      pkgs.quick-lint-js
     ];
   };
 }
diff --git a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/ruff-lsp.nix b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
index 4f9834ee..3ad3ad8f 100644
--- a/modules/by-name/nv/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
+++ b/modules/by-name/nv/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
@@ -21,6 +21,6 @@ in {
         enable = true;
       };
     };
-    extraPackages = with pkgs; [ruff];
+    extraPackages = [pkgs.ruff];
   };
 }