Update vim config

awesome/autorun.sh

@@ -7,8 +7,8 @@ function run {
   fi
 }
 
+run keepass
 setxkbmap -option caps:swapescape -layout us -variant altgr-intl
 run pulseaudio --start
 run ~/.dotfiles/change-wallpaper.sh
 run /usr/bin/compton --backend glx --paint-on-overlay --vsync opengl-swc
-run keepass

awesome/rc.lua

@@ -523,6 +523,17 @@ awful.rules.rules = {
     -- Set Firefox to always map on the tag named "2" on screen 1.
     -- { rule = { class = "Firefox" },
     --   properties = { screen = 1, tag = "2" } },
+    {
+        rule = {
+            class = "jetbrains-studio",
+            name="^win[0-9]+$"
+        },
+        properties = {
+            placement = awful.placement.no_offscreen,
+            titlebars_enabled = false
+        }
+    },
+
 }
 -- }}}
 

init.vim

@@ -32,6 +32,8 @@ 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'] } " Keep tags in sync
+Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
+Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings
 
 " {{{ CocPlugins
 Plug 'neoclide/coc-json', { 'do': 'yarn install --frozen-lockfile' }
@@ -41,6 +43,7 @@ Plug 'fannheyward/coc-rust-analyzer', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'neoclide/coc-vetur', { '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' }
@@ -48,10 +51,11 @@ Plug 'marlonfan/coc-phpls', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'fannheyward/coc-sql', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'fannheyward/coc-markdownlint', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'josa42/coc-go', { 'do': 'yarn install --frozen-lockfile' }
+Plug 'fannheyward/coc-pyright', { 'for': 'python', 'do': 'yarn install --frozen-lockfile' }
 " }}}
 
 " html / templates{{{
-Plug 'mattn/emmet-vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue', 'markdown'] } " emmet support for vim - easily create markdup wth CSS-like syntax
+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
@@ -93,6 +97,12 @@ Plug 'vim-scripts/DoxygenToolkit.vim', { 'for' : ['c', 'cpp'] }
 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
+Plug 'jeetsukumaran/vim-pythonsense', { 'for': ['python'] } " text objects for python
+Plug 'heavenshell/vim-pydocstring', { 'for': ['python'], 'do': 'make install' }
 "}}}
 
 " All of your Plugins must be added before the following line
@@ -134,7 +144,7 @@ set expandtab
 
 " toggle invisible characters
 set list
-set listchars=tab:→\ ,eol:¬,trail:⋅,extends:❯,precedes:❮
+set listchars=tab:→\ ,trail:⋅,extends:❯,precedes:❮
 set showbreak=↪
 
 set ttyfast                 " faster redrawing
@@ -205,9 +215,16 @@ nnoremap <F4> :Gpush<cr>
 
 " P L U G I N S{{{
 
+let g:languagetool_server="/opt/LanguageTool/LanguageTool-5.0/languagetool-server.jar"
+let g:languagetool_jar="/opt/LanguageTool/LanguageTool-5.0/languagetool-commandline.jar"
+
 let NERDTreeShowHidden=1
 
-let g:airline_powerline_fonts = 1
+if exists('g:started_by_firenvim')
+    let g:airline_disable_statusline = 1
+else
+    let g:airline_powerline_fonts = 1
+end
 
 " notational notes
 let g:nv_search_paths = ['~/notes']
@@ -380,3 +397,5 @@ if has('conceal')
 endif
 let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets'
 "}}}
+
+"}}}

tmux/tmux.conf.symlink

@@ -1,10 +1,14 @@
 set -g default-command "zsh"
 set -g default-terminal "tmux-256color"
 set -g history-limit 20000
+set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
 
 # automatically renumber tmux windows
 set -g renumber-windows on
 
+# something for nvim
+set -g focus-events on
+
 # unbind default prefix and set it to Ctrl+a
 unbind C-b
 set -g prefix C-a

vim/ftplugin/mail.vim

@@ -1,2 +1,6 @@
+
+set spell
+set spelllang=de
+
 iab VG Viele Grüße
 iab MS Marcel Schneider

vim/ftplugin/php.vim

@@ -1,6 +1,12 @@
 let g:deoplete#ignore_sources = get(g:, 'deoplete#ignore_sources', {})
 let g:deoplete#ignore_sources.php = ['omni']
 let g:ale_php_phpstan_level = 'max'
+let g:ale_fixers={
+  \'javascript': ['prettier'],
+  \'json': ['prettier'],
+  \'php': ['prettier'],
+\}
+let g:ale_fix_on_save=1
 
 " {{{ phpactor
 " Include use statement

vim/ftplugin/python.vim

@@ -6,6 +6,11 @@ if getline(1) =~# '^#!.*python3\>'
     endif
 endif
 
-let g:ale_fixers['python'] = ['autopep8']
+let g:ale_fixers['python'] = ['black']
 let g:ale_fix_on_save = 1
 let g:pymode_run_bind = '<F5>'
+
+" Make a f-string from normal string
+nmap <F8> F"if<ESC>A
+" remap pydocstring
+nmap <silent> <leader><C-i> <Plug>(pydocstring)

vim/ftplugin/qf.vim

@@ -0,0 +1 @@
+setlocal nospell

vim/ftplugin/tex.vim

@@ -32,4 +32,8 @@ iab DEU Deutschland
 iab thg Treibhausgas
 iab emis Emission
 iab ewende Energiewende
+iab def Definition
+iab OSA Off-Shore-Anlage
+iab oSA On-Shore-Anlage
+iab zb zum Beispiel
 "}}}

zsh/aliases.zsh

@@ -25,8 +25,6 @@ alias down='http --download '
 
 alias p3='python3 '
 
-alias open='xdg-open '
-
 alias -g L='| less'
 alias -g G='| grep'
 
@@ -54,3 +52,5 @@ alias sys='sudo systemctl '
 alias jour='sudo journalctl '
 alias usys='systemctl --user '
 alias ujour='journalctl --user '
+
+alias killbg='kill ${${(v)jobstates##*:*:}%=*}'