diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix index d15342a8..5ab55814 100644 --- a/home/base/desktop/neovim/default.nix +++ b/home/base/desktop/neovim/default.nix @@ -43,91 +43,97 @@ }; }; 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 + 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 - #-- python - nodePackages.pyright # python language server - python311Packages.black # python formatter - python311Packages.ruff-lsp + #-- python + nodePackages.pyright # python language server + python311Packages.black # python formatter + python311Packages.ruff-lsp - #-- rust - rust-analyzer - cargo # rust package manager - rustfmt + #-- rust + rust-analyzer + cargo # rust package manager + rustfmt - #-- zig - zls + #-- 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 + #-- 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 + #-- 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 + #-- lua + stylua + lua-language-server - #-- bash - nodePackages.bash-language-server - shellcheck - shfmt + #-- 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" + #-- 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" - #-- verilog / systemverilog - verible + #-- CloudNative + nodePackages.dockerfile-language-server-nodejs + terraform + terraform-ls + jsonnet + jsonnet-language-server + hadolint # Dockerfile linter - #-- CloudNative - nodePackages.dockerfile-language-server-nodejs - terraform - 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 - #-- 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 - #-- Misc - tree-sitter # common language parser/highlighter - nodePackages.prettier # common code formatter - marksman # language server for markdown - glow # markdown previewer - - #-- Optional Requirements: - gdu # disk usage analyzer, required by AstroNvim - ripgrep # fast search tool, required by AstroNvim's 'fw'( is space key) - ]; + #-- Optional Requirements: + gdu # disk usage analyzer, required by AstroNvim + ripgrep # fast search tool, required by AstroNvim's 'fw'( is space key) + ] + ++ ( + if pkgs.stdenv.isDarwin + then [] + else [ + #-- verilog / systemverilog + verible + ] + ); }; } diff --git a/home/linux/base/btop.nix b/home/base/server/btop.nix similarity index 100% rename from home/linux/base/btop.nix rename to home/base/server/btop.nix diff --git a/home/base/server/default.nix b/home/base/server/default.nix index 308e5962..8e6761b4 100644 --- a/home/base/server/default.nix +++ b/home/base/server/default.nix @@ -6,6 +6,7 @@ ./bash.nix ./bat.nix + ./btop.nix ./core.nix ./git.nix ./starship.nix diff --git a/home/linux/base/default.nix b/home/linux/base/default.nix index 78057c5f..60e82c2e 100644 --- a/home/linux/base/default.nix +++ b/home/linux/base/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./btop.nix ./shell.nix ./system-tools.nix ]; diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 29a42d57..48bcefb2 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -44,7 +44,7 @@ # homebrew need to be installed manually, see https://brew.sh homebrew = { - enable = true; + enable = false; onActivation = { autoUpdate = false;