From 402b5c70e7e12852a99c919f77fb508c3b7d1118 Mon Sep 17 00:00:00 2001 From: Svenum Date: Thu, 24 Oct 2024 09:09:51 +0200 Subject: [PATCH] reenable coc --- modules/nixos/tools/nvim/default.nix | 20 +++----- modules/nixos/tools/nvim/init.vim | 75 ++++++++++------------------ 2 files changed, 33 insertions(+), 62 deletions(-) diff --git a/modules/nixos/tools/nvim/default.nix b/modules/nixos/tools/nvim/default.nix index ca72edd..9abac81 100644 --- a/modules/nixos/tools/nvim/default.nix +++ b/modules/nixos/tools/nvim/default.nix @@ -27,17 +27,13 @@ in # Plugins vim-plug # CoC - #coc-sh coc-git coc-css coc-yaml - #coc-nvim coc-json coc-html coc-tslint - #coc-eslint coc-docker coc-tabnine - #coc-tsserver coc-prettier coc-highlight - #coc-markdownlint coc-spell-checker - #coc-vimlsp coc-vimtex coc-lua coc-clangd - #coc-emmet - # Mason - mason-nvim - mason-tool-installer-nvim - mason-lspconfig-nvim + coc-sh coc-git coc-css coc-yaml + coc-nvim coc-json coc-html coc-tslint + coc-eslint coc-docker coc-tabnine + coc-tsserver coc-prettier coc-highlight + coc-markdownlint coc-spell-checker + coc-vimlsp coc-vimtex coc-lua coc-clangd + coc-emmet nvim-lspconfig clangd_extensions-nvim vim-nix @@ -52,7 +48,7 @@ in # Theme catppuccin-nvim # Terminal - #tmux-nvim + tmux-nvim vim-tmux-navigator # Git vim-gitgutter diff --git a/modules/nixos/tools/nvim/init.vim b/modules/nixos/tools/nvim/init.vim index 00a38f9..e8f4fc1 100644 --- a/modules/nixos/tools/nvim/init.vim +++ b/modules/nixos/tools/nvim/init.vim @@ -51,9 +51,31 @@ nnoremap :NvimTreeToggle " tmux-nvim " """""""""""""""""""""""""""""" " Plugin Config -" lua << EOF -" require("tmux").setup() -" EOF + lua << EOF + require("tmux").setup{ +{ + copy_sync = { + enable = true, + ignore_buffers = { empty = false }, + redirect_to_clipboard = true, + register_offset = 0, + sync_clipboard = true, + sync_registers = true, + sync_registers_keymap_put = true, + sync_registers_keymap_reg = true, + sync_deletes = true, + sync_unnamed = true, + }, + navigation = { + enable_default_keybindings = false, + persist_zoom = false, + }, + resize = { + enable_default_keybindings = false, + } + + } + EOF """""""""""""""""""""""""""""" " airline " @@ -70,53 +92,6 @@ set laststatus=2 """""""""""""""""""""""""""""" let g:rainbow_active=1 - -"""""""""""""""""""""""""""""" -" mason " -"""""""""""""""""""""""""""""" -lua << EOF - require("mason").setup() - require("mason-lspconfig").setup() - require('mason-tool-installer').setup { - ensure_installed = { - 'lua-language-server', - 'vim-language-server', - 'stylua', - 'shellcheck', - 'editorconfig-checker', - 'json-to-struct', - 'luacheck', - 'misspell', - 'staticcheck', - 'nil_ls', - 'dokcerls', - 'cssls', - 'clangd', - 'html', - 'jinja_lsp', - 'ltex', - 'eslint', - 'yamlls', - 'ansiblels', - 'bashls', - }, - auto_update = true, - - run_on_start = true, - - start_delay = 3000, - - debounce_hours = 5, - - integrations = { - ['mason-lspconfig'] = true, - ['mason-null-ls'] = true, - ['mason-nvim-dap'] = true, - }, - - } -EOF - """""""""""""""""""""""""""""" " coc " """"""""""""""""""""""""""""""