add typescript settings

awesome/autorun.sh

@@ -11,4 +11,5 @@ 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 compton
+#run /usr/bin/compton --backend glx --paint-on-overlay --vsync opengl-mswc --glx-no-stencil --glx-swap-method 2 --unredir-if-possible --glx-use-gpushader4

init.vim

@@ -31,14 +31,17 @@ 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 'honza/vim-snippets' " Collection of Snippets, used by coc-snippet
-Plug 'ludovicchabant/vim-gutentags', { 'for': ['js', 'vue', 'php'] } " Keep tags in sync
+Plug 'ludovicchabant/vim-gutentags', { 'for': ['js', 'vue', 'php', 'python'] } " Keep tags in sync
 Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
 Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings
+Plug 'msvechla/coc-jira-complete', { 'do': 'yarn install --frozen-lockfile' , 'for': 'gitcommit' }
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}  " We recommend updating the parsers on update
 
 " {{{ 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-vetur', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'neoclide/coc-css', { 'do': 'yarn install --frozen-lockfile' }
@@ -60,6 +63,7 @@ Plug 'gregsexton/MatchTag', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " ma
 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'] }
 "}}}
 
 " JavaScript{{{
@@ -103,6 +107,7 @@ 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' }
+Plug 'anntzer/vim-cython', { 'for': ['python']} 
 "}}}
 
 " All of your Plugins must be added before the following line
@@ -168,8 +173,10 @@ set foldmethod=marker"      " folds are marked with {{{}}}
 " Uncomment the following to have Vim jump to the last position when
 " reopening a file
 if has("autocmd")
-    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-                \| exe "normal! g'\"" | endif
+    if expand('%:t') != 'COMMIT_EDITMSG'
+        au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+                    \| exe "normal! g'\"" | endif
+    endif
 endif
 
 " Setting for correct mips syntax highlighting
@@ -180,6 +187,9 @@ let g:tex_flavor = "latex"
 
 " use python 3 when in doubt
 set pyxversion=3
+
+" Disable ALEs LSP, as we're using coc
+let g:ale_disable_lsp = 1
 " }}}
 
 " MAPPINGS{{{
@@ -211,12 +221,11 @@ nmap <leader>an :ALENext<cr>
 
 nnoremap <leader>tn :tabnew<cr>
 
-nnoremap <F3> :Gstatus<cr>
-nnoremap <F4> :Gpush<cr>
+nnoremap <F3> :Git<cr>
+nnoremap <F4> :Git push<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"
 
@@ -400,4 +409,16 @@ endif
 let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets'
 "}}}
 
+" Treesitter {{{
+lua <<EOF
+require'nvim-treesitter.configs'.setup {
+  ensure_installed = {"typescript", "javascript", "python", "json", "yaml"}, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
+  highlight = {
+    enable = true,              -- false will disable the whole extension
+    disable = {},  -- list of language that will be disabled
+  },
+}
+EOF
+" }}}
+
 "}}}

tmux/clementine.sh

@@ -1,5 +1,10 @@
+#!/usr/bin/env zsh
+set -eu
 if hash clementine 2>/dev/null && pgrep clementine > /dev/null; then
     ARTIST=$(qdbus org.mpris.MediaPlayer2.clementine /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player Metadata | grep 'xesam:artist: '  | cut -c15-)
     TITLE=$(qdbus org.mpris.MediaPlayer2.clementine /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player Metadata | grep 'xesam:title: '  | cut -c14-)
-    echo "$ARTIST - $TITLE"
+    COMBINED="$ARTIST - $TITLE"
+    echo ${COMBINED:0:40}
+    return 0
 fi
+return 1

tmux/strawberry.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+set -eu
+if hash strawberry 2>/dev/null && pgrep strawberry > /dev/null; then
+    ARTIST=$(qdbus org.mpris.MediaPlayer2.strawberry /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player Metadata | grep 'xesam:artist: '  | cut -c15-)
+    TITLE=$(qdbus org.mpris.MediaPlayer2.strawberry /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player Metadata | grep 'xesam:title: '  | cut -c14-)
+    COMBINED="$ARTIST - $TITLE"
+    echo ${COMBINED:0:40}
+fi

