From 2298c4265097284ac349ab1d80e10be52bd6559e Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Fri, 14 May 2021 01:55:58 +0200 Subject: [PATCH] updates --- hjalmar-mothership/i3/config | 28 ++++++++++++++-------------- nvim/coc-settings.json | 26 ++++++++++---------------- nvim/init.vim | 23 +++++++++++++++++++---- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 83d4ceb..d3715dc 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -41,9 +41,9 @@ exec_always --no-startup-id fix_xcursor # HB STARTUP ADDITIONS exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys exec --no-startup-id redshift-gtk -l 59.91:10.75 -exec --no-startup-id dropbox start & +# exec --no-startup-id dropbox start & exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60 -exec --no-startup-id xrandr --output DP-4 --mode 5120x1440 --primary +exec --no-startup-id xrandr --output DP-0 --mode 5120x1440 --primary # div bindings bindsym $mod+Shift+q kill @@ -102,8 +102,8 @@ bindsym $mod+Shift+F6 exec i3-sensible-terminal -e 'ncspot' bindsym $mod+F9 exec --no-startup-id picom -b bindsym $mod+Shift+F9 exec --no-startup-id pkill picom bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'" -bindsym $mod+F12 --release exec "xrandr --output DP-4 --mode 5120x1440 --primary" -bindsym $mod+Shift+F12 --release exec "xrandr --output DP-4 --mode 2560x1440 --primary" +bindsym $mod+F12 --release exec "xrandr --output DP-0 --mode 5120x1440 --primary" +bindsym $mod+Shift+F12 --release exec "xrandr --output DP-0 --mode 2560x1440 --primary" bindsym $mod+0 mode "$mode_system" bindsym $mod+z mode "resize" @@ -121,15 +121,15 @@ set $ws8 "8" set $ws9 "9" # switch to workspace -workspace $ws1 output DP-4 -workspace $ws2 output DP-4 -workspace $ws3 output DP-4 -workspace $ws4 output DP-4 -workspace $ws5 output DP-4 -workspace $ws6 output DP-4 -workspace $ws7 output DP-4 -workspace $ws8 output DP-4 -workspace $ws9 output DP-4 +workspace $ws1 output DP-0 +workspace $ws2 output DP-0 +workspace $ws3 output DP-0 +workspace $ws4 output DP-0 +workspace $ws5 output DP-0 +workspace $ws6 output DP-0 +workspace $ws7 output DP-0 +workspace $ws8 output DP-0 +workspace $ws9 output DP-0 # switch to workspace bindsym $mod+1 workspace $ws1 @@ -228,7 +228,7 @@ bar { status_command i3status position bottom - tray_output DP-4 + tray_output DP-0 bindsym button4 nop bindsym button5 nop strip_workspace_numbers yes diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 4c33589..e618d00 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,25 +1,19 @@ { + "coc.prefereces.enableMessageDialog": true, + "coc.preferences.useQuickfixForLocations": true, + "coc.preferences.formatOnType": true, + "coc.preferences.formatOnSaveFiletypes": ["python", "markdown"], + "coc.preferences.formatOnTypeFiletypes": ["python", "markdown"], "signature.target": "echo", "suggest.autoTrigger": "always", + "python.analysis.diagnosticMode": "workspace", + "python.formatting.provider": "black", "python.linting.enabled": true, "python.linting.flake8Enabled": true, - "python.linting.mypyEnabled": false, + "python.linting.mypyEnabled": true, "python.linting.pylintEnabled": false, - "python.analysis.useLibraryCodeForTypes": false, - "python.linting.flake8Args": ["--ignore=E731,W503,E501"], - "python.linting.mypyArgs": ["--disallow-any-generics","--ignore-missing-imports","--follow-imports=normal","--show-column-numbers"], - "diagnostic.showUnused": false, + "python.analysis.useLibraryCodeForTypes": true, "git.enableGutters": true, "yaml.format.enable": true, - "yaml.format.singleQuote": true, - "diagnostic-languageserver.filetypes": { - "vim": "vint", - "email": "languagetool", - "markdown": [ "write-good", "markdownlint" ], - "sh": "shellcheck", - "php": ["phpstan", "psalm"] - }, - "diagnostic-languageserver.formatFiletypes": { - "sh": "shfmt" - } + "yaml.format.singleQuote": true } diff --git a/nvim/init.vim b/nvim/init.vim index fcc4e73..d5e4f64 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -12,7 +12,6 @@ let g:coc_global_extensions=[ \ 'coc-pyright', \ 'coc-git', \ 'coc-tsserver', - \ 'coc-diagnostic', \ 'coc-yaml', \ 'coc-explorer', \ ] @@ -39,11 +38,14 @@ Plug 'farmergreg/vim-lastplace' " When reopen a buffer, puts the cursor wh Plug 'haya14busa/vim-asterisk' " better asterisk motions Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-sensible' +Plug 'tpope/vim-eunuch' Plug 'dkarter/bullets.vim' " python Plug 'tmhedberg/SimpylFold' Plug 'Vimjas/vim-python-pep8-indent' Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} +" syntax +Plug 'cespare/vim-toml' " tmux Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim " aesthetics @@ -92,6 +94,19 @@ let g:airline#extensions#tabline#show_tabs=0 let g:airline#extensions#tabline#show_buffers=1 let g:airline#extensions#tabline#switch_buffers_and_tabs=0 let g:airline#extensions#tabline#formatter = 'unique_tail_improved' +let g:airline#extensions#tabline#buffer_idx_mode = 1 +nmap 1 AirlineSelectTab1 +nmap 2 AirlineSelectTab2 +nmap 3 AirlineSelectTab3 +nmap 4 AirlineSelectTab4 +nmap 5 AirlineSelectTab5 +nmap 6 AirlineSelectTab6 +nmap 7 AirlineSelectTab7 +nmap 8 AirlineSelectTab8 +nmap 9 AirlineSelectTab9 +nmap 0 AirlineSelectTab0 +nmap - AirlineSelectPrevTab +nmap + AirlineSelectNextTab " temporary files and undo set directory=/tmp//,. @@ -104,7 +119,7 @@ set undolevels=500 " Maximum number of changes that can be undone set undoreload=5000 " Maximum number lines to save for undo on a buffer reload " line width ruler -set colorcolumn=80 +set colorcolumn=88 highlight ColorColumn ctermbg=0 guibg='#3a3a3a' " search @@ -238,8 +253,8 @@ vnoremap > >gv vnoremap < (coc-diagnostic-prev-error) -nmap (coc-diagnostic-next-error) +nmap (coc-diagnostic-prev) +nmap (coc-diagnostic-next) " GoTo code navigation nmap (coc-git-prevchunk) nmap (coc-git-nextchunk)