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

* 'master' of sleepmap.de:dave/dotfiles: (21 commits)
  .config/nvchecker/nvchecker.ini: Adding python-{mailmanclient,pytest-vcr,pytest-services,django-mailman3,django-allauth,django-gravatar,openid}, mailman3-hyperkitty and postorius.
  .config/packages/community.txt: Adding mailman3-hyperkitty, postorius, python-{django-allauth,django-gravatar,django-mailman3,mailmanclient,openid,pytest-services,pytest-vcr}.
  .config/nvchecker/nvchecker.ini: Adding faac, libsndfile, mailman3, python-diff-cover, python-inflect, python-jinja_pluralize, python-flufl.testing, python-pymysql, python-importlib_resources. Renaming python-flufl.lock to python-flufl-lock (svn2git otherwise chokes on it).
  .config/packages/community.txt: Adding mailman3, python-diff-cover, python-flufl-lock, python-flufl.testing, pyhton-importlib_resources, python-inflect, python-jinja_pluralize, python-nose2, python-pymysql.
  .config/packages/extra.txt: Adding faac and libsndfile.
  .config/nvchecker/nvchecker.ini: Adding python-{aiosmtpd,orjson,atpublic,pendulum,mujson,falcon,pytzdata,pprofile,vmprof,flufl.{bounce,i18n,lock},lazr.{config,delegates},authheaders,publicsuffix}.
  .config/packages/community.txt: Adding python-{aiosmtpd,orjson,atpublic,pendulum,mujson,falcon,pytzdata,pprofile,vmprof,flufl.{bounce,i18n,lock},lazr.{config,delegates},authheaders,publicsuffix}.
  .config/nvchecker/nvchecker.ini: Fixing upstream checks for mda.lv2, pound and linux-rt. Removing upstream check for raul. Adding surge, xmonk.lv2, python-icalendar, libiio, gtkiostream (disabled), element, midimsg-lv2, ruby-test_declarative, ruby-json, ruby-tzinfo, ruby-zeitwerk, ruby-activesupport, ruby-i18n, iempluginsuite and juce.
  .config/packages/extra.txt: Adding portsmf.
  .config/packages/community.txt: Adding element, gtkiostream, iempluginsuite, juce, libiio, midimsg-lv2, python-icalendar, ruby-activesupport, ruby-i18n, ruby-json, ruby-test_declarative, ruby-tzinfo, ruby-zeitwerk, surge, xmonk.lv2. Removing raul.
  .config/packages/extra.txt: Adding faad2.
  .config/packages/community.txt: Adding adljack, bsequencer, bshapr, canto-curses, canto-daemon, jack-stdio, jack_delay, jackmeter, jackminimix, jackmix, ninjas2 and xwax.
  ~/.config/nvchecker/nvchecker.ini: Adding faad, jack_delay, jackmix, jack-stdio, jackminimix, bsequencer, bshapr, jackmeter, xwax, canto-daemon, canto-curses, ninjas2 and updating upstream of adlplug to use github.
  .config/packages/aur.txt: Removing python-osc.
  .config/packages/community.txt: Adding deteriorate-lv2, hostapd, libconfig, libopenshot, libopenshot-audio, libquicktime, lv2lint, mephisto.lv2, openshot, python-osc, python-sphinx-argparse and vico.
  .config/packages/aur.txt: Adding kernelshark and trace-cmd.
  .config/packages/extra.txt: Adding licenses, zita-{alsa-pcmi,resampler}.
  .config/nvchecker/nvchecker.ini: Adding kernelshark, trace-cmd, python-sphinx-argparse and deteriorate-lv2.
  .vimrc: Removing vim addon manager stuff. It's easier to install it via packages or vim's build in plugin support.
  .config/nvchecker/nvchecker.ini: Switching to gitlab upstream for qastools. Adding polyphone, libopenshot, libopenshot-audio, openshot, libquicktime, libconfig, vico, mephisto.lv2 and lv2lint.
  ...

6 files changed, 359 insertions, 51 deletions

