diff --git a/init.vim b/init.vim index b2b4fb9..32ae9d1 100644 --- a/init.vim +++ b/init.vim @@ -22,21 +22,22 @@ Plug 'easymotion/vim-easymotion' " better motion with leader Plug 'bling/vim-airline' " statusline Plug 'w0rp/ale' " asynchronous linting engine Plug 'godlygeek/tabular' " Align text on symbols -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " fuzzy file finder -Plug 'junegunn/fzf.vim' " vim integration for fzf +"Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " fuzzy file finder +"Plug 'junegunn/fzf.vim' " vim integration for fzf Plug 'airblade/vim-gitgutter' " git status in gutter column Plug 'lambdalisue/suda.vim' " As w!! did not work anymore in nvim -Plug 'https://github.com/alok/notational-fzf-vim' " note taking -Plug 'prettier/vim-prettier', { 'do': 'npm install' } " prettier integration +"Plug 'https://github.com/alok/notational-fzf-vim' " note taking +"Plug 'prettier/vim-prettier', { 'do': 'npm install' } " prettier integration Plug 'honza/vim-snippets' " Collection of Snippets, used by coc-snippet "Plug 'ludovicchabant/vim-gutentags', { 'for': ['js', 'vue', 'php', 'python'] } " Keep tags in sync -Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings +"Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " We recommend updating the parsers on update Plug 'nvim-treesitter/nvim-treesitter-textobjects' Plug 'kyazdani42/nvim-web-devicons' " Icons... Plug 'mfussenegger/nvim-dap', { 'for': ['typescript', 'javascript', 'python', 'rust'] } Plug 'lbrayner/vim-rzip' " recursive zip support, needed for yarn pnp -Plug 'kkoomen/vim-doge', { 'do': { -> doge#install() } } +"Plug 'kkoomen/vim-doge', { 'do': { -> doge#install() } } +Plug 'danymat/neogen' Plug 'taybart/b64.nvim' " en/decode base64 strings " telescope. Needed for octo.nvim, might replace fzf @@ -44,45 +45,49 @@ Plug 'nvim-lua/popup.nvim' Plug 'nvim-lua/plenary.nvim' Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'make' } " improve sort performance +Plug 'nvim-telescope/telescope-live-grep-args.nvim' Plug 'pwntester/octo.nvim' Plug 'github/copilot.vim' +Plug 'f-person/git-blame.nvim' + " {{{ CocPlugins -Plug 'neoclide/coc-json', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-snippets', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-tsserver', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-eslint', { 'do': 'yarn install --frozen-lockfile' } -Plug 'fannheyward/coc-rust-analyzer', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-css', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-vimtex', { 'do': 'yarn install --frozen-lockfile' } -Plug 'fannheyward/coc-texlab', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-html', { 'do': 'yarn install --frozen-lockfile' } -Plug 'neoclide/coc-yaml', { 'do': 'yarn install --frozen-lockfile' } -"Plug 'neoclide/coc-python', { 'do': 'yarn install --frozen-lockfile' } -Plug 'fannheyward/coc-sql', { 'do': 'yarn install --frozen-lockfile' } -Plug 'fannheyward/coc-markdownlint', { 'do': 'yarn install --frozen-lockfile' } -Plug 'fannheyward/coc-pyright', { 'for': 'python', 'do': 'yarn install --frozen-lockfile' } -Plug 'josa42/coc-sh', { 'do': 'yarn install --frozen-lockfile' } +Plug 'neoclide/coc-json', { 'do': 'yarn install' } +Plug 'neoclide/coc-snippets', { 'do': 'yarn install' } +Plug 'neoclide/coc-tsserver', { 'do': 'yarn install' } +Plug 'neoclide/coc-eslint', { 'do': 'yarn install' } +Plug 'fannheyward/coc-rust-analyzer', { 'do': 'yarn install' } +Plug 'neoclide/coc-css', { 'do': 'yarn install' } +"Plug 'neoclide/coc-vimtex', { 'do': 'yarn install' } +"Plug 'fannheyward/coc-texlab', { 'do': 'yarn install' } +Plug 'neoclide/coc-html', { 'do': 'yarn install' } +Plug 'neoclide/coc-yaml', { 'do': 'yarn install' } +"Plug 'neoclide/coc-python', { 'do': 'yarn install' } +Plug 'fannheyward/coc-sql', { 'do': 'yarn install' } +Plug 'fannheyward/coc-markdownlint', { 'do': 'yarn install' } +Plug 'fannheyward/coc-pyright', { 'for': 'python', 'do': 'yarn install' } +Plug 'josa42/coc-sh', { 'do': 'yarn install' } +"Plug 'prisma/vim-prisma' " }}} " html / templates{{{ -Plug 'mattn/emmet-vim', { 'for': ['jinja.html', 'html', 'php', 'gohtmltmpl', 'vue', 'markdown'] } " emmet support for vim - easily create markdup wth CSS-like syntax -Plug 'gregsexton/MatchTag', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " match tags in html, similar to paren support -Plug 'othree/html5.vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " html5 support -Plug 'lumiliet/vim-twig', { 'for': ['html'] } " twig syntax support -Plug 'Glench/Vim-Jinja2-Syntax', { 'for': ['html'] } -Plug 'jvanja/vim-bootstrap4-snippets', { 'for': ['html', 'blade'] } +Plug 'mattn/emmet-vim', { 'for': ['jinja.html', 'html', 'php', 'gohtmltmpl', 'vue', 'markdown', 'typescriptreact'] } " emmet support for vim - easily create markdup wth CSS-like syntax +Plug 'gregsexton/MatchTag', { 'for': ['html', 'php', 'gohtmltmpl', 'vue', 'typescriptreact'] } " match tags in html, similar to paren support +Plug 'othree/html5.vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue', 'typescriptreact'] } " html5 support +"Plug 'lumiliet/vim-twig', { 'for': ['html'] } " twig syntax support +"Plug 'Glench/Vim-Jinja2-Syntax', { 'for': ['html'] } +"Plug 'jvanja/vim-bootstrap4-snippets', { 'for': ['html', 'blade'] } "}}} " JavaScript{{{ Plug 'gavocanov/vim-js-indent', { 'for': [ 'javascript' ]} " JavaScript indent support -Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integration +"Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integration Plug 'kevinoid/vim-jsonc' "}}} " LaTeX{{{ -Plug 'lervag/vimtex', { 'for': 'tex' } +"Plug 'lervag/vimtex', { 'for': 'tex' } "}}} " Markdown{{{ @@ -100,17 +105,17 @@ Plug 'cespare/vim-toml', { 'for': 'toml' } "}}} " C/C++{{{ -Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' } -let g:clang_library_path='/usr/lib/llvm-6.0/lib/libclang-6.0.so.1' -Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] } -Plug 'vim-scripts/DoxygenToolkit.vim', { 'for' : ['c', 'cpp'] } +"Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' } +"let g:clang_library_path='/usr/lib/llvm-6.0/lib/libclang-6.0.so.1' +"Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] } +"Plug 'vim-scripts/DoxygenToolkit.vim', { 'for' : ['c', 'cpp'] } "}}} " PHP{{{ -Plug 'captbaritone/better-indent-support-for-php-with-html', { 'for': 'php' } -Plug 'lumiliet/vim-twig', { 'for': [ 'php', 'html' ] } " Twig templates -Plug 'Rican7/php-doc-modded', { 'for': 'php' } " Automatic phpdoc comments -Plug 'jwalton512/vim-blade', { 'for': 'php' } +"Plug 'captbaritone/better-indent-support-for-php-with-html', { 'for': 'php' } +"Plug 'lumiliet/vim-twig', { 'for': [ 'php', 'html' ] } " Twig templates +"Plug 'Rican7/php-doc-modded', { 'for': 'php' } " Automatic phpdoc comments +"Plug 'jwalton512/vim-blade', { 'for': 'php' } "}}} " {{{ Python @@ -322,6 +327,8 @@ if exists('g:started_by_firenvim') else let g:airline_powerline_fonts = 1 end +let g:airline#extensions#tabline#formatter = 'unique_tail_improved' +let g:airline#extensions#branch#displayed_head_limit = 10 " notational notes let g:nv_search_paths = ['~/notes'] @@ -360,8 +367,10 @@ autocmd FileType c,cpp,objc vnoremap f :ClangFormat "}}} " Prettier -let g:prettier#config#tab_width = 4 -let g:prettier#exec_cmd_async = 1 +"let g:prettier#config#tab_width = 4 +"let g:prettier#exec_cmd_async = 1 +"let g:prettier#autoformat = 1 +"let g:prettier#autoformat_require_pragma = 0 " Completion {{{ @@ -499,6 +508,14 @@ imap (coc-snippets-expand-jump) let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets' "}}} +lua <fg", ":lua require('telescope').extensions.live_grep_args.live_grep_args()") EOF "}}} @@ -539,6 +560,9 @@ let g:doge_javascript_settings = { let g:doge_doc_standard_python = 'google' let g:doge_mapping_comment_jump_forward = '' +" neogen settings +lua require('neogenconfig') + " Copilot settings " accept on enter, if no suggestion is selected fallback to default imap