feat: add btop for macOS, remove verible from macOS

This commit is contained in:
Ryan Yin
2023-09-07 16:35:59 +08:00
parent c645d31dd3
commit 02b6079198
5 changed files with 82 additions and 76 deletions
+80 -74
View File
@@ -43,91 +43,97 @@
}; };
}; };
home = { home = {
packages = with pkgs; [ packages = with pkgs;
#-- c/c++ [
cmake #-- c/c++
cmake-language-server cmake
gnumake cmake-language-server
checkmake gnumake
gcc # c/c++ compiler, required by nvim-treesitter! checkmake
llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd gcc # c/c++ compiler, required by nvim-treesitter!
gdb llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
lldb gdb
lldb
#-- python #-- python
nodePackages.pyright # python language server nodePackages.pyright # python language server
python311Packages.black # python formatter python311Packages.black # python formatter
python311Packages.ruff-lsp python311Packages.ruff-lsp
#-- rust #-- rust
rust-analyzer rust-analyzer
cargo # rust package manager cargo # rust package manager
rustfmt rustfmt
#-- zig #-- zig
zls zls
#-- nix #-- nix
nil nil
rnix-lsp rnix-lsp
# nixd # nixd
statix # Lints and suggestions for the nix programming language statix # Lints and suggestions for the nix programming language
deadnix # Find and remove unused code in .nix source files deadnix # Find and remove unused code in .nix source files
alejandra # Nix Code Formatter alejandra # Nix Code Formatter
#-- golang #-- golang
go go
gomodifytags gomodifytags
iferr # generate error handling code for go iferr # generate error handling code for go
impl # generate function implementation for go impl # generate function implementation for go
gotools # contains tools like: godoc, goimports, etc. gotools # contains tools like: godoc, goimports, etc.
gopls # go language server gopls # go language server
delve # go debugger delve # go debugger
#-- lua #-- lua
stylua stylua
lua-language-server lua-language-server
#-- bash #-- bash
nodePackages.bash-language-server nodePackages.bash-language-server
shellcheck shellcheck
shfmt shfmt
#-- javascript/typescript --# #-- javascript/typescript --#
nodePackages.typescript nodePackages.typescript
nodePackages.typescript-language-server nodePackages.typescript-language-server
# HTML/CSS/JSON/ESLint language servers extracted from vscode # HTML/CSS/JSON/ESLint language servers extracted from vscode
nodePackages.vscode-langservers-extracted nodePackages.vscode-langservers-extracted
nodePackages."@tailwindcss/language-server" nodePackages."@tailwindcss/language-server"
#-- verilog / systemverilog #-- CloudNative
verible nodePackages.dockerfile-language-server-nodejs
terraform
terraform-ls
jsonnet
jsonnet-language-server
hadolint # Dockerfile linter
#-- CloudNative #-- Others
nodePackages.dockerfile-language-server-nodejs taplo # TOML language server / formatter / validator
terraform nodePackages.yaml-language-server
terraform-ls sqlfluff # SQL linter
jsonnet actionlint # GitHub Actions linter
jsonnet-language-server buf # protoc plugin for linting and formatting
hadolint # Dockerfile linter proselint # English prose linter
#-- Others #-- Misc
taplo # TOML language server / formatter / validator tree-sitter # common language parser/highlighter
nodePackages.yaml-language-server nodePackages.prettier # common code formatter
sqlfluff # SQL linter marksman # language server for markdown
actionlint # GitHub Actions linter glow # markdown previewer
buf # protoc plugin for linting and formatting
proselint # English prose linter
#-- Misc #-- Optional Requirements:
tree-sitter # common language parser/highlighter gdu # disk usage analyzer, required by AstroNvim
nodePackages.prettier # common code formatter ripgrep # fast search tool, required by AstroNvim's '<leader>fw'(<leader> is space key)
marksman # language server for markdown ]
glow # markdown previewer ++ (
if pkgs.stdenv.isDarwin
#-- Optional Requirements: then []
gdu # disk usage analyzer, required by AstroNvim else [
ripgrep # fast search tool, required by AstroNvim's '<leader>fw'(<leader> is space key) #-- verilog / systemverilog
]; verible
]
);
}; };
} }
+1
View File
@@ -6,6 +6,7 @@
./bash.nix ./bash.nix
./bat.nix ./bat.nix
./btop.nix
./core.nix ./core.nix
./git.nix ./git.nix
./starship.nix ./starship.nix
-1
View File
@@ -1,6 +1,5 @@
{ {
imports = [ imports = [
./btop.nix
./shell.nix ./shell.nix
./system-tools.nix ./system-tools.nix
]; ];
+1 -1
View File
@@ -44,7 +44,7 @@
# homebrew need to be installed manually, see https://brew.sh # homebrew need to be installed manually, see https://brew.sh
homebrew = { homebrew = {
enable = true; enable = false;
onActivation = { onActivation = {
autoUpdate = false; autoUpdate = false;