diff --git a/.config/nvchecker/nvchecker.ini b/.config/nvchecker/nvchecker.ini
index 004e7e5..b433509 100644
--- a/.config/nvchecker/nvchecker.ini
+++ b/.config/nvchecker/nvchecker.ini
@@ -72,6 +72,10 @@ ignored_tags = start
 url = https://www.ladspa.org/ladspa_sdk/download.html
 regex = ladspa_sdk_([\d.]+)\.tgz?
 
+[libsndfile]
+url = http://www.mega-nerd.com/libsndfile/
+regex = libsndfile-([\d.]+)\.tar\.gz?
+
 [ddrescue]
 url = http://ftp.gnu.org/gnu/ddrescue/
 regex = ddrescue-([\d.]+)\.tar\.lz?
@@ -86,10 +90,10 @@ 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
+ignored_tags = v2.1.0.rc1
 
 [irqbalance]
 vcs = git://github.com/irqbalance/irqbalance
@@ -116,6 +120,14 @@ regex= portmidi/([\d.]+)/
 vcs = git://github.com/scons/scons
 use_max_tag = True
 
+[faac]
+github = knik0/faac
+use_max_tag = True
+
+[faad2]
+github = knik0/faad2
+use_max_tag = True
+
 # community
 [a2jmidid]
 vcs = git://github.com/linuxaudio/a2jmidid
@@ -517,8 +529,8 @@ url = https://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html
 regex = MCP-plugins-([\d.]+)\.tar\.bz2?
 
 [mda.lv2]
-url = https://git.drobilla.net/cgit.cgi/mda.lv2.git
-regex = mda.lv2-([\d.]+)\.tar\.gz?
+url = https://download.drobilla.net/
+regex = mda-lv2-([\d.]+)\.tar\.bz2?
 
 [meterbridge]
 url = http://plugin.org.uk/meterbridge
@@ -633,7 +645,7 @@ use_max_tag = True
 ignored_tags = push
 
 [pound]
-url = http://www.apsis.ch/pound
+url = https://www.apsis.ch/pound.html
 regex = Pound-([\d.]+).tgz?
 
 [pvoc]
@@ -781,7 +793,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]
@@ -831,10 +843,6 @@ use_max_tag = True
 [radicale]
 pypi = radicale
 
-[raul]
-url = https://download.drobilla.net/
-regex = raul-([\d.]+)\.tar\.bz2?
-
 [realtime-privileges]
 url = https://git.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/realtime-privileges
 regex = pkgver\=([\d]+)?
@@ -1124,7 +1132,7 @@ vcs = git://github.com/nextcloud/news
 use_max_tag = True
 
 [linux-rt]
-url = https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/5.2/
+url = https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/5.4/
 regex = patch-([\d.]+-rt[\d]+)\.patch\.xz?
 
 [linux-rt-lts]
@@ -1189,7 +1197,7 @@ vcs = git://github.com/sjaehn/bslizr
 use_max_tag = True
 
 [adlplug]
-vcs = git://github.com/jpcima/adlplug
+github = jpcima/adlplug
 use_max_tag = True
 
 [freeverb3]
