Merge branch 'master' of sleepmap.de:dave/dotfiles

* 'master' of sleepmap.de:dave/dotfiles:
  .config/nvchecker/nvchecker.ini: Switching to gitlab upstream for qastools. Adding polyphone, libopenshot, libopenshot-audio, openshot, libquicktime, libconfig, vico, mephisto.lv2 and lv2lint.
  .config/systemd/user/jack@.service: Removing custom jack@ user service (it has been upstreamed and is available since jack2 1.9.13).
  .config/sway/config: Adding common (local) location for background image (which can be a symlink to another file).
  .config/sway/config: Setting default_border pixel 2, to not have headers. Reactivating keyboard shortcut for layout toggle split.
  .config/nvchecker/nvchecker.ini: Adding audiofile, redland, ladspa, ddrescue, raptor, rasqal, python-ipy, gandi.cli, flyspray and changing upstreams of a2jmidid, solfege and redkite.
  .zsh.after/functions.zsh: Adding .tar.lz and .lz to ex() and lstar() (respectively).
  .vim/addons.vim: Removing youcompleteme and adding coverage-highlight.
  .config/psd/psd.conf: Adding qutebrowser.

6 files changed, 92 insertions, 27 deletions

diff --git a/.config/nvchecker/nvchecker.ini b/.config/nvchecker/nvchecker.ini
index 5531d57..d0625b3 100644
--- a/.config/nvchecker/nvchecker.ini
+++ b/.config/nvchecker/nvchecker.ini
@@ -59,6 +59,34 @@ vcs = git://git.sleepmap.de/software/uenv.git
 use_max_tag = True
 
 # extra
+[audiofile]
+vcs = git://github.com/mpruett/audiofile
+use_max_tag = True
+
+[redland]
+vcs = git://github.com/dajobe/librdf
+use_max_tag = True
+ignored_tags = start
+
+[ladspa]
+url = https://www.ladspa.org/ladspa_sdk/download.html
+regex = ladspa_sdk_([\d.]+)\.tgz?
+
+[ddrescue]
+url = http://ftp.gnu.org/gnu/ddrescue/
+regex = ddrescue-([\d.]+)\.tar\.lz?
+
+[raptor]
+vcs = git://github.com/dajobe/raptor
+use_max_tag = True
+ignored_tags = start
+
+[rasqal]
+vcs = git://github.com/dajobe/rasqal
+use_max_tag = True
+ignored_tags = rasqal_1_0 rasqal_before_rm_lazy rasqal_last_known_good rasqal_license_lgpl_apache2 rasqal_license_lgpl_mpl
+
+
 [fluidsynth]
 vcs = git://github.com/fluidsynth/fluidsynth
 use_max_tag = True
@@ -90,7 +118,7 @@ use_max_tag = True
 
 # community
 [a2jmidid]
-vcs = git://repo.or.cz/a2jmidid.git
+vcs = git://github.com/linuxaudio/a2jmidid
 use_max_tag = True
 
 [aeolus]
@@ -753,7 +781,7 @@ regex = zita-jacktools-([\d.]+)\.tar\.bz2?
 pypi = zopfli
 
 [qastools]
-vcs = git://git.code.sf.net/p/qastools/git
+gitlab = sebholt/qastools
 use_max_tag = True
 
 [qjackctl]
@@ -887,8 +915,8 @@ vcs = git://github.com/pwr/solaar
 use_max_tag = True
 
 [solfege]
-url = https://ftp.gnu.org/gnu/solfege
-regex = solfege-([\d.]+)\.tar\.xz?
+vcs = git://git.savannah.gnu.org/solfege.git
+use_max_tag = True
 
 [sonic-pi]
 vcs = git://github.com/samaaron/sonic-pi
@@ -1184,10 +1212,9 @@ use_max_tag = True
 pypi = FoxDot
 
 [redkite]
-vcs = git://github.com/quamplex/redkite
+gitlab = geontime/redkite
 use_max_tag = True
 
-
 [python-tzlocal]
 pypi = tzlocal
 
@@ -1226,3 +1253,50 @@ pypi = smmap2
 
 [python-utils]
 pypi = python-utils
