packages simplification

Author: ck3mp3r

flake.nix

@@ -43,38 +43,9 @@
             ++ plugins.runtimePaths;
           extraVars = plugins.extraVars;
         };
-
-        individualPackages = with pkgs; {
-          inherit
-            bash-language-server
-            black
-            lua
-            luarocks
-            nodejs
-            nvim
-            python3
-            ruff
-            shellcheck
-            shfmt
-            stylua
-            topiary
-            vscode-js-debug
-            vtsls
-            ;
-          inherit (nodePackages) vscode-json-languageserver;
-          inherit (python312Packages) pip;
-        };
       in {
         formatter = pkgs.alejandra;
-
-        packages =
-          individualPackages
-          // {
-            default = pkgs.buildEnv {
-              name = "xvim packages";
-              paths = builtins.attrValues individualPackages;
-            };
-          };
+        packages.default = nvim;
 
         devShells.default = pkgs.devshell.mkShell {
           imports = [(pkgs.devshell.importTOML ./devshell.toml)];

nix/wrapper.nix

@@ -27,20 +27,32 @@
   topiary-nu = pkgs.topiary-nu;
   extraPackages = with pkgs; [
     alejandra
+    bash-language-server
     black
     cue
     dockerfile-language-server-nodejs
     lldb
+    lua
     lua-language-server
     marksman
     nixd
     nodePackages.bash-language-server
     nodePackages.prettier
     nodePackages.vscode-json-languageserver
+    nodejs
     pyright
+    python3
+    python312Packages.pip
+    ruff
     shellcheck
+    shellcheck
+    shfmt
     shfmt
+    stylua
+    topiary
     vscode-extensions.vadimcn.vscode-lldb.adapter
+    vscode-js-debug
+    vtsls
     yaml-language-server
   ];