From 24820f1f4b14ed1db7b4fc3b265852b3f4460e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:56:58 +0200 Subject: [PATCH 01/13] Add vim-fetch --- modules/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/default.nix b/modules/default.nix index 20e487b..019757f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, pkgs, ... }: { imports = [ @@ -29,6 +29,10 @@ secure = true; }; + extraPlugins = with pkgs.vimPlugins; [ + vim-fetch # accept ./path/to/file:123 as line numbers + ]; + editorconfig.enable = true; plugins = { From e4c660fb66984dc4504e236faeea75e866c40d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:57:12 +0200 Subject: [PATCH 02/13] Enable commentary --- modules/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index 019757f..ba70e59 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -37,8 +37,7 @@ plugins = { nvim-autopairs.enable = true; # brackets, html, ... - # does not work - #commentary.enable = true; + commentary.enable = true; bufferline.enable = true; lastplace.enable = true; gitsigns.enable = true; From 5c29a4413b0fde7ebcf201b55337a0e6880687d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:57:22 +0200 Subject: [PATCH 03/13] lsp: enable gopls --- modules/lsp.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/lsp.nix b/modules/lsp.nix index fd6c2a9..cd72993 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -61,6 +61,12 @@ in ) ''; }; + gopls = { + enable = true; + settings.gopls = { + staticcheck = true; + }; + }; html.enable = true; java-language-server = { enable = true; From 3c277856aa21499863f8efee0fa6c7ba220614a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:57:39 +0200 Subject: [PATCH 04/13] nil-ls: activate auto archive, use nixpkgs-fmt --- modules/lsp.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/lsp.nix b/modules/lsp.nix index cd72993..aabdd30 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -77,7 +77,13 @@ in #ltex.enable = true; marksman.enable = true; #nixd.enable = true; - nil-ls.enable = true; + nil-ls = { + enable = true; + settings = { + formatting.command = [ "nixpkgs-fmt" ]; + nix.flake.autoArchive = true; + }; + }; rust-analyzer = { enable = true; installCargo = false; From f10e82f6f1324e90edef9609e62232b5ccee2861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:58:05 +0200 Subject: [PATCH 05/13] lsp: enable pylsp --- modules/lsp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lsp.nix b/modules/lsp.nix index aabdd30..c0e99ca 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -84,6 +84,7 @@ in nix.flake.autoArchive = true; }; }; + pylsp.enable = true; rust-analyzer = { enable = true; installCargo = false; From 12caca8edf73457f13c3e99a97816e29061ea15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:59:01 +0200 Subject: [PATCH 06/13] yamlls: don't format 80s line length --- modules/lsp.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/lsp.nix b/modules/lsp.nix index c0e99ca..caaa332 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -96,7 +96,10 @@ in texlab.enable = true; tsserver.enable = true; typos-lsp.enable = true; - yamlls.enable = true; + yamlls = { + enable = true; + settings.yaml.format.printWidth = 180; + }; lemminx.enable = true; }; From 0a228fc8a3577f99075b84eb6a551c33f262e4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jul 2024 23:59:13 +0200 Subject: [PATCH 07/13] lsp: enable offline schemastore --- modules/lsp.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/lsp.nix b/modules/lsp.nix index caaa332..7715f0c 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -164,6 +164,12 @@ in }; }; }; + + schemastore = { + enable = true; + json.enable = true; + yaml.enable = true; + }; }; keymaps = [ { From ace577feac0320559464d4d0e2f6fe950a783711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:01:40 +0200 Subject: [PATCH 08/13] Sort things --- modules/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index ba70e59..7c9b642 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -33,23 +33,25 @@ vim-fetch # accept ./path/to/file:123 as line numbers ]; + colorschemes.kanagawa.enable = true; + editorconfig.enable = true; plugins = { - nvim-autopairs.enable = true; # brackets, html, ... - commentary.enable = true; bufferline.enable = true; - lastplace.enable = true; + commentary.enable = true; + crates-nvim.enable = true; gitsigns.enable = true; - nvim-colorizer.enable = true; indent-blankline.enable = true; + lastplace.enable = true; lualine = { enable = true; globalstatus = true; theme = "onedark"; }; + nvim-autopairs.enable = true; # brackets, html, ... + nvim-colorizer.enable = true; tmux-navigator.enable = true; - crates-nvim.enable = true; }; userCommands = { @@ -101,6 +103,4 @@ { mode = "v"; key = ""; action = ":m '<-2gv=gv"; } { mode = "n"; key = "gb"; action = ":Gitsign blame_line"; } ]; - - colorschemes.kanagawa.enable = true; } From a5a78d8166beb3159248af0ebcf1666979efb8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:02:37 +0200 Subject: [PATCH 09/13] Add vim-matchup --- modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default.nix b/modules/default.nix index 7c9b642..3dc6f76 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -52,6 +52,7 @@ nvim-autopairs.enable = true; # brackets, html, ... nvim-colorizer.enable = true; tmux-navigator.enable = true; + vim-matchup.enable = true; # extends % key with comments }; userCommands = { From 6ac2239592c8fd163ae83e0c280190406cb469a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:03:29 +0200 Subject: [PATCH 10/13] Add rainbow ()[]{} --- modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default.nix b/modules/default.nix index 3dc6f76..be37531 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -51,6 +51,7 @@ }; nvim-autopairs.enable = true; # brackets, html, ... nvim-colorizer.enable = true; + rainbow-delimiters.enable = true; tmux-navigator.enable = true; vim-matchup.enable = true; # extends % key with comments }; From afa2436a64a8222bd83f798df939f0b856b3aff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:42:20 +0200 Subject: [PATCH 11/13] treesitter: remove two biggest syntaxes --- modules/treesitter.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/treesitter.nix b/modules/treesitter.nix index 85653db..fd5a526 100644 --- a/modules/treesitter.nix +++ b/modules/treesitter.nix @@ -1,5 +1,12 @@ { - plugins.treesitter.enable = true; + plugins.treesitter = { + enable = true; + ignoreInstall = [ + # remove rather big grammars + "systemverilog" + "verilog" + ]; + }; # Enable automatically closing and renaming HTML tags plugins.ts-autotag.enable = true; From b1a2a23e45644a021af2879c47b4cdb16a6e143a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:42:36 +0200 Subject: [PATCH 12/13] Add context commentstring --- modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default.nix b/modules/default.nix index be37531..a423be7 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -53,6 +53,7 @@ nvim-colorizer.enable = true; rainbow-delimiters.enable = true; tmux-navigator.enable = true; + ts-context-commentstring.enable = true; # set comment string dynamically vim-matchup.enable = true; # extends % key with comments }; From e0dec85b40ddb61a2b67505ab017a525e769b327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2024 00:42:43 +0200 Subject: [PATCH 13/13] treesitter: use intend information --- modules/treesitter.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/treesitter.nix b/modules/treesitter.nix index fd5a526..0a596ed 100644 --- a/modules/treesitter.nix +++ b/modules/treesitter.nix @@ -6,6 +6,7 @@ "systemverilog" "verilog" ]; + indent = true; }; # Enable automatically closing and renaming HTML tags