From babb0aadf02a124e71378e9ef4c9c92fe2ce4eca Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 19 Oct 2022 06:31:39 +0000 Subject: [PATCH] cleanup --- vim/.vim/lua/plugins.lua | 6 ++++ vim/.vim/plugged/lsp_lines.nvim | 1 + vim/.vim/plugged/mkdir.nvim | 1 + vim/.vim/plugged/nvim-lightbulb | 1 + vim/.vim/prefs/cmp.vim | 6 ---- vim/.vim/prefs/plugins.vim | 63 +++++---------------------------- vim/.vimrc | 1 - 7 files changed, 17 insertions(+), 62 deletions(-) create mode 160000 vim/.vim/plugged/lsp_lines.nvim create mode 160000 vim/.vim/plugged/mkdir.nvim create mode 160000 vim/.vim/plugged/nvim-lightbulb delete mode 100644 vim/.vim/prefs/cmp.vim diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index c9be8de..072d372 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -16,3 +16,9 @@ require("catppuccin-config") require("symbols-outline-config") require "fidget".setup{} + +-- redundant w/ lsp_lines +vim.diagnostic.config({ + virtual_text = false, +}) +require("lsp_lines").setup() diff --git a/vim/.vim/plugged/lsp_lines.nvim b/vim/.vim/plugged/lsp_lines.nvim new file mode 160000 index 0000000..3b57922 --- /dev/null +++ b/vim/.vim/plugged/lsp_lines.nvim @@ -0,0 +1 @@ +Subproject commit 3b57922d2d79762e6baedaf9d66d8ba71f822816 diff --git a/vim/.vim/plugged/mkdir.nvim b/vim/.vim/plugged/mkdir.nvim new file mode 160000 index 0000000..c55d1de --- /dev/null +++ b/vim/.vim/plugged/mkdir.nvim @@ -0,0 +1 @@ +Subproject commit c55d1dee4f099528a1853b28bb28caa802eba217 diff --git a/vim/.vim/plugged/nvim-lightbulb b/vim/.vim/plugged/nvim-lightbulb new file mode 160000 index 0000000..56b9ce3 --- /dev/null +++ b/vim/.vim/plugged/nvim-lightbulb @@ -0,0 +1 @@ +Subproject commit 56b9ce31ec9d09d560fe8787c0920f76bc208297 diff --git a/vim/.vim/prefs/cmp.vim b/vim/.vim/prefs/cmp.vim deleted file mode 100644 index 928bab8..0000000 --- a/vim/.vim/prefs/cmp.vim +++ /dev/null @@ -1,6 +0,0 @@ -lua << EOF - require 'lspconfig' - require("lsp") - require("diagnostics") - require("telescope") -EOF diff --git a/vim/.vim/prefs/plugins.vim b/vim/.vim/prefs/plugins.vim index 66df261..a60b683 100644 --- a/vim/.vim/prefs/plugins.vim +++ b/vim/.vim/prefs/plugins.vim @@ -18,55 +18,43 @@ Plug 'simrat39/symbols-outline.nvim' " required only for diagnostics Plug 'folke/trouble.nvim' +" Nvim +Plug 'kosayoda/nvim-lightbulb' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +Plug 'jghauser/mkdir.nvim' +Plug 'ErichDonGubler/lsp_lines.nvim' Plug 'nvim-lua/plenary.nvim' " lua helpers Plug 'nvim-telescope/telescope.nvim' " actual plugin Plug 'sso://user/vintharas/telescope-codesearch.nvim' +Plug 'nvim-lualine/lualine.nvim' +Plug 'rcarriga/nvim-notify' " UI EXTENSIONS Plug 'ntpeters/vim-better-whitespace' "auto-set tab/space size Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' -Plug 'nvim-lualine/lualine.nvim' -Plug 'rcarriga/nvim-notify' -" Plug 'vim-airline/vim-airline' " ... -" Plug 'vim-airline/vim-airline-themes' + Plug 'nathanaelkane/vim-indent-guides' -Plug 'Konfekt/vim-scratchpad' -Plug 'guns/xterm-color-table.vim' Plug 'mbbill/undotree' Plug 'tversteeg/registers.nvim', { 'branch': 'main' } -" Plug 'ryanoasis/vim-devicons' " INTEGRATION Plug 'AndrewRadev/linediff.vim' Plug 'tpope/vim-fugitive' " git -Plug 'junegunn/gv.vim' " git commit browser Plug 'tpope/vim-git' Plug 'airblade/vim-gitgutter' " live git diff gutter Plug 'tmux-plugins/vim-tmux' " tmux Plug 'preservim/vimux' Plug 'christoomey/vim-tmux-navigator' " tmux -Plug 'ferrine/md-img-paste.vim' " copy-paste images to markdown -Plug 'junegunn/vim-easy-align' " markdown table aligns Plug 'skywind3000/asyncrun.vim' -Plug 'dhruvasagar/vim-table-mode' " git readme tables -Plug 'NLKNguyen/cloudformation-syntax.vim' -Plug 'stephpy/vim-yaml' -Plug 'towolf/vim-helm' -Plug 'tell-k/vim-autoflake' " remove unused python imports -Plug 'embear/vim-uncrustify' -Plug 'sakhnik/nvim-gdb', { 'do': 'bash ./install.sh \| UpdateRemotePlugins' } -Plug 'kburdett/vim-nuuid' -Plug 'easymotion/vim-easymotion' +" Plug 'easymotion/vim-easymotion' " AUTO-COMPLETION Plug 'christoomey/vim-titlecase' Plug 'chiedo/vim-case-convert' " FILE INTERACTIONS -" Plug 'mileszs/ack.vim' " Ack bindings Plug 'jremmen/vim-ripgrep' Plug 'preservim/nerdtree' " File Tree @@ -77,27 +65,9 @@ Plug 'udalov/kotlin-vim' Plug 'hsanson/vim-android' Plug 'OmniSharp/omnisharp-vim' Plug 'whatyouhide/vim-tmux-syntax' -Plug 'chase/vim-ansible-yaml' -Plug 'justinmk/vim-syntax-extra' -Plug 'NLKNguyen/c-syntax.vim' -Plug 'octol/vim-cpp-enhanced-highlight' -Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } -Plug 'hexdigest/gounit-vim' -Plug 'pangloss/vim-javascript' -Plug 'mattn/emmet-vim' -Plug 'jparise/vim-graphql' -Plug 'StanAngeloff/php.vim' -Plug 'sealemar/vtl' -Plug 'wavded/vim-stylus' -Plug 'nikvdp/ejs-syntax' -Plug 'lepture/vim-velocity' au BufNewFile,BufRead *.vtl, set ft=velocity -" MARKUP/OBJECT NOTATION -Plug 'plasticboy/vim-markdown' -Plug 'elzr/vim-json' - " FUNCTIONALITY STUFF Plug 'tmux-plugins/vim-tmux-focus-events' set autoread @@ -108,28 +78,11 @@ Plug 'wesQ3/vim-windowswap' " FORMATTING Plug 'tpope/vim-surround' " easily surround with delimiters Plug 'scrooloose/nerdcommenter' " comment bindings -Plug 'junegunn/vim-easy-align' -Plug 'tommcdo/vim-exchange' " THEMES Plug 'catppuccin/nvim', { 'as': 'catppuccin' } -Plug 'altercation/vim-colors-solarized' -Plug 'vim-airline/vim-airline-themes' Plug 'jdkanani/vim-material-theme' -Plug 'sonph/onehalf', { 'rtp': 'vim' } -Plug 'gosukiwi/vim-atom-dark' -Plug 'jacoborus/tender.vim' Plug 'kristijanhusak/vim-hybrid-material' -Plug 'NLKNguyen/papercolor-theme' -Plug 'arcticicestudio/nord-vim' -Plug 'chase/focuspoint-vim' -Plug 'patstockwell/vim-monokai-tasty' " airline -Plug 'fxn/vim-monochrome' -Plug 'robertmeta/nofrils' -Plug 'kristiandupont/shades-of-teal' -Plug 'joshdick/onedark.vim' -Plug 'google/vim-colorscheme-primary' -Plug 'kyoz/purify', { 'rtp': 'vim' } Plug 'kyazdani42/nvim-web-devicons' " ONE LINERS ONLY diff --git a/vim/.vimrc b/vim/.vimrc index eaa1cc9..0b89410 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -104,7 +104,6 @@ call plug#end() " required lua require("plugins") if filereadable(expand("~/use_google")) - source ~/.vim/prefs/cmp.vim source ~/.vim/prefs/imp.vim source ~/.vim/prefs/google_comments.vim lua require("google_comments")