tmux/theme.sh

@@ -48,7 +48,7 @@ set-window-option -g clock-mode-colour $tm_color_active
 #tm_tunes="#[fg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/tunes.scpt)"
 #tm_battery="#(~/.dotfiles/bin/battery_indicator.sh)"
 #tm_banshee="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/banshee.sh)"
-tm_clementine="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/clementine.sh)"
+tm_clementine="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/strawberry.sh)"
 tm_battery="#[fg=$tm_color_inactive]#(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}')"
 
 tm_date="#[fg=$tm_color_inactive] %R %d %b"

tmux/tmux.conf.symlink

@@ -40,7 +40,7 @@ bind = select-layout tiled
 
 set-option -g set-titles on
 set-option -g set-titles-string "#T - #W"
- set-window-option -g automatic-rename on
+set-window-option -g automatic-rename on
 
 ######################
 #### Key Bindings ####

vim/ftplugin/javascript.vim

@@ -1,11 +1,15 @@
 " use prettier in ALE
 let b:ale_fixers = {}
 let b:ale_fixers['javascript'] = ['prettier']
+let b:ale_fixers['typescript'] = ['prettier']
 let b:ale_javascript_prettier_options = '--no-semi --single-quote'
+let b:ale_typescript_prettier_options = '--no-semi --single-quote'
 let b:ale_fixers['vue'] = ['prettier']
 let b:ale_vue_prettier_options = '--no-semi --single-quote'
 let b:ale_fix_on_save = 1
 let b:ale_javascript_prettier_use_local_config = 1
+let b:ale_typescript_prettier_use_local_config = 1
+let b:ale_linters=['']
 
 "autocmd bufwritepost *.js silent !standard --fix %
 setlocal wildignore+=node_modules
@@ -15,3 +19,4 @@ setlocal shiftwidth=2
 
 " Create jsdoc with ,h
 nnoremap <leader>h :JsDoc<CR> 
+nnoremap <F8> Biawait <ESC>A

vim/ftplugin/php.vim

@@ -1,10 +1,9 @@
-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'],
+  \'blade': ['prettier'],
 \}
 let g:ale_fix_on_save=1
 

vim/ftplugin/python.vim

@@ -9,6 +9,7 @@ endif
 let g:ale_fixers['python'] = ['black']
 let g:ale_fix_on_save = 1
 let g:pymode_run_bind = '<F5>'
+let g:pydocstring_formatter = 'google'
 
 " Make a f-string from normal string
 nmap <F8> F"if<ESC>A

vim/ftplugin/tex.vim

@@ -26,6 +26,7 @@ setlocal spell spelllang=de
 
 " Mappings
 nmap <localleader>d :VimtexDocPackage<cr> " Open Package Doc
+nnoremap <F5> :make fast<CR>
 
 " Abbreviations {{{
 iab DEU Deutschland
@@ -37,4 +38,5 @@ iab OSA Off-Shore-Anlage
 iab oSA On-Shore-Anlage
 iab zb zum Beispiel
 iab bspw beispielsweise
+iab gls \gls
 "}}}

vim/ftplugin/typescript.vim

@@ -0,0 +1 @@
+javascript.vim

zsh/aliases.zsh

@@ -40,9 +40,9 @@ if  hash exa 2&>/dev/null ; then
 fi
 #}}}
 
-alias dcu='sudo docker-compose up'
-alias dcs='sudo docker-compose start'
-alias dce='sudo docker-compose stop'
+alias dcu='docker-compose up'
+alias dcs='docker-compose start'
+alias dce='docker-compose stop'
 
 alias rs='rsync -aAxv --progress '
 alias gcc='gcc -Wall -Wextra '