Switched package lists from with syntax to explicit

Appranently, the use of `with` for this is discouraged as it can cause
some kinds of compilation/linking issues. Switching to explicit
declaration is a bit more verbose, but probably makes organising into
modules easier in the long run anyway.

home-manager/core/packages.nix

@@ -7,18 +7,15 @@
   unstablePkgs,
   ...
 }: {
-  home.packages =
-    (with pkgs; [
-      alejandra
-      git-extras
-      git-credential-manager
-      meld
-      unzip
-    ])
-    ++ (with unstablePkgs; [
-      devenv
-      lazygit
-      nixd
-      nushell
-    ]);
+  home.packages = [
+    pkgs.alejandra
+    pkgs.git-extras
+    pkgs.git-credential-manager
+    pkgs.meld
+    pkgs.unzip
+    unstablePkgs.devenv
+    unstablePkgs.lazygit
+    unstablePkgs.nixd
+    unstablePkgs.nushell
+  ];
 }

home-manager/homeserver/packages.nix

@@ -7,24 +7,21 @@
   unstablePkgs,
   ...
 }: {
-  home.packages =
-    (with pkgs; [
-      (python3.withPackages (
-        python-pkgs: [
-          python-pkgs.pip
-          python-pkgs.pkginfo
-          python-pkgs.python-lsp-server
-          python-pkgs.setuptools
-        ]
-      ))
-      lua54Packages.lua
-      luajitPackages.luarocks
-      nodejs-slim
-      sops
-      stylua
-    ])
-    ++ (with unstablePkgs; [
-      podman-tui
-      vimPlugins.mason-lspconfig-nvim
-    ]);
+  home.packages = [
+    (pkgs.python3.withPackages (
+      python-pkgs: [
+        python-pkgs.pip
+        python-pkgs.pkginfo
+        python-pkgs.python-lsp-server
+        python-pkgs.setuptools
+      ]
+    ))
+    pkgs.lua54Packages.lua
+    pkgs.luajitPackages.luarocks
+    pkgs.nodejs-slim
+    pkgs.sops
+    pkgs.stylua
+    unstablePkgs.podman-tui
+    unstablePkgs.vimPlugins.mason-lspconfig-nvim
+  ];
 }

home-manager/worklaptop/packages.nix

@@ -7,85 +7,80 @@
   unstablePkgs,
   ...
 }: {
-  home.packages =
-    (with pkgs; [
-      bitwarden
-      blueman
-      distrobox
-      ferdium
-      gimp-with-plugins
-      github-desktop
-      helix
-      hyperfine
-      imagemagick
-      inkscape-with-extensions
-      krita
-      lynx
-      neovide
-      nwg-look
-      obsidian
-      obs-studio
-      onlyoffice-desktopeditors
-      pandoc
-      pavucontrol
-      podman-desktop
-      podman-tui
-      qimgv
-      slack
-      smile
-      spotify
-      vial
-      vivaldi
-      vivaldi-ffmpeg-codecs
-      warpinator
-      zathura
-      zettlr
-      # theming
-      gtk-engine-murrine
-      gtk_engines
-      phinger-cursors
-      tokyonight-gtk-theme
-      # Python packages
-      (python3.withPackages (
-        python-pkgs: [
-          python-pkgs.pip
-          python-pkgs.pkginfo
-          python-pkgs.python-lsp-server
-          python-pkgs.setuptools
-        ]
-      ))
-      # Backend dev tools
-      go
-      lua54Packages.lua
-      luajitPackages.luarocks
-      mypy
-      php83
-      poetry
-      poetryPlugins.poetry-plugin-up
-      poetryPlugins.poetry-plugin-export
-      poetryPlugins.poetry-audit-plugin
-      pre-commit
-      rustup
-      sshs
-      steam-run
-      stylua
-      tree-sitter
-      xarchiver
-      # Language Server Protocols
-      elixir-ls
-      fortls
-      nodePackages_latest.bash-language-server
-      lua-language-server
-      taplo
-      yaml-language-server
-      zed-editor
-    ])
-    ++ (with unstablePkgs; [
-      nextcloud-client
-      vimPlugins.mason-lspconfig-nvim
-      zotero
-    ])
-    ++ [
-      inputs.zen-browser.packages.x86_64-linux.default
-    ];
+  home.packages = [
+    pkgs.bitwarden
+    pkgs.blueman
+    pkgs.distrobox
+    pkgs.ferdium
+    pkgs.gimp-with-plugins
+    pkgs.github-desktop
+    pkgs.helix
+    pkgs.hyperfine
+    pkgs.imagemagick
+    pkgs.inkscape-with-extensions
+    pkgs.krita
+    pkgs.lynx
+    pkgs.neovide
+    pkgs.nwg-look
+    pkgs.obsidian
+    pkgs.obs-studio
+    pkgs.onlyoffice-desktopeditors
+    pkgs.pandoc
+    pkgs.pavucontrol
+    pkgs.podman-desktop
+    pkgs.podman-tui
+    pkgs.qimgv
+    pkgs.slack
+    pkgs.smile
+    pkgs.spotify
+    pkgs.vial
+    pkgs.vivaldi
+    pkgs.vivaldi-ffmpeg-codecs
+    pkgs.warpinator
+    pkgs.zathura
+    pkgs.zed-editor
+    pkgs.zettlr
+    unstablePkgs.nextcloud-client
+    unstablePkgs.zotero
+    inputs.zen-browser.packages.x86_64-linux.default
+    # theming
+    pkgs.gtk-engine-murrine
+    pkgs.gtk_engines
+    pkgs.phinger-cursors
+    pkgs.tokyonight-gtk-theme
+    # Python packages
+    (pkgs.python3.withPackages (
+      python-pkgs: [
+        python-pkgs.pip
+        python-pkgs.pkginfo
+        python-pkgs.python-lsp-server
+        python-pkgs.setuptools
+      ]
+    ))
+    # Backend dev tools
+    pkgs.go
+    pkgs.lua54Packages.lua
+    pkgs.luajitPackages.luarocks
+    pkgs.mypy
+    pkgs.php83
+    pkgs.poetry
+    pkgs.poetryPlugins.poetry-plugin-up
+    pkgs.poetryPlugins.poetry-plugin-export
+    pkgs.poetryPlugins.poetry-audit-plugin
+    pkgs.pre-commit
+    pkgs.rustup
+    pkgs.sshs
+    pkgs.steam-run
+    pkgs.stylua
+    pkgs.tree-sitter
+    pkgs.xarchiver
+    # Language Server Protocols
+    pkgs.elixir-ls
+    pkgs.fortls
+    pkgs.nodePackages_latest.bash-language-server
+    pkgs.lua-language-server
+    pkgs.taplo
+    pkgs.yaml-language-server
+    unstablePkgs.vimPlugins.mason-lspconfig-nvim
+  ];
 }