diff --git a/awesome/autorun.sh b/awesome/autorun.sh index 706b78e..803ca04 100755 --- a/awesome/autorun.sh +++ b/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 diff --git a/init.vim b/init.vim index f9adeee..af60425 100644 --- a/init.vim +++ b/init.vim @@ -107,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 diff --git a/tmux/clementine.sh b/tmux/clementine.sh index aedd58e..2d82ee0 100755 --- a/tmux/clementine.sh +++ b/tmux/clementine.sh @@ -5,4 +5,6 @@ if hash clementine 2>/dev/null && pgrep clementine > /dev/null; then TITLE=$(qdbus org.mpris.MediaPlayer2.clementine /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} + return 0 fi +return 1 diff --git a/tmux/strawberry.sh b/tmux/strawberry.sh new file mode 100755 index 0000000..cb73796 --- /dev/null +++ b/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 diff --git a/tmux/theme.sh b/tmux/theme.sh index 4c9a353..1441337 100644 --- a/tmux/theme.sh +++ b/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" diff --git a/vim/ftplugin/javascript.vim b/vim/ftplugin/javascript.vim index bfd58b9..a1160c0 100644 --- a/vim/ftplugin/javascript.vim +++ b/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 h :JsDoc +nnoremap Biawait A