This commit is contained in:
Henrik Bakken
2021-05-14 01:55:58 +02:00
parent 21bdfa68a4
commit 2298c42650
3 changed files with 43 additions and 34 deletions
+14 -14
View File
@@ -41,9 +41,9 @@ exec_always --no-startup-id fix_xcursor
# HB STARTUP ADDITIONS # HB STARTUP ADDITIONS
exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys 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 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 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 # div bindings
bindsym $mod+Shift+q kill 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+F9 exec --no-startup-id picom -b
bindsym $mod+Shift+F9 exec --no-startup-id pkill picom 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+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+F12 --release exec "xrandr --output DP-0 --mode 5120x1440 --primary"
bindsym $mod+Shift+F12 --release exec "xrandr --output DP-4 --mode 2560x1440 --primary" bindsym $mod+Shift+F12 --release exec "xrandr --output DP-0 --mode 2560x1440 --primary"
bindsym $mod+0 mode "$mode_system" bindsym $mod+0 mode "$mode_system"
bindsym $mod+z mode "resize" bindsym $mod+z mode "resize"
@@ -121,15 +121,15 @@ set $ws8 "8"
set $ws9 "9" set $ws9 "9"
# switch to workspace # switch to workspace
workspace $ws1 output DP-4 workspace $ws1 output DP-0
workspace $ws2 output DP-4 workspace $ws2 output DP-0
workspace $ws3 output DP-4 workspace $ws3 output DP-0
workspace $ws4 output DP-4 workspace $ws4 output DP-0
workspace $ws5 output DP-4 workspace $ws5 output DP-0
workspace $ws6 output DP-4 workspace $ws6 output DP-0
workspace $ws7 output DP-4 workspace $ws7 output DP-0
workspace $ws8 output DP-4 workspace $ws8 output DP-0
workspace $ws9 output DP-4 workspace $ws9 output DP-0
# switch to workspace # switch to workspace
bindsym $mod+1 workspace $ws1 bindsym $mod+1 workspace $ws1
@@ -228,7 +228,7 @@ bar {
status_command i3status status_command i3status
position bottom position bottom
tray_output DP-4 tray_output DP-0
bindsym button4 nop bindsym button4 nop
bindsym button5 nop bindsym button5 nop
strip_workspace_numbers yes strip_workspace_numbers yes
+10 -16
View File
@@ -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", "signature.target": "echo",
"suggest.autoTrigger": "always", "suggest.autoTrigger": "always",
"python.analysis.diagnosticMode": "workspace",
"python.formatting.provider": "black",
"python.linting.enabled": true, "python.linting.enabled": true,
"python.linting.flake8Enabled": true, "python.linting.flake8Enabled": true,
"python.linting.mypyEnabled": false, "python.linting.mypyEnabled": true,
"python.linting.pylintEnabled": false, "python.linting.pylintEnabled": false,
"python.analysis.useLibraryCodeForTypes": false, "python.analysis.useLibraryCodeForTypes": true,
"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,
"git.enableGutters": true, "git.enableGutters": true,
"yaml.format.enable": true, "yaml.format.enable": true,
"yaml.format.singleQuote": 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"
}
} }
+19 -4
View File
@@ -12,7 +12,6 @@ let g:coc_global_extensions=[
\ 'coc-pyright', \ 'coc-pyright',
\ 'coc-git', \ 'coc-git',
\ 'coc-tsserver', \ 'coc-tsserver',
\ 'coc-diagnostic',
\ 'coc-yaml', \ 'coc-yaml',
\ 'coc-explorer', \ '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 'haya14busa/vim-asterisk' " better asterisk motions
Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-unimpaired'
Plug 'tpope/vim-sensible' Plug 'tpope/vim-sensible'
Plug 'tpope/vim-eunuch'
Plug 'dkarter/bullets.vim' Plug 'dkarter/bullets.vim'
" python " python
Plug 'tmhedberg/SimpylFold' Plug 'tmhedberg/SimpylFold'
Plug 'Vimjas/vim-python-pep8-indent' Plug 'Vimjas/vim-python-pep8-indent'
Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
" syntax
Plug 'cespare/vim-toml'
" tmux " tmux
Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim
" aesthetics " 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#show_buffers=1
let g:airline#extensions#tabline#switch_buffers_and_tabs=0 let g:airline#extensions#tabline#switch_buffers_and_tabs=0
let g:airline#extensions#tabline#formatter = 'unique_tail_improved' let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
let g:airline#extensions#tabline#buffer_idx_mode = 1
nmap <leader>1 <Plug>AirlineSelectTab1
nmap <leader>2 <Plug>AirlineSelectTab2
nmap <leader>3 <Plug>AirlineSelectTab3
nmap <leader>4 <Plug>AirlineSelectTab4
nmap <leader>5 <Plug>AirlineSelectTab5
nmap <leader>6 <Plug>AirlineSelectTab6
nmap <leader>7 <Plug>AirlineSelectTab7
nmap <leader>8 <Plug>AirlineSelectTab8
nmap <leader>9 <Plug>AirlineSelectTab9
nmap <leader>0 <Plug>AirlineSelectTab0
nmap <leader>- <Plug>AirlineSelectPrevTab
nmap <leader>+ <Plug>AirlineSelectNextTab
" temporary files and undo " temporary files and undo
set directory=/tmp//,. 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 set undoreload=5000 " Maximum number lines to save for undo on a buffer reload
" line width ruler " line width ruler
set colorcolumn=80 set colorcolumn=88
highlight ColorColumn ctermbg=0 guibg='#3a3a3a' highlight ColorColumn ctermbg=0 guibg='#3a3a3a'
" search " search
@@ -238,8 +253,8 @@ vnoremap > >gv
vnoremap < <gv vnoremap < <gv
noremap - _ noremap - _
" move between errors " move between errors
nmap <M-n> <Plug>(coc-diagnostic-prev-error) nmap <M-n> <Plug>(coc-diagnostic-prev)
nmap <M-m> <Plug>(coc-diagnostic-next-error) nmap <M-m> <Plug>(coc-diagnostic-next)
" GoTo code navigation " GoTo code navigation
nmap <M-,> <Plug>(coc-git-prevchunk) nmap <M-,> <Plug>(coc-git-prevchunk)
nmap <M-.> <Plug>(coc-git-nextchunk) nmap <M-.> <Plug>(coc-git-nextchunk)