@@ -1263,3 +1271,261 @@ 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?
+
+[kernelshark]
+url = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
+regex = kernelshark-v([\d.]+)\.tar\.gz?
+
+[trace-cmd]
+url = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
+regex = trace-cmd-v([\d.]+)\.tar\.gz?
+
+[python-sphinx-argparse]
+pypi = sphinx-argparse
+
+[deteriorate-lv2]
+github = blablack/deteriorate-lv2
+use_max_tag = True
+
+[jack_delay]
+url = https://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html
+regex = jack_delay-([\d.]+)\.tar\.bz2?
+
+[jackmix]
+github = kampfschlaefer/jackmix
+use_max_tag = True
+
+[jack-stdio]
+github = x42/jack-stdio
+use_max_tag = True
+
+[jackminimix]
+github = njh/jackminimix
+use_max_tag = True
+
+[bsequencer]
+github = sjaehn/bsequencer
+use_max_tag = True
+
+[bshapr]
+github = sjaehn/bshapr
+use_max_tag = True
+
+[jackmeter]
+github = njh/jackmeter
+use_max_tag = True
+
+[adljack]
+github = jpcima/adljack
+use_max_tag = True
+
+[xwax]
+url = https://xwax.org/releases
+regex = xwax-([\d.]+)\.tar\.gz?
+
+[canto-daemon]
+pypi = Canto
+
+[canto-curses]
+pypi = Canto-curses
+
+[ninjas2]
+github = rghvdberg/ninjas2
+use_max_tag = True
+
+[surge]
+github = surge-synthesizer/surge
+use_max_tag = True
+ignored_tags = release-moved v1.6.0b1 v1.6.0b2 v1.6.0b3
+
+[xmonk.lv2]
+github = brummer10/xmonk.lv2
+use_max_tag = True
+
+[python-icalendar]
+pypi = icalendar
+
+[libiio]
+github = analogdevicesinc/libiio
+use_max_tag = True
+
+# TODO: check manually, as upstream hasn't tagged on github yet
+# [gtkiostream]
+# github = flatmax/gtkiostream
+# use_max_tag = True
+
+[element]
+github = kushview/element
+use_max_tag = True
+
+[midimsg-lv2]
+github = blablack/midimsg-lv2
+use_max_tag = True
+
+[ruby-test_declarative]
+github = svenfuchs/test_declarative
+use_max_tag = True
+
+[ruby-json]
+github = flori/json
+use_max_tag = True
+
+[ruby-tzinfo]
+github = tzinfo/tzinfo
+use_max_tag = True
+
+[ruby-zeitwerk]
+github = fxn/zeitwerk
+use_max_tag = True
+
+[ruby-activesupport]
+github = rails/rails
+use_max_tag = True
+
+[ruby-i18n]
+github = ruby-i18n/i18n
+use_max_tag = True
+
+[iempluginsuite]
+url = https://git.iem.at/audioplugins/IEMPluginSuite/-/tags/
+regex = .*/tags/v([\d.]+)?
+
+[juce]
+github = weareroli/juce
+use_max_tag = True
+
+[python-aiosmtpd]
+pypi = aiosmtpd
+
+
+[python-atpublic]
+pypi = atpublic
+
+[python-falcon]
+pypi = falcon
+
+[python-mujson]
+pypi = mujson
+
+[python-orjson]
+pypi = orjson
+
+[python-pendulum]
+pypi = pendulum
+
+[python-pytzdata]
+pypi = pytzdata
+
+[python-pprofile]
+pypi = pprofile
+
+[python-vmprof]
+pypi = vmprof
+
+[python-flufl.bounce]
+pypi = flufl.bounce
+
+[python-flufl.i18n]
+pypi = flufl.i18n
+
+[python-flufl-lock]
+pypi = flufl.lock
+
+[python-lazr.config]
+pypi = lazr.config
+
+[python-lazr.delegates]
+pypi = lazr.delegates
+
+[python-authheaders]
+pypi = authheaders
+
+[python-publicsuffix]
+pypi = publicsuffix
+
+[mailman3]
+gitlab = mailman/mailman
+use_max_tag = True
+
+[python-diff-cover]
+pypi = diff_cover
+
+[python-inflect]
+pypi = inflect
+
+[python-jinja_pluralize]
+pypi = jinja2_pluralize
+
+[python-flufl.testing]
+pypi = flufl.testing
+
+[python-pymysql]
+pypi = pymysql
+
+[python-importlib_resources]
+pypi = importlib_resources
+
+[python-mailmanclient]
+pypi = mailmanclient
+
+[python-pytest-vcr]
+pypi = pytest-vcr
+
+[python-pytest-services]
+pypi = pytest-services
+
+[python-django-mailman3]
+pypi = django-mailman3
+
+[python-django-allauth]
+pypi = django-allauth
+
+[python-openid]
+pypi = python3-openid
+
+[python-django-gravatar]
+pypi = django-gravatar2
+
+[mailman3-hyperkitty]
+pypi = mailman-hyperkitty
+
+[postorius]
+pypi = postorius
+
diff --git a/.config/packages/aur.txt b/.config/packages/aur.txt
index 686d982..02b2852 100644
--- a/.config/packages/aur.txt
+++ b/.config/packages/aur.txt
@@ -8,6 +8,7 @@ iannix
 jack2-git
 jackcpp-git
 jfrog-cli-go
