christoph/flake-nixinator
1
Fork 0
Code Activity

Neovim: Add ts-autotag, disable ltex + update formatters

Browse Source
This commit is contained in:
Christoph Urlacher
2024-12-15 18:54:26 +01:00
parent ddb562541c
commit d6c6eba3b5
1 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
home/modules/neovim/default.nix
View File

@ -42,7 +42,7 @@ in {
clojure-lsp clojure-lsp
cmake-language-server cmake-language-server
haskell-language-server haskell-language-server
ltex-ls # ltex-ls # Terribly slow
lua-language-server lua-language-server
nil nil
nixd nixd
@ -393,28 +393,6 @@ in {
opts = { opts = {
keymap.preset = "enter"; keymap.preset = "enter";
# NOTE: This config is for version 0.62
# highlight.use_nvim_cmp_as_default = true;
# nerd_font_variant = "mono";
# sources.completion.enabled_providers = ["lsp" "path" "snippets"]; # No "buffer"
# accept.auto_brackets.enabled = true;
# trigger.signature_help.enabled = true;
# fuzzy = {
# use_typo_resistance = true;
# use_frequency = true;
# use_proximity = true;
# };
# windows = {
# autocomplete.border = "rounded";
# documentation.border = "rounded";
# documentation.auto_show = true;
# signature_help.border = "rounded";
# ghost_text.enabled = true;
# };
# NOTE: This config is for versions > 0.62
appearance = { appearance = {
use_nvim_cmp_as_default = true; use_nvim_cmp_as_default = true;
nerd_font_variant = "mono"; nerd_font_variant = "mono";
@ -435,7 +413,7 @@ in {
completion = { completion = {
accept = { accept = {
auto_brackets = { auto_brackets = {
enabled = true; enabled = false;
}; };
}; };
@ -528,16 +506,16 @@ in {
h = ["clang-format"]; h = ["clang-format"];
cpp = ["clang-format"]; cpp = ["clang-format"];
hpp = ["clang-format"]; hpp = ["clang-format"];
css = ["prettier"]; # "prettierd" css = ["prettierd" "prettier"];
html = ["prettier"]; # "prettierd" html = ["prettierd" "prettier"];
java = ["google-java-format"]; java = ["google-java-format"];
javascript = ["prettier"]; # "prettierd" javascript = ["prettierd" "prettier"];
lua = ["stylua"]; lua = ["stylua"];
markdown = ["prettier"]; # "prettierd" markdown = ["prettierd" "prettier"];
nix = ["alejandra"]; nix = ["alejandra"];
python = ["black"]; python = ["black"];
svelte = ["prettier"]; # "prettierd" svelte = ["prettierd" "prettier"];
typescript = ["prettier"]; # "prettierd" typescript = ["prettierd" "prettier"];
rust = ["rustfmt"]; rust = ["rustfmt"];
}; };
@ -553,7 +531,7 @@ in {
if vim.g.disable_autoformat then if vim.g.disable_autoformat then
return return
end end
return { timeout_ms = 500, lsp_format = "fallback", } return { timeout_ms = 500, lsp_format = "fallback", stop_after_first = true, }
end end
''; '';
@ -1915,11 +1893,18 @@ in {
config = mkDefaultConfig name; config = mkDefaultConfig name;
}; };
ts-autotag = rec {
name = "nvim-ts-autotag";
pkg = pkgs.vimPlugins.nvim-ts-autotag;
lazy = false;
config = mkDefaultConfig name;
};
typescript-tools = rec { typescript-tools = rec {
name = "typescript-tools"; name = "typescript-tools";
pkg = pkgs.vimPlugins.typescript-tools-nvim; pkg = pkgs.vimPlugins.typescript-tools-nvim;
lazy = true; lazy = true;
ft = ["javascript" "typescript"]; ft = ["javascript" "typescript" "svelte" "html"];
dependencies = [_plenary lspconfig]; dependencies = [_plenary lspconfig];
config = mkDefaultConfig name; config = mkDefaultConfig name;
}; };
@ -2029,7 +2014,8 @@ in {
config = mkDefaultConfig name; config = mkDefaultConfig name;
}; };
in [ in [
autopairs # Automatic closing brackets/parens autopairs # Automatic closing brackets/parens # NOTE: For now replaced by blink
bbye # Delete buffer without closing the window or split bbye # Delete buffer without closing the window or split
better-escape # Escape to normal mode using "jk" better-escape # Escape to normal mode using "jk"
catppuccin # Colortheme (also add this here to access palettes) catppuccin # Colortheme (also add this here to access palettes)
@ -2057,7 +2043,9 @@ in {
gitsigns # Show git line additions/deletions/changes in the gutter gitsigns # Show git line additions/deletions/changes in the gutter
haskell-tools # Haskell integration haskell-tools # Haskell integration
illuminate # Highlight usages of word under cursor illuminate # Highlight usages of word under cursor
intellitab # Indent to the correct level on blanklines
intellitab # Indent to the correct level on blanklines # TODO: Behaves bit fishy sometimes
jdtls # Eclipse JDT language server integration for Java jdtls # Eclipse JDT language server integration for Java
lastplace # Reopen a file at the last editing position lastplace # Reopen a file at the last editing position
lazygit # Git frontend lazygit # Git frontend
@ -2084,7 +2072,9 @@ in {
rainbow-delimiters # Bracket/Paren colorization rainbow-delimiters # Bracket/Paren colorization
rustaceanvim # Rust integration rustaceanvim # Rust integration
scope # Buffers scoped to tabpages scope # Buffers scoped to tabpages
sleuth # Heuristically set indent depth
sleuth # Heuristically set indent depth # TODO: See intellitab
tabby # Nicer tabline (only showing tabpages) tabby # Nicer tabline (only showing tabpages)
telescope # Option picker frontend telescope # Option picker frontend
todo-comments # Highlight TODOs todo-comments # Highlight TODOs
@ -2092,6 +2082,7 @@ in {
treesitter # AST based syntax highlighting + indentation treesitter # AST based syntax highlighting + indentation
trim # Trim whitespace trim # Trim whitespace
trouble # Diagnostics window trouble # Diagnostics window
ts-autotag # Automatic html tag insertion/updating
typescript-tools # Typescript tsserver LSP typescript-tools # Typescript tsserver LSP
ufo # Code folding ufo # Code folding
vimtex # LaTeX support vimtex # LaTeX support