diff --git a/modules/terminal-life/nvim/neovim-0.6.1.patch b/modules/terminal-life/nvim/neovim-0.6.1.patch deleted file mode 100644 index 4f34b297..00000000 --- a/modules/terminal-life/nvim/neovim-0.6.1.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix -index e46c82e..02102c4 100644 ---- a/modules/terminal-life/nvim/default.nix -+++ b/modules/terminal-life/nvim/default.nix -@@ -74,9 +74,7 @@ in - nodePackages.typescript-language-server - nodePackages.vim-language-server - nodePackages.vue-language-server -- nodePackages.vscode-css-languageserver-bin -- nodePackages.vscode-html-languageserver-bin -- nodePackages.vscode-json-languageserver-bin -+ nodePackages.vscode-langservers-extracted - nodePackages.yaml-language-server - python39Packages.python-lsp-server - python3Full -@@ -131,6 +129,7 @@ in - vim-go - vim-javascript - vim-json -+ SchemaStore-nvim - vim-markdown - vim-nix - vim-ruby -diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim -index 1d5bf4d..83e5d8c 100644 ---- a/modules/terminal-life/nvim/lsp.vim -+++ b/modules/terminal-life/nvim/lsp.vim -@@ -40,10 +40,10 @@ lua <rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) -- buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) -- buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) -- buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) -- buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) -+ buf_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', opts) -+ buf_set_keymap('n', 'g[', 'lua vim.diagnostic.goto_prev()', opts) -+ buf_set_keymap('n', 'g]', 'lua vim.diagnostic.goto_next()', opts) -+ buf_set_keymap('n', 'q', 'lua vim.diagnostic.setloclist()', opts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) - - end -@@ -51,6 +51,8 @@ lua < g[ PrevDiagnosticCycle