fix: package collisions

2026-07-14 00:22:39 +02:00 · 2023-12-06 10:44:45 +08:00
parent 1ca7607814
commit b0e481a1f1
7 changed files with 148 additions and 153 deletions
@@ -34,7 +34,108 @@

      withPython3 = true;
      withNodeJs = true;
-      extraPackages = with pkgs; [];
+
+      # Extra packages only available to nvim(won't pollute the global home environment)
+      extraPackages = with pkgs;
+        [
+          #-- c/c++
+          cmake
+          cmake-language-server
+          gnumake
+          checkmake
+          gcc # c/c++ compiler, required by nvim-treesitter!
+          llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
+          gdb
+          lldb
+
+          #-- python
+          nodePackages.pyright # python language server
+          python311Packages.black # python formatter
+          python311Packages.ruff-lsp
+
+          #-- rust
+          rust-analyzer
+          cargo # rust package manager
+          rustfmt
+
+          #-- zig
+          zls
+
+          #-- nix
+          nil
+          rnix-lsp
+          # nixd
+          statix # Lints and suggestions for the nix programming language
+          deadnix # Find and remove unused code in .nix source files
+          alejandra # Nix Code Formatter
+
+          #-- golang
+          go
+          gomodifytags
+          iferr # generate error handling code for go
+          impl # generate function implementation for go
+          gotools # contains tools like: godoc, goimports, etc.
+          gopls # go language server
+          delve # go debugger
+
+          # -- java
+          jdk17
+          gradle
+          maven
+          spring-boot-cli
+
+          #-- lua
+          stylua
+          lua-language-server
+
+          #-- bash
+          nodePackages.bash-language-server
+          shellcheck
+          shfmt
+
+          #-- javascript/typescript --#
+          nodePackages.typescript
+          nodePackages.typescript-language-server
+          # HTML/CSS/JSON/ESLint language servers extracted from vscode
+          nodePackages.vscode-langservers-extracted
+          nodePackages."@tailwindcss/language-server"
+
+          #-- CloudNative
+          nodePackages.dockerfile-language-server-nodejs
+          # terraform  # install via brew on macOS
+          terraform-ls
+          jsonnet
+          jsonnet-language-server
+          hadolint # Dockerfile linter
+
+          #-- Others
+          taplo # TOML language server / formatter / validator
+          nodePackages.yaml-language-server
+          sqlfluff # SQL linter
+          actionlint # GitHub Actions linter
+          buf # protoc plugin for linting and formatting
+          proselint # English prose linter
+          guile # scheme language
+
+          #-- Misc
+          tree-sitter # common language parser/highlighter
+          nodePackages.prettier # common code formatter
+          marksman # language server for markdown
+          glow # markdown previewer
+          fzf
+
+          #-- Optional Requirements:
+          gdu # disk usage analyzer, required by AstroNvim
+          ripgrep # fast search tool, required by AstroNvim's '<leader>fw'(<leader> is space key)
+        ]
+        ++ (
+          if pkgs.stdenv.isDarwin
+          then []
+          else [
+            #-- verilog / systemverilog
+            verible
+          ]
+        );

      # currently we use lazy.nvim as neovim's package manager, so comment this one.
      # plugins = with pkgs.vimPlugins; [
@@ -42,99 +143,4 @@
      # ];
    };
  };
-  home = {
-    packages = with pkgs;
-      [
-        #-- c/c++
-        cmake
-        cmake-language-server
-        gnumake
-        checkmake
-        gcc # c/c++ compiler, required by nvim-treesitter!
-        llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
-        gdb
-        # lldb  # TODO - fix python3.11's package conflict - six.py
-
-        #-- python
-        nodePackages.pyright # python language server
-        python311Packages.black # python formatter
-        python311Packages.ruff-lsp
-
-        #-- rust
-        rust-analyzer
-        cargo # rust package manager
-        rustfmt
-
-        #-- zig
-        zls
-
-        #-- nix
-        nil
-        rnix-lsp
-        # nixd
-        statix # Lints and suggestions for the nix programming language
-        deadnix # Find and remove unused code in .nix source files
-        alejandra # Nix Code Formatter
-
-        #-- golang
-        go
-        gomodifytags
-        iferr # generate error handling code for go
-        impl # generate function implementation for go
-        gotools # contains tools like: godoc, goimports, etc.
-        gopls # go language server
-        delve # go debugger
-
-        #-- lua
-        stylua
-        lua-language-server
-
-        #-- bash
-        nodePackages.bash-language-server
-        shellcheck
-        shfmt
-
-        #-- javascript/typescript --#
-        nodePackages.typescript
-        nodePackages.typescript-language-server
-        # HTML/CSS/JSON/ESLint language servers extracted from vscode
-        nodePackages.vscode-langservers-extracted
-        nodePackages."@tailwindcss/language-server"
-
-        #-- CloudNative
-        nodePackages.dockerfile-language-server-nodejs
-        # terraform  # install via brew on macOS
-        terraform-ls
-        jsonnet
-        jsonnet-language-server
-        hadolint # Dockerfile linter
-
-        #-- Others
-        taplo # TOML language server / formatter / validator
-        nodePackages.yaml-language-server
-        sqlfluff # SQL linter
-        actionlint # GitHub Actions linter
-        buf # protoc plugin for linting and formatting
-        proselint # English prose linter
-
-        #-- Misc
-        tree-sitter # common language parser/highlighter
-        nodePackages.prettier # common code formatter
-        marksman # language server for markdown
-        glow # markdown previewer
-        fzf
-
-        #-- Optional Requirements:
-        gdu # disk usage analyzer, required by AstroNvim
-        ripgrep # fast search tool, required by AstroNvim's '<leader>fw'(<leader> is space key)
-      ]
-      ++ (
-        if pkgs.stdenv.isDarwin
-        then []
-        else [
-          #-- verilog / systemverilog
-          verible
-        ]
-      );
-  };
 }