summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/nvim/lsp/clangd.lua10
-rw-r--r--.config/nvim/lsp/cssls.lua11
-rw-r--r--.config/nvim/lsp/gopls.lua6
-rw-r--r--.config/nvim/lsp/html.lua11
-rw-r--r--.config/nvim/lsp/jsonls.lua10
-rw-r--r--.config/nvim/lsp/lua_ls.lua11
-rw-r--r--.config/nvim/lsp/mesonlsp.lua9
-rw-r--r--.config/nvim/lsp/ruff.lua10
-rw-r--r--.config/nvim/lsp/ts_ls.lua44
-rw-r--r--.gitmodules3
-rwxr-xr-x.local/bin/http-static5
m---------.local/share/nvim/site/pack/plugins/start/conform0
m---------.local/share/nvim/site/pack/plugins/start/nvim-lspconfig0
m---------.local/share/nvim/site/pack/plugins/start/nvim-treesitter0
m---------.zfunc/zsh-completions0
-rw-r--r--.zshrc2
16 files changed, 17 insertions, 115 deletions
diff --git a/.config/nvim/lsp/clangd.lua b/.config/nvim/lsp/clangd.lua
index 4f0b351..ce827a8 100644
--- a/.config/nvim/lsp/clangd.lua
+++ b/.config/nvim/lsp/clangd.lua
@@ -1,14 +1,4 @@
return {
- cmd = { 'clangd' },
- filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
- root_markers = {
- '.clangd',
- '.clang-tidy',
- '.clang-format',
- 'compile_commands.json',
- 'compile_flags.txt',
- 'meson.build',
- },
settings = {
clangd = {
InlayHints = {
diff --git a/.config/nvim/lsp/cssls.lua b/.config/nvim/lsp/cssls.lua
deleted file mode 100644
index 10b60ec..0000000
--- a/.config/nvim/lsp/cssls.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
- cmd = { 'vscode-css-language-server', '--stdio' },
- filetypes = { 'css', 'scss', 'less' },
- init_options = { provideFormatter = true },
- root_markers = { 'package.json' },
- settings = {
- css = { validate = true },
- scss = { validate = true },
- less = { validate = true },
- },
-}
diff --git a/.config/nvim/lsp/gopls.lua b/.config/nvim/lsp/gopls.lua
index e3d00bc..765a0d5 100644
--- a/.config/nvim/lsp/gopls.lua
+++ b/.config/nvim/lsp/gopls.lua
@@ -1,10 +1,4 @@
return {
- cmd = { 'gopls' },
- filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
- root_markers = {
- 'go.work',
- 'go.mod',
- },
settings = {
gopls = {
hints = {
diff --git a/.config/nvim/lsp/html.lua b/.config/nvim/lsp/html.lua
deleted file mode 100644
index cc769d5..0000000
--- a/.config/nvim/lsp/html.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
- cmd = { 'vscode-html-language-server', '--stdio' },
- filetypes = { 'html', 'templ' },
- root_markers = { 'package.json' },
- settings = {},
- init_options = {
- provideFormatter = true,
- embeddedLanguages = { css = true, javascript = true },
- configurationSection = { 'html', 'css', 'javascript' },
- },
-}
diff --git a/.config/nvim/lsp/jsonls.lua b/.config/nvim/lsp/jsonls.lua
deleted file mode 100644
index 234cc94..0000000
--- a/.config/nvim/lsp/jsonls.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
- cmd = { 'vscode-json-language-server', '--stdio' },
- filetypes = { 'json', 'jsonc' },
- init_options = {
- provideFormatter = true,
- },
- root_marker = {},
- single_file_support = true,
-}
-
diff --git a/.config/nvim/lsp/lua_ls.lua b/.config/nvim/lsp/lua_ls.lua
index 92e92fc..b4fd5c8 100644
--- a/.config/nvim/lsp/lua_ls.lua
+++ b/.config/nvim/lsp/lua_ls.lua
@@ -1,15 +1,4 @@
return {
- cmd = { 'lua-language-server' },
- filetypes = { 'lua' },
- root_markers = {
- '.luarc.json',
- '.luarc.jsonc',
- '.luacheckrc',
- '.stylua.toml',
- 'stylua.toml',
- 'selene.toml',
- 'selene.yml',
- },
settings = {
Lua = {
runtime = {
diff --git a/.config/nvim/lsp/mesonlsp.lua b/.config/nvim/lsp/mesonlsp.lua
deleted file mode 100644
index 6e7dd5d..0000000
--- a/.config/nvim/lsp/mesonlsp.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- cmd = { 'mesonlsp', '--lsp' },
- filetypes = { 'meson' },
- root_markers = {
- 'meson.build',
- 'meson_options.txt',
- 'meson.options'
- },
-}
diff --git a/.config/nvim/lsp/ruff.lua b/.config/nvim/lsp/ruff.lua
deleted file mode 100644
index 0d174b3..0000000
--- a/.config/nvim/lsp/ruff.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
- cmd = { 'ruff', 'server' },
- filetypes = { 'python' },
- root_marker = {
- 'pyproject.toml',
- 'ruff.toml',
- '.ruff.toml'
- },
- single_file_support = true,
-}
diff --git a/.config/nvim/lsp/ts_ls.lua b/.config/nvim/lsp/ts_ls.lua
index 860951b..95a179d 100644
--- a/.config/nvim/lsp/ts_ls.lua
+++ b/.config/nvim/lsp/ts_ls.lua
@@ -1,39 +1,21 @@
+local inlayHints = {
+ includeInlayParameterNameHints = "all",
+ includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+ includeInlayFunctionParameterTypeHints = true,
+ includeInlayVariableTypeHints = true,
+ includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+ includeInlayPropertyDeclarationTypeHints = true,
+ includeInlayFunctionLikeReturnTypeHints = true,
+ includeInlayEnumMemberValueHints = true,
+}
+
return {
- init_options = { hostInfo = 'neovim' },
- cmd = { 'typescript-language-server', '--stdio' },
- filetypes = {
- 'javascript',
- 'javascriptreact',
- 'javascript.jsx',
- 'typescript',
- 'typescriptreact',
- 'typescript.tsx',
- },
- root_markers = { 'tsconfig.json', 'jsconfig.json', 'package.json'},
settings = {
typescript = {
- inlayHints = {
- includeInlayParameterNameHints = "all",
- includeInlayParameterNameHintsWhenArgumentMatchesName = false,
- includeInlayFunctionParameterTypeHints = true,
- includeInlayVariableTypeHints = true,
- includeInlayVariableTypeHintsWhenTypeMatchesName = false,
- includeInlayPropertyDeclarationTypeHints = true,
- includeInlayFunctionLikeReturnTypeHints = true,
- includeInlayEnumMemberValueHints = true,
- },
+ inlayHints = inlayHints,
},
javascript = {
- inlayHints = {
- includeInlayParameterNameHints = "all",
- includeInlayParameterNameHintsWhenArgumentMatchesName = false,
- includeInlayFunctionParameterTypeHints = true,
- includeInlayVariableTypeHints = true,
- includeInlayVariableTypeHintsWhenTypeMatchesName = false,
- includeInlayPropertyDeclarationTypeHints = true,
- includeInlayFunctionLikeReturnTypeHints = true,
- includeInlayEnumMemberValueHints = true,
- },
+ inlayHints = inlayHints,
},
}
}
diff --git a/.gitmodules b/.gitmodules
index a77df98..d4277e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
[submodule "zsh-completions"]
path = .zfunc/zsh-completions
url = https://github.com/zsh-users/zsh-completions.git
+[submodule "nvim-lspconfig"]
+ path = .local/share/nvim/site/pack/plugins/start/nvim-lspconfig
+ url = https://github.com/neovim/nvim-lspconfig
diff --git a/.local/bin/http-static b/.local/bin/http-static
index 1d49eb7..9b189cc 100755
--- a/.local/bin/http-static
+++ b/.local/bin/http-static
@@ -37,10 +37,7 @@ def main(argv: Optional[Sequence[str]] = None) -> None:
)
args = parser.parse_args(argv)
- try:
- serve(**vars(args))
- except KeyboardInterrupt:
- pass
+ serve(**vars(args))
if __name__ == "__main__":
diff --git a/.local/share/nvim/site/pack/plugins/start/conform b/.local/share/nvim/site/pack/plugins/start/conform
-Subproject f9ef25a7ef00267b7d13bfc00b0dea22d78702d
+Subproject 372fc521f8421b7830ea6db4d6ea3bae1c77548
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig b/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig
new file mode 160000
+Subproject 641e567f975feab3815b47c7d29e6148e07afa7
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-treesitter b/.local/share/nvim/site/pack/plugins/start/nvim-treesitter
-Subproject da5825bf70cc2ea7eacd1e60c32c07baf19adeb
+Subproject 3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d3
diff --git a/.zfunc/zsh-completions b/.zfunc/zsh-completions
-Subproject e61c9c14d6978191762e9586a0c882114e49221
+Subproject e5507e0d0c8879f960f4b8e7c6ddb813608d95a
diff --git a/.zshrc b/.zshrc
index e568f25..c618c09 100644
--- a/.zshrc
+++ b/.zshrc
@@ -36,8 +36,6 @@ zstyle ':completion:*' rehash true
zstyle ':completion:*:*:-command-:*:*' group-order alias builtins functions commands
compinit
-compdef dotfiles=git
-
bindkey -M menuselect 'h' vi-backward-char
bindkey -M menuselect 'k' vi-up-line-or-history
bindkey -M menuselect 'l' vi-forward-char
generated by cgit v1.2.3-70-g09d2 (git 2.50.0) at 2025-06-30 22:06:58 +0000