From 45ed82a0581fab43d713482ab82974210e7b25bf Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Mon, 4 Jan 2021 09:32:00 +0100 Subject: [PATCH] Various changes --- kitty/kitty.conf | 18 ++++++++++++++++++ kitty/theme.conf | 21 +++++++++++++++++++++ nvim/README.md | 3 +++ nvim/coc-settings.json | 19 +++++++++++-------- nvim/conf.d/coc.vim | 10 ++++++++++ nvim/conf.d/pydocstring.vim | 1 + nvim/init.vim | 11 ++++++++++- 7 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 kitty/kitty.conf create mode 100644 kitty/theme.conf create mode 100644 nvim/conf.d/pydocstring.vim diff --git a/kitty/kitty.conf b/kitty/kitty.conf new file mode 100644 index 0000000..94d0742 --- /dev/null +++ b/kitty/kitty.conf @@ -0,0 +1,18 @@ +include ./theme.conf + +font_family Liberation Mono +bold_font auto +italic_font auto +bold_italic_font auto +font_size 14 + +cursor_shape beam +scrollback_lines 50000 + +map ctrl+shift+s paste_from_selection +map ctrl+shift+n paste_from_clipboard + +map ctrl+0 change_font_size all +2.0 +map ctrl+minus change_font_size all -2.0 + +update_check_interval 0 diff --git a/kitty/theme.conf b/kitty/theme.conf new file mode 100644 index 0000000..36e101b --- /dev/null +++ b/kitty/theme.conf @@ -0,0 +1,21 @@ +background #fdf6e3 +foreground #52676f +cursor #52676f +selection_background #e9e2cb +color0 #e4e4e4 +color8 #ffffd7 +color1 #d70000 +color9 #d75f00 +color2 #5f8700 +color10 #585858 +color3 #af8700 +color11 #626262 +color4 #0087ff +color12 #808080 +color5 #af005f +color13 #5f5faf +color6 #00afaf +color14 #8a8a8a +color7 #262626 +color15 #1c1c1c +selection_foreground #fcf4dc diff --git a/nvim/README.md b/nvim/README.md index 0e8a11f..3acd226 100644 --- a/nvim/README.md +++ b/nvim/README.md @@ -45,3 +45,6 @@ Useful Shortcuts * Misc * ,p: toggle paste-mode * ESC ESC: deselect search results, \*-highligh or similar + + +nvim -n -c "PlugUpgrade | PlugInstall | q | PlugUpdate | q | q" && nvim -n -c "CocInstall -sync coc-css coc-vetur coc-docker coc-eslint coc-git coc-gitignore coc-html coc-json coc-yaml coc-pairs coc-python coc-sh coc-tsserver coc-prettier coc-docker | CocUpdateSync | UpdateRemotePlugins | q" diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 1dff13f..7a8f257 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,10 +1,13 @@ { - "diagnostic.messageTarget": "echo", - "signature.target": "echo", - "suggest.maxCompleteItemCount": 20, - "coc.preferences.hoverTarget": "echo", - "python.jediEnabled": false, - "suggest.timeout": 15000, - "smartf.timeout": 2500, - "smartf.jumpOnTrigger": false + //"diagnostic.messageTarget": "echo", + //"signature.target": "echo", + //"suggest.maxCompleteItemCount": 20, + //"coc.preferences.hoverTarget": "echo", + //"python.jediEnabled": false, + //"python.analysis.memory.keepLibraryAst": true, + //"python.analysis.memory.keepLibraryLocalVariables": true, + "python.formatting.provider": "black", + //"coc.preferences.formatOnSaveFiletypes": ["python"], + "python.linting.pylintEnabled": true, + //"suggest.timeout": 15000 } diff --git a/nvim/conf.d/coc.vim b/nvim/conf.d/coc.vim index cf83a50..4537dc7 100644 --- a/nvim/conf.d/coc.vim +++ b/nvim/conf.d/coc.vim @@ -17,12 +17,22 @@ set shortmess+=c " always show signcolumns set signcolumn=yes +" python .env-contains-pythonpath support +autocmd FileType python let b:coc_root_patterns = ['.cocroot', '.git', '.env'] + " useful key shortcuts nmap rn (coc-rename) nmap td (coc-definition) nmap ty (coc-type-definition) nmap ti (coc-implementation) nmap tr (coc-references) +nmap te (coc-diagnostic-next-error) +nmap tn (coc-diagnostic-next) +xmap ,r (coc-format-selected) +nmap ,r (coc-format-selected) + +" Add `:Format` command to format current buffer. +command! -nargs=0 Format :call CocAction('format') nmap f (coc-smartf-forward) nmap F (coc-smartf-backward) diff --git a/nvim/conf.d/pydocstring.vim b/nvim/conf.d/pydocstring.vim new file mode 100644 index 0000000..46ea991 --- /dev/null +++ b/nvim/conf.d/pydocstring.vim @@ -0,0 +1 @@ +let g:pydocstring_formatter = 'google' diff --git a/nvim/init.vim b/nvim/init.vim index 8d7fa53..29555af 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -26,7 +26,7 @@ Plug 'jparise/vim-graphql' Plug 'posva/vim-vue' " Python formatter -Plug 'psf/black' +Plug 'psf/black', {'commit': 'ce14fa8b497bae2b50ec48b3bd7022573a59cdb1'} " tag finder Plug 'majutsushi/tagbar' @@ -34,6 +34,15 @@ Plug 'majutsushi/tagbar' " auto-matching for parentheses Plug 'Raimondi/delimitMate' +" process .editorconfig files +Plug 'editorconfig/editorconfig-vim' + +" jenkinsfile syntax +Plug 'martinda/Jenkinsfile-vim-syntax' + +" To autogenerate docstrings +Plug 'heavenshell/vim-pydocstring', { 'do': 'make install' } + call g:plug#end() for fpath in split(globpath('~/.config/nvim/conf.d', '*.vim'), '\n')