+
+[python-ipy]
+pypi = IPy
+
+[gandi.cli]
+pypi = gandi.cli
+
+[flyspray]
+vcs = git://github.com/flyspray/flyspray
+use_max_tag = True
+
+[polyphone]
+vcs = git://github.com/davy7125/polyphone
+use_max_tag = True
+
+[libopenshot]
+vcs = git://github.com/openshot/libopenshot
+use_max_tag = True
+
+[libopenshot-audio]
+vcs = git://github.com/openshot/libopenshot-audio
+use_max_tag = True
+
+[openshot]
+vcs = git://github.com/openshot/openshot-qt
+use_max_tag = True
+
+[libquicktime]
+url = https://sourceforge.net/projects/libquicktime/files/libquicktime/
+use_max_tag = True
+regex= libquicktime/([\d.]+)/
+
+[libconfig]
+github = hyperrealm/libconfig
+use_max_tag = True
+
+[vico]
+url = https://laborejo.org/downloads
+regex = vico-([\d.]+)\.tar\.gz?
+
+[mephisto.lv2]
+url = https://git.open-music-kontrollers.ch/lv2/mephisto.lv2
+regex = mephisto.lv2-([\d.]+)\.tar\.xz?
+
+[lv2lint]
+url = https://git.open-music-kontrollers.ch/lv2/lv2lint
+regex = lv2lint-([\d.]+)\.tar\.xz?
diff --git a/.config/psd/psd.conf b/.config/psd/psd.conf
index a6f82de..76f8dae 100644
--- a/.config/psd/psd.conf
+++ b/.config/psd/psd.conf
@@ -47,7 +47,7 @@
 #  vivaldi
 #  vivaldi-snapshot
 #
-BROWSERS="firefox chromium"
+BROWSERS="firefox chromium qutebrowser"
 
 # Uncomment and set to "no" to completely disable the crash recovery feature.
 #
diff --git a/.config/sway/config b/.config/sway/config
index a8f6128..315c020 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -26,10 +26,12 @@ set $lock swaylock -f -c 000000
 set $brightness_up backlight -i "5"
 set $brightness_down backlight -i "-5"
 
+default_border pixel 2
+
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+output * bg ~/.config/sway/background.png fill
 #
 # Example configuration:
 #
@@ -157,7 +159,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
     # Switch the current container between different layout styles
     bindsym $mod+s layout stacking
     bindsym $mod+w layout tabbed
-#    bindsym $mod+e layout toggle split
+    bindsym $mod+e layout toggle split
     bindsym $mod+space layout toggle all
 
     # Make the current focus fullscreen
diff --git a/.config/systemd/user/jack@.service b/.config/systemd/user/jack@.service
deleted file mode 100644
index 6e70cc7..0000000
--- a/.config/systemd/user/jack@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=JACK server using %i.conf profile
-Documentation=man:jackd(1)
-After=sound.target local-fs.target
-
-[Service]
-EnvironmentFile=-/etc/jack/%i.conf
-EnvironmentFile=-%h/.config/jack/%i.conf
-ExecStart=/usr/bin/jackd $JACK_OPTIONS -d $DRIVER -d $DEVICE $DRIVER_SETTINGS
-LimitRTPRIO=95
-LimitRTTIME=infinity
-LimitMEMLOCK=infinity
-# Caution: use on memory-limited devices only
-# OOMScoreAdjust=-1000
-
-[Install]
-WantedBy=default.target
diff --git a/.vim/addons.vim b/.vim/addons.vim
index a7550e4..e01daaf 100644
--- a/.vim/addons.vim
+++ b/.vim/addons.vim
@@ -10,6 +10,7 @@ VAMActivate iptables
 VAMActivate github:pangloss/vim-javascript
 VAMActivate github:itspriddle/vim-jquery
 VAMActivate github:scrooloose/syntastic.git
+VAMActivate github:mgedmin/coverage-highlight.vim
 VAMActivate github:honza/vim-snippets
 VAMActivate github:garbas/vim-snipmate
 VAMActivate github:gerw/vim-latex-suite
@@ -54,5 +55,4 @@ VAMActivate github:tpope/vim-surround.git
 VAMActivate github:tpope/vim-unimpaired
 VAMActivate github:goldfeld/ctrlr.vim
 VAMActivate github:jamessan/vim-gnupg
-VAMActivate github:Valloric/YouCompleteMe.git
 VAMActivate github:godlygeek/tabular
diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh
index 16dc6de..3778133 100644
--- a/.zsh.after/functions.zsh
+++ b/.zsh.after/functions.zsh
@@ -134,6 +134,9 @@ ex() {
       *.tar.gz)
         tar xvzf $1
         ;;
+      *.tar.lz)
+        tar xvzf $1
+        ;;
       *.bz2)
         bunzip2 $1
         ;;
@@ -209,6 +212,9 @@ lstar() {
       *.gz)
         tar -tvf "$1" --force-local
         ;;
+      *.lz)
+        tar -tvf "$1" --force-local
+        ;;
       *.rar)
         unrar lb "$1"
         ;;