+kernelshark
 khard-git
 libffado-svn
 liblo-git
@@ -22,13 +23,13 @@ pd-git
 prosody-mod-admin-message-hg
 prosody-mod-admin-web-hg
 python-nose2
-python-osc
 realtime-suggestions
 roundcube-rcmcarddav
 rts-git
 ssr-git
 ssr-osc-git
 supercollider-git
+trace-cmd
 ttf-cmu-typewriter
 uenv
 uenv-git
diff --git a/.config/packages/community.txt b/.config/packages/community.txt
index c95d302..6904bbe 100644
--- a/.config/packages/community.txt
+++ b/.config/packages/community.txt
@@ -1,4 +1,5 @@
 a2jmidid
+adljack
 adlplug
 aeolus
 aj-snapshot
@@ -19,11 +20,15 @@ avldrums.lv2
 beatslash-lv2
 blop
 blop.lv2
+bsequencer
+bshapr
 bslizr
 cacti
 cadence
 cage
 calf
+canto-curses
+canto-daemon
 capnproto
 caps
 carla
@@ -33,6 +38,7 @@ cmt
 csound
 csoundqt
 dbus-c++
+deteriorate-lv2
 dgedit
 din
 dnscrypt-proxy
@@ -44,6 +50,7 @@ drumstick
 dssi
 ebumeter
 ecasound
+element
 eq10q
 eteroj.lv2
 fabla
@@ -69,6 +76,7 @@ gigedit
 gmsynth.lv2
 gpa
 grub-customizer
+gtkiostream
 guitarix2
 gxplugins.lv2
 harvid
@@ -76,25 +84,35 @@ haskell-hosc
 haskell-microspec
 helm
 hexter
+hostapd
 hydrogen
+iempluginsuite
 infamousplugins
 jaaa
+jack-stdio
 jack2
 jack_capture
+jack_delay
+jackmeter
+jackminimix
+jackmix
 jacktrip
 jalv
 japa
 jconvolver
 jnoisemeter
 jsampler
+juce
 khal
 khard
 lib32-fluidsynth
 lib32-jack
 lib32-jack2
+libconfig
 libffado
 libfishsound
 libgig
+libiio
 libircclient
 liblo
 liblrdf
@@ -102,6 +120,9 @@ liblscp
 libltc
 libmusicxml
 liboggz
+libopenshot
+libopenshot-audio
+libquicktime
 librepcb
 libsmf
 lilv
@@ -112,12 +133,17 @@ lsp-plugins
 luppp
 lv2
 lv2file
+lv2lint
 lvtk
+mailman3
+mailman3-hyperkitty
 marsyas
 mcp-plugins
 mda.lv2
+mephisto.lv2
 meterbridge
 midi_matrix.lv2
+midimsg-lv2
 minitube
 mixxx
 moony.lv2
@@ -128,6 +154,7 @@ nextcloud-app-news
 nextcloud-app-spreed
 nfoview
 nikola
+ninjas2
 njconnect
 noise-repellent
 nomacs
@@ -135,6 +162,7 @@ non-daw
 non-sequencer
 ntk
 octofile
+openshot
 osc2midi
 osmid
 padthv1
@@ -150,53 +178,88 @@ php-redis
 plowshare
 polyphone
 postfixadmin
+postorius
 pound
 pvoc
 pyenv
+python-aiosmtpd
 python-atomicwrites
+python-atpublic
+python-authheaders
 python-click-log
 python-click-repl
 python-click-threading
+python-diff-cover
+python-django-allauth
+python-django-gravatar
+python-django-mailman3
 python-doit
 python-etesync
 python-ethtool
+python-falcon
 python-fastnumbers
+python-flufl-lock
+python-flufl.bounce
+python-flufl.i18n
+python-flufl.lock
+python-flufl.testing
 python-furl
 python-gitdb
 python-gitpython
 python-gnupg
 python-husl
+python-icalendar
 python-imdbpy
+python-importlib_resources
 python-inet_diag
+python-inflect
 python-ipy
 python-iwlib
 python-jack-client
