Skip to content

Commit 5fcf0d0

Browse files
committed
refactor(home/base/tui/edistors): neovim - adjust the classification of lsp/treesitter
1 parent 66949f6 commit 5fcf0d0

File tree

4 files changed

+199
-176
lines changed

4 files changed

+199
-176
lines changed

home/base/tui/editors/neovim/default.nix

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ in {
3030
viAlias = true;
3131
vimAlias = true;
3232

33-
# currently we use lazy.nvim as neovim's package manager, so comment this one.
34-
# Install packages that will compile locally or download FHS binaries via Nix!
33+
# Currently we use lazy.nvim as neovim's package manager, so comment this one.
34+
#
35+
# NOTE: These plugins will not be used by astronvim by default!
36+
# We should install packages that will compile locally or download FHS binaries via Nix!
3537
# and use lazy.nvim's `dir` option to specify the package directory in nix store.
3638
# so that these plugins can work on NixOS.
3739
#
@@ -40,6 +42,8 @@ in {
4042
plugins = with pkgs.vimPlugins; [
4143
# search all the plugins using https://search.nixos.org/packages
4244
telescope-fzf-native-nvim
45+
46+
nvim-treesitter.withAllGrammars
4347
];
4448
};
4549
};

home/base/tui/editors/neovim/nvim/lua/plugins/astrolsp.lua

+34-24
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
44
-- as this provides autocomplete and documentation while editing
55

6-
76
---@type LazySpec
87
return {
98
"AstroNvim/astrolsp",
@@ -42,40 +41,51 @@ return {
4241
-- end
4342
},
4443
-- enable servers that you already have installed without mason
44+
-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
4545
servers = {
46-
---- Frontend & NodeJS
47-
"tsserver", -- typescript/javascript language server
48-
"tailwindcss", -- tailwindcss language server
49-
"html", -- html language server
50-
"cssls", -- css language server
51-
"prismals", -- prisma language server
52-
"volar", -- vue language server
53-
---- Configuration Language
54-
"marksman", -- markdown ls
46+
---- Data & Configuration Languages
5547
"jsonls", -- json language server
48+
"jsonnet_ls", -- jsonnet language server
5649
"yamlls", -- yaml language server
5750
"taplo", -- toml language server
58-
---- Backend
59-
"lua_ls", -- lua
51+
"dagger", -- cuelsp - cue language server
52+
"terraformls", -- terraform hcl
53+
"marksman", -- markdown ls
54+
"nickel_ls", -- nickel language server
55+
"nil_ls", -- nix language server
56+
"bufls", -- protocol buffer language server
57+
"dockerls", -- dockerfile
58+
"cmake", -- cmake language server
59+
"sqls", -- sql language server
60+
61+
---- General Purpose Languages
62+
"clangd", -- c/c++
6063
"gopls", -- go
64+
"jdtls", -- java language server, provides only basic features
6165
"rust_analyzer", -- rust
6266
"pyright", -- python
6367
"ruff_lsp", -- extremely fast Python linter and code transformation
64-
"jdtls", -- java
65-
"nil_ls", -- nix language server
66-
"bufls", -- protocol buffer language server
67-
"zls", -- zig language server
68-
---- HDL
69-
"verible", -- verilog language server
70-
---- Operation & Cloud Nativautoindente
68+
-- "julials", -- julia language server
69+
-- "zls", -- zig language server
70+
"lua_ls", -- lua
7171
"bashls", -- bash
72-
"cmake", -- cmake language server
73-
"clangd", -- c/c++
74-
"dockerls", -- dockerfile
75-
"jsonnet_ls", -- jsonnet language server
76-
"terraformls", -- terraform hcl
7772
"nushell", -- nushell language server
73+
74+
---- Web Development
75+
"tsserver", -- typescript/javascript language server
76+
"tailwindcss", -- tailwindcss language server
77+
"html", -- html language server
78+
"cssls", -- css language server
79+
"prismals", -- prisma language server
80+
"volar", -- vue language server
81+
82+
---- Lisp Like
7883
"scheme_langserver", -- scheme language server
84+
"elixirls", -- elixir language server
85+
-- "clojure_lsp", -- clojure language server"
86+
87+
---- Circuit Design
88+
"verible", -- verilog language server
7989
},
8090
-- customize language server configuration options passed to `lspconfig`
8191
---@diagnostic disable: missing-fields

home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua

+12-20
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,23 @@ return {
2020
opts.ignore_install = { "gotmpl", "wing" }
2121

2222
-- add more things to the ensure_installed table protecting against community packs modifying it
23+
-- https://github.com/nvim-treesitter/nvim-treesitter/tree/master
2324
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
24-
-- neovim
25-
"vim",
26-
"lua",
27-
-- operation & cloud native
28-
"dockerfile",
29-
"hcl",
30-
"jsonnet",
31-
"regex",
32-
"terraform",
33-
"nix",
25+
-- please add only the tree-sitters that are not available in nixpkgs here
26+
27+
"kdl",
3428
"csv",
35-
"nickel", -- nickel language
36-
"just", -- justfile
37-
-- other programming language
29+
"xml",
30+
"vhdl",
31+
32+
---- Misc
3833
"diff",
34+
"git_config",
35+
"git_rebase",
3936
"gitignore",
4037
"gitcommit",
41-
"latex",
42-
"sql",
43-
-- Lisp like
44-
"fennel",
45-
"clojure",
46-
"commonlisp",
47-
"scheme",
38+
"gitattributes",
39+
"ssh_config",
4840
})
4941
end,
5042
}

0 commit comments

Comments
 (0)