+python-jinja_pluralize
 python-kaptan
 python-langdetect
+python-lazr.config
+python-lazr.delegates
 python-libtmux
 python-linux-procfs
 python-ly
+python-mailmanclient
 python-micawber
+python-mujson
 python-natsort
 python-nose-progressive
+python-nose2
+python-openid
 python-orderedmultidict
+python-orjson
+python-osc
+python-pendulum
 python-phpserialize
 python-piexif
 python-pilkit
+python-pprofile
 python-progressbar
+python-publicsuffix
 python-pyalsa
 python-pyliblo
 python-pymediainfo
+python-pymysql
 python-pyrss2gen
 python-pytest-rerunfailures
+python-pytest-services
 python-pytest-subtesthack
+python-pytest-vcr
+python-pytzdata
 python-schedutils
 python-smmap
+python-sphinx-argparse
 python-sphinxcontrib-newsfeed
 python-tabulate
 python-toml
 python-tzlocal
 python-utils
+python-vmprof
 python-vobject
 python-wsgi-intercept
 python-xvfbwrapper
@@ -218,7 +281,6 @@ qtractor
 quodlibet
 qxgedit
 radicale
-raul
 realtime-privileges
 redkite
 rev-plugins
@@ -229,7 +291,13 @@ rtirq
 rtmidi
 rtosc
 rubberband
+ruby-activesupport
+ruby-i18n
+ruby-json
 ruby-rugged
+ruby-test_declarative
+ruby-tzinfo
+ruby-zeitwerk
 samplv1
 sc3-plugins
 schedtool
@@ -255,6 +323,7 @@ stk
 subdownloader
 suil
 supercollider
+surge
 sweep
 swh-plugins
 synthv1
@@ -270,6 +339,7 @@ vamp-aubio-plugins
 vamp-plugin-sdk
 vco-plugins
 vdirsyncer
+vico
 vim-csound
 vm.lv2
 vmpk
@@ -280,6 +350,8 @@ wolf-shaper
 wolf-spectrum
 x42-plugins
 xjadeo
+xmonk.lv2
+xwax
 yoshimi
 zam-plugins
 zita-ajbridge
diff --git a/.config/packages/extra.txt b/.config/packages/extra.txt
index 16a415e..ba8a16a 100644
--- a/.config/packages/extra.txt
+++ b/.config/packages/extra.txt
@@ -2,16 +2,23 @@ apparmor
 audiofile
 brltty
 ddrescue
+faac
+faad2
 fluidsynth
 irqbalance
 jack
 ladspa
 libgit2
 libgit2-glib
+libsndfile
+licenses
 numactl
 portaudio
 portmidi
+portsmf
 raptor
 rasqal
 redland
 scons
+zita-alsa-pcmi
+zita-resampler
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/.vimrc b/.vimrc
index 8b20fbc..9326670 100644
--- a/.vimrc
+++ b/.vimrc
@@ -100,28 +100,7 @@ set scrolloff=8         "Start scrolling when we're 8 lines away from margins
 set sidescrolloff=15
 set sidescroll=1
 
-" ================ Vim-Addon-Manager ========================
-
-fun! SetupVAM()
-  let c = get(g:, 'vim_addon_manager', {})
-  let g:vim_addon_manager = c
-  let c.plugin_root_dir = expand('$HOME', 1) . '/.vim/vim-addons'
-  " most used options you may want to use:
-  " let c.log_to_buf = 1
-  " let c.auto_install = 0
-  let &rtp.=(empty(&rtp)?'':',').c.plugin_root_dir.'/vim-addon-manager'
-  if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload')
-    execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager '
-        \       shellescape(c.plugin_root_dir.'/vim-addon-manager', 1)
-  endif
-
-  " This provides the VAMActivate command, you could be passing plugin names, too
-  call vam#ActivateAddons([], {})
-endfun
-call SetupVAM()
-
 " ================ Addons and their settings ========================
-so ~/.vim/addons.vim " addons
 so ~/.vim/addons-settings.vim " addon settings
 so ~/.vim/custom-settings.vim " custom settings
 so ~/.vim/custom-functions.vim " custom functions