diff options
| author | David Runge <david.runge@native-instruments.de> | 2018-11-24 14:19:45 +0100 |
|---|---|---|
| committer | David Runge <david.runge@native-instruments.de> | 2018-11-24 14:19:45 +0100 |
| commit | f4fec3ab8e56e82bf7904c3c19876e2f4e13667d (patch) | |
| tree | 23a4dd266333fc6cfeb5ee05c6000ced30724098 | |
| parent | 31895b1b525ab673becdb10c7a421f71510f6354 (diff) | |
| parent | de1f86528b58faa0844f24b9edb63e5837dd7444 (diff) | |
| download | dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.gz dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.bz2 dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.xz dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.zip | |
Merge branch 'master' of git.sleepmap.de:config/dotfiles
* 'master' of git.sleepmap.de:config/dotfiles: (36 commits)
.config/packages-community.txt: Adding pd-lua.
.config/systemd/user/mpd@.service: Adding local override for mpd@ user service. Raising LimitRTPrio to 75, as some threads in mpd apparently require it.
.config/jack/*: Changing all configurations for jack@ user service (as its layout has changed).
.gitignore: Removing ignore of .config/systemd (time to add some local overrides).
.config/packages-aur.txt: Removing ssr (now in [community]).
.config/systemd/user/jack@.service: Adding a local jack@ user service, so no package is required.
.config/packages-community.txt: Adding dragonfly-reverb, libmusicxml, ssr and wolf-shaper.
.ncmpcpp/config: Switching to local visualizer fifo. Using visualizer_type ellipse.
.zsh.after/aliases.zsh: Removing useless pacsearch overloading.
bin/setup_screens: Fixing and simplifying various things with the help of shellcheck. Using a separate get_display function to retrieve DISPLAY.
bin/xorg_autolock: Properly quoting variables. Abstracting lock_cmd.
bin/xorg_lock: Properly quote variables. Rename variables for better readibility.
.xprofile: Repaired with the help of shellcheck.
.config/packages-community.txt: Adding marsyas.
.config/packages-aur.txt: Removing gmsynth.lv2 (now in community). Adding librenms and patroneo-git.
.config/packages-community.txt: Adding ams-lv2, beatslash-lv2, gmsynth.lv2, lib32-fluidsynth, lsp-plugins, lvtk, stk and removing ssmtp.
bin/cs: Fixing script according to shellcheck.
.config/packages-community.txt: Adding nextcloud-app-spreed.
.vim/addons-settings.vim: Adding supercollider settings for split in tmux.
.config/linuxsampler.org/Qsampler.conf: Remove, because it makes no sense in repo.
...
48 files changed, 558 insertions, 412 deletions
diff --git a/.config/jack/fw-fireface800-44100 b/.config/jack/fw-fireface800-44100 index 4d28bed..e9b9887 100644 --- a/.config/jack/fw-fireface800-44100 +++ b/.config/jack/fw-fireface800-44100 @@ -1,13 +1,7 @@ -# Sample configuration file for a JACK systemd --user service, using a firewire device -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="firewire" -DEVICE="/dev/fw1" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 3 \ - -p 64\ - -r 44100" +DEVICE="guid:0x000a3500ada83262" +DRIVER_SETTINGS="-n 3 -p 64 -r 44100" diff --git a/.config/jack/fw-fireface800-48000 b/.config/jack/fw-fireface800-48000 index 9f2efa5..3de0b3e 100644 --- a/.config/jack/fw-fireface800-48000 +++ b/.config/jack/fw-fireface800-48000 @@ -1,13 +1,7 @@ -# Sample configuration file for a JACK systemd --user service, using a firewire device -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="firewire" -DEVICE="/dev/fw1" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 3 \ - -p 512\ - -r 48000" +DEVICE="guid:0x000a3500ada83262" +DRIVER_SETTINGS="-n 3 -p 64 -r 48000" diff --git a/.config/jack/internal-44100 b/.config/jack/internal-44100 index 6440aca..8b4cb57 100644 --- a/.config/jack/internal-44100 +++ b/.config/jack/internal-44100 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:PCH,0" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 256\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 512 -r 44100" diff --git a/.config/jack/internal-48000 b/.config/jack/internal-48000 index b210426..175e780 100644 --- a/.config/jack/internal-48000 +++ b/.config/jack/internal-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:PCH,0" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 256\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 512 -r 48000" diff --git a/.config/jack/rpi-internal-44100 b/.config/jack/rpi-internal-44100 index 8415d9c..ec1eafb 100644 --- a/.config/jack/rpi-internal-44100 +++ b/.config/jack/rpi-internal-44100 @@ -1,11 +1,7 @@ +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:ALSA" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 1024\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 512 -r 44100" diff --git a/.config/jack/rpi-internal-48000 b/.config/jack/rpi-internal-48000 index 47cfa15..f7000c9 100644 --- a/.config/jack/rpi-internal-48000 +++ b/.config/jack/rpi-internal-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:ALSA" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 2048\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 512 -r 48000" diff --git a/.config/jack/rpi-usb-44100 b/.config/jack/rpi-usb-44100 index 40cc305..0a5c66b 100644 --- a/.config/jack/rpi-usb-44100 +++ b/.config/jack/rpi-usb-44100 @@ -1,11 +1,7 @@ +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:Device" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 64\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 64 -r 44100" diff --git a/.config/jack/rpi-usb-48000 b/.config/jack/rpi-usb-48000 index a5c35b0..7ec28be 100644 --- a/.config/jack/rpi-usb-48000 +++ b/.config/jack/rpi-usb-48000 @@ -1,11 +1,7 @@ +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:Device" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 128 -r 48000" diff --git a/.config/jack/usb-babyface-44100 b/.config/jack/usb-babyface-44100 index 90bb056..493d912 100644 --- a/.config/jack/usb-babyface-44100 +++ b/.config/jack/usb-babyface-44100 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:Babyface2338447" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 128 -r 44100" diff --git a/.config/jack/usb-babyface-48000 b/.config/jack/usb-babyface-48000 index 2635762..fa770a8 100644 --- a/.config/jack/usb-babyface-48000 +++ b/.config/jack/usb-babyface-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:Babyface2338447" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 128 -r 48000" diff --git a/.config/jack/usb-fireface-ufx-ak-44100 b/.config/jack/usb-fireface-ufx-ak-44100 index bac22f8..e53a148 100644 --- a/.config/jack/usb-fireface-ufx-ak-44100 +++ b/.config/jack/usb-fireface-ufx-ak-44100 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:UFX23208936" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 64 \ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 64 -r 44100" diff --git a/.config/jack/usb-fireface-ufx-ak-48000 b/.config/jack/usb-fireface-ufx-ak-48000 index 5769970..3c3502b 100644 --- a/.config/jack/usb-fireface-ufx-ak-48000 +++ b/.config/jack/usb-fireface-ufx-ak-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:UFX23208936" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 128 -r 48000" diff --git a/.config/jack/usb-fireface-ufx-en324-44100 b/.config/jack/usb-fireface-ufx-en324-44100 index 6e4e3d6..3ce1369 100644 --- a/.config/jack/usb-fireface-ufx-en324-44100 +++ b/.config/jack/usb-fireface-ufx-en324-44100 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:UFX23643007" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 64 -r 44100" diff --git a/.config/jack/usb-fireface-ufx-en324-48000 b/.config/jack/usb-fireface-ufx-en324-48000 index 7ffbc81..82590eb 100644 --- a/.config/jack/usb-fireface-ufx-en324-48000 +++ b/.config/jack/usb-fireface-ufx-en324-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:UFX23643007" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 128 -r 48000" diff --git a/.config/jack/usb-scarlett-18i20-44100 b/.config/jack/usb-scarlett-18i20-44100 index ef2537c..75a7e0b 100644 --- a/.config/jack/usb-scarlett-18i20-44100 +++ b/.config/jack/usb-scarlett-18i20-44100 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:USB" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 128\ - -r 44100" +DRIVER_SETTINGS="-n 2 -p 128 -r 44100" diff --git a/.config/jack/usb-scarlett-18i20-48000 b/.config/jack/usb-scarlett-18i20-48000 index 17aad87..e510beb 100644 --- a/.config/jack/usb-scarlett-18i20-48000 +++ b/.config/jack/usb-scarlett-18i20-48000 @@ -1,12 +1,7 @@ -NAME="default" +# JACK setup (see man 1 jackd) +JACK_DEFAULT_SERVER="default" +# options (e.g. -m, -n, -p, -r, -P, -t, -C, -u, -v) +JACK_OPTIONS="-P80 -p 512" DRIVER="alsa" DEVICE="hw:USB" -NOMLOCK="" -REALTIME="-R" -PORTMAX=512 -UNLOCK="-u" -VERBOSE="-v" -DRIVER_SETTINGS="\ - -n 2 \ - -p 256\ - -r 48000" +DRIVER_SETTINGS="-n 2 -p 128 -r 48000" diff --git a/.config/khal/config b/.config/khal/config index 56a40aa..3e6026c 100644 --- a/.config/khal/config +++ b/.config/khal/config @@ -32,6 +32,10 @@ color = dark cyan path = ~/.calendars/work color = dark magenta +[[t4]] +path = ~/.calendars/bus_shared_by_t4 +color = dark cyan + [sqlite] path = ~/.config/khal/khal.db diff --git a/.config/linuxsampler.org/Qsampler.conf b/.config/linuxsampler.org/Qsampler.conf deleted file mode 100644 index bb420d0..0000000 --- a/.config/linuxsampler.org/Qsampler.conf +++ /dev/null @@ -1,63 +0,0 @@ -[Geometry] -qsamplerInstrumentListForm\x=1 -qsamplerInstrumentListForm\y=25 -qsamplerInstrumentListForm\width=720 -qsamplerInstrumentListForm\height=340 -qsamplerInstrumentListForm\visible=true -qsamplerDeviceForm\x=0 -qsamplerDeviceForm\y=0 -qsamplerDeviceForm\width=530 -qsamplerDeviceForm\height=488 -qsamplerDeviceForm\visible=false -qsamplerMainForm\x=961 -qsamplerMainForm\y=25 -qsamplerMainForm\width=958 -qsamplerMainForm\height=1174 -qsamplerMainForm\visible=true - -[Layout] -DockWindows=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x3\0\0\x3\xbe\0\0\0\xd4\xfc\x1\0\0\0\x1\xfb\0\0\0 \0q\0s\0\x61\0m\0p\0l\0\x65\0r\0M\0\x65\0s\0s\0\x61\0g\0\x65\0s\x1\0\0\0\0\0\0\x3\xbe\0\0\0\x46\0\xff\xff\xff\0\0\x3\xbe\0\0\x3t\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\xf3\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x1e\0\x63\0h\0\x61\0n\0n\0\x65\0l\0s\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\x1\xc7\xff\xff\xff\xff\0\0\0\0\0\0\0\0) - -[Program] -Version=0.2.3 - -[Options] -Server\ServerHost=localhost -Server\ServerPort=8888 -Server\ServerTimeout=1000 -Server\ServerStart=true -Server\ServerCmdLine=linuxsampler -Server\StartDelay=3 -Logging\MessagesLog=false -Logging\MessagesLogPath=qsampler.log -Display\DisplayFont=",9,-1,5,50,0,0,0,0,0" -Display\DisplayEffect=true -Display\AutoRefresh=true -Display\AutoRefreshTime=1000 -Display\MaxVolume=100 -Display\MessagesFont="Sans Serif,9,-1,5,50,0,0,0,0,0" -Display\MessagesLimit=true -Display\MessagesLimitLines=1000 -Display\ConfirmRemove=true -Display\KeepOnTop=true -Display\StdoutCapture=true -Display\CompletePath=true -Display\MaxRecentFiles=5 -Display\BaseFontSize=0 -Display\InstrumentNames=true -View\Menubar=true -View\Toolbar=true -View\Statusbar=true -View\AutoArrange=true - -[Default] -SessionDir= -InstrumentDir= -EngineName= -AudioDriver= -MidiDriver= -MidiMap=1 -MidiBank=0 -MidiProg=0 -Volume=100 -Loadmode=0 diff --git a/.config/packages-aur.txt b/.config/packages-aur.txt index 8f37989..17a9aaf 100644 --- a/.config/packages-aur.txt +++ b/.config/packages-aur.txt @@ -4,22 +4,23 @@ easytranscript etherpad-lite firefox-extension-tab-tree firefox-saka-key -gmsynth.lv2 iannix +jack2-git jackcpp-git khard-git libffado-svn liblo-git +librenms mantisbt nextcloud-news-updater patchbook-git +patroneo-git pd-git prosody-mod-admin-message-hg prosody-mod-admin-web-hg python-osc roundcube-rcmcarddav rts-git -ssr ssr-git supercollider-git ttf-cmu-typewriter diff --git a/.config/packages-community.txt b/.config/packages-community.txt index 7c6142f..0667244 100644 --- a/.config/packages-community.txt +++ b/.config/packages-community.txt @@ -1,16 +1,20 @@ a2jmidid aeolus aj-snapshot +aliki alsa-tools amb-plugins ams +ams-lv2 amsynth ardour +argtable artyfx aubio audacity autorandr avldrums.lv2 +beatslash-lv2 blop blop.lv2 cacti @@ -30,6 +34,7 @@ dbus-c++ din dnscrypt-proxy dpf-plugins +dragonfly-reverb drumgizmo drumkv1 drumstick @@ -50,36 +55,48 @@ g2reverb ganv giada gigedit +gmsynth.lv2 gpa grub-customizer guitarix2 harvid helm infamousplugins +jaaa jack2 jack_capture jacktrip jalv +japa +jconvolver +jnoisemeter jsampler khal khard lash +lib32-fluidsynth lib32-jack lib32-jack2 libffado libfishsound libgig libircclient +liblo liblrdf liblscp libltc +libmusicxml liboggz libsmf lilv linuxsampler lmms +lsp-plugins luppp lv2 +lv2file +lvtk +marsyas mcp-plugins mda.lv2 meterbridge @@ -87,7 +104,10 @@ midi_matrix.lv2 minitube moony.lv2 mxml +nextcloud-app-spreed nfoview +njconnect +noise-repellent nomacs non-daw non-sequencer @@ -95,16 +115,22 @@ ntk padthv1 patchage patchmatrix +paulstretch pd +pd-lua plowshare pound pvoc python-atomicwrites python-click-log +python-click-repl python-click-threading +python-doit python-etesync python-ethtool +python-fastnumbers python-furl +python-husl python-imdbpy python-inet_diag python-iwlib @@ -113,20 +139,32 @@ python-kaptan python-langdetect python-libtmux python-linux-procfs +python-ly +python-micawber +python-natsort +python-nose-progressive python-nose2 python-orderedmultidict +python-phpserialize +python-piexif +python-pilkit python-pyalsa python-pyliblo python-pymediainfo +python-pyrss2gen python-pytest-rerunfailures python-pytest-subtesthack python-schedutils python-sphinxcontrib-newsfeed +python-tabulate +python-toml python-vobject python-wsgi-intercept python-xvfbwrapper +python-yapsy python-zita-audiotools python-zita-jacktools +python-zopfli qastools qjackctl qmidiarp @@ -139,6 +177,7 @@ qtractor qxgedit radicale raul +realtime-privileges rev-plugins rosegarden rt-tests @@ -149,7 +188,9 @@ rubberband samplv1 schedtool serd +setbfree sherlock.lv2 +sigal smplayer-skins smtube snd @@ -162,7 +203,8 @@ sord sox spectmorph sratom -ssmtp +ssr +stk subdownloader suil supercollider @@ -173,6 +215,7 @@ synthv1 tap-plugins timidity-freepats tmuxp +todoman tuna twolame v4l2ucp @@ -184,6 +227,7 @@ vim-csound vm.lv2 vmpk wah-plugins +wolf-shaper x42-plugins xjadeo yoshimi @@ -198,6 +242,7 @@ zita-lrx zita-mu1 zita-njbridge zita-rev1 +zopfli zsh-autosuggestions zsh-history-substring-search zynaddsubfx diff --git a/.config/qtile/config.py b/.config/qtile/config.py index a9174e5..244b836 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -341,6 +341,8 @@ screens = [ frequency=5, type="box", ), + widget.Wlan( + interface="wlp3s0"), widget.MemoryGraph( graph_color=colors["green"], border_width=0, diff --git a/.config/sway/config b/.config/sway/config new file mode 100644 index 0000000..18e030d --- /dev/null +++ b/.config/sway/config @@ -0,0 +1,213 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term termite +# Your preferred application launcher +set $menu rofi -show drun + +# lock +set $lock swaylock -f -c 000000 + +# brightness +set $brightness_up backlight -i "5" +set $brightness_down backlight -i "-5" + +### 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 +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +### Key bindings +# +# Basics: +# + # start a terminal + bindsym $mod+Return exec $term + + # kill focused window + bindsym $mod+q kill + + # start your launcher + bindsym $mod+p exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # reload the configuration file + bindsym $mod+Ctrl+r reload + + # lock sway + bindsym $mod+Ctrl+s exec $lock + + # exit sway (logs you out of your wayland session) + bindsym $mod+Ctrl+e exit + # brightness + bindsym XF86MonBrightnessDown exec $brightness_down + bindsym XF86MonBrightnessUp exec $brightness_up +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # _move_ the focused window with the same, but add Shift + bindsym $mod+Ctrl+$left move left + bindsym $mod+Ctrl+$down move down + bindsym $mod+Ctrl+$up move up + bindsym $mod+Ctrl+$right move right + # ditto, with arrow keys + bindsym $mod+Ctrl+Left move left + bindsym $mod+Ctrl+Down move down + bindsym $mod+Ctrl+Up move up + bindsym $mod+Ctrl+Right move right +# +# Workspaces: +# + # switch to workspace + bindsym $mod+1 workspace 1 + bindsym $mod+2 workspace 2 + bindsym $mod+3 workspace 3 + bindsym $mod+4 workspace 4 + bindsym $mod+5 workspace 5 + bindsym $mod+6 workspace 6 + bindsym $mod+7 workspace 7 + bindsym $mod+8 workspace 8 + bindsym $mod+9 workspace 9 + bindsym $mod+0 workspace 10 + # move focused container to workspace + bindsym $mod+Shift+1 move container to workspace 1 + bindsym $mod+Shift+2 move container to workspace 2 + bindsym $mod+Shift+3 move container to workspace 3 + bindsym $mod+Shift+4 move container to workspace 4 + bindsym $mod+Shift+5 move container to workspace 5 + bindsym $mod+Shift+6 move container to workspace 6 + bindsym $mod+Shift+7 move container to workspace 7 + bindsym $mod+Shift+8 move container to workspace 8 + bindsym $mod+Shift+9 move container to workspace 9 + bindsym $mod+Shift+0 move container to workspace 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $down resize grow height 10 px or 10 ppt + bindsym $up resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt + + # ditto, with arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" + +} +bindsym $mod+r mode "resize" + +# TODO: triggers endless loop within sway! +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + colors { + statusline #ffffff + background #323232 + inactive_workspace #32323200 #32323200 #5c5c5c + } +} + + +include /etc/sway/config.d/* diff --git a/.config/systemd/user/jack@.service b/.config/systemd/user/jack@.service new file mode 100644 index 0000000..1a77e5a --- /dev/null +++ b/.config/systemd/user/jack@.service @@ -0,0 +1,13 @@ +[Unit] +Description=JACK server using %i configuration +After=sound.target local-fs.target + +[Service] +EnvironmentFile=-/etc/jack/%i +EnvironmentFile=-%h/.config/jack/%i +ExecStart=/usr/bin/jackd $JACK_OPTIONS -d $DRIVER -d $DEVICE $DRIVER_SETTINGS +LimitRTPRIO=95 +LimitRTTIME=infinity + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/mpd@.service b/.config/systemd/user/mpd@.service new file mode 100644 index 0000000..6bde606 --- /dev/null +++ b/.config/systemd/user/mpd@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Music Player Daemon +After=network.target sound.target +Conflicts=mpd.service + +[Service] +ExecStart=/usr/bin/mpd --no-daemon %h/.config/mpd/mpd-%i.conf +LimitRTPRIO=75 +LimitRTTIME=infinity + +[Install] +WantedBy=default.target @@ -160,7 +160,6 @@ packages/ .config/smplayer .config/sound-juicer/ .config/synergy-dvzrv.conf -.config/systemd/ .config/tint2/ .config/user-dirs.locale .config/vlc/ diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc index cd1fd26..2ee88f6 100644 --- a/.mutt/accounts.rc +++ b/.mutt/accounts.rc @@ -3,11 +3,3 @@ set spoolfile = "+sleepmap.de/INBOX" source "~/.mutt/dave@sleepmap.de.rc" folder-hook sleepmap.de/* source ~/.mutt/dave@sleepmap.de.rc -# david.runge@tu-berlin.de -folder-hook tu-berlin.de/* source ~/.mutt/david.runge@campus.tu-berlin.de.rc - -# studio@ak.tu-berlin.de -folder-hook studio@ak.tu-berlin.de/* source ~/.mutt/studio@ak.tu-berlin.de.rc - -# dave@c-base.org -folder-hook c-base.org/* source ~/.mutt/dave@c-base.org.rc diff --git a/.mutt/dave@c-base.org.rc b/.mutt/dave@c-base.org.rc deleted file mode 100644 index 269e88a..0000000 --- a/.mutt/dave@c-base.org.rc +++ /dev/null @@ -1,10 +0,0 @@ -set from = "David Runge <dave@c-base.org>" -set sendmail = "/usr/bin/msmtp -a c-base.org" -set folder = "~/Mail/c-base.org" -set spoolfile = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set signature = "~/.mutt/dave@c-base.org.sig" - -color status blue default - diff --git a/.mutt/dave@c-base.org.sig b/.mutt/dave@c-base.org.sig deleted file mode 100644 index 1e6a3ea..0000000 --- a/.mutt/dave@c-base.org.sig +++ /dev/null @@ -1 +0,0 @@ -I can feel my mind is going... diff --git a/.mutt/david.runge@campus.tu-berlin.de.rc b/.mutt/david.runge@campus.tu-berlin.de.rc deleted file mode 100644 index a513afc..0000000 --- a/.mutt/david.runge@campus.tu-berlin.de.rc +++ /dev/null @@ -1,11 +0,0 @@ -# Receive options -set from = "David Runge <david.runge@campus.tu-berlin.de>" -set sendmail = "/usr/bin/msmtp -a tu-berlin.de" -set folder = "~/Mail/tu-berlin.de" -set spoolfile = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set signature = "~/.mutt/david.runge@campus.tu-berlin.de.sig" - -color status red default - diff --git a/.mutt/david.runge@campus.tu-berlin.de.sig b/.mutt/david.runge@campus.tu-berlin.de.sig deleted file mode 100644 index 11f7cdd..0000000 --- a/.mutt/david.runge@campus.tu-berlin.de.sig +++ /dev/null @@ -1,18 +0,0 @@ -David Runge -Elektronisches Studio, Fachgebiet Audiokommunikation -Electronic Music Studio, Audio Communication Group - -Technische Universität Berlin -Fakultät I Geistes- und Bildungswissenschaften -Institut für Sprache und Kommunikation - -Faculty I Humanities -Institute of Speech and Communication - -Einsteinufer 17c, Sekr. E-N 8, 10587 Berlin -Germany -Tel: +493031422327 -Fax: +493031421143 -E-Mail: studio@ak.tu-berlin.de - -http://www.ak.tu-berlin.de/studio diff --git a/.mutt/macros.rc b/.mutt/macros.rc index bd430a0..1d42a76 100644 --- a/.mutt/macros.rc +++ b/.mutt/macros.rc @@ -1,9 +1,6 @@ # source folder settings and enter folder macro index,pager <F2> '<sync-mailbox><enter-command>source ~/.mutt/dave@sleepmap.de.rc<enter><change-folder>!<enter>' -macro index,pager <F3> '<sync-mailbox><enter-command>source ~/.mutt/dave@c-base.org.rc<enter><change-folder>!<enter>' -macro index,pager <F4> '<sync-mailbox><enter-command>source ~/.mutt/david.runge@campus.tu-berlin.de.rc<enter><change-folder>!<enter>' -macro index,pager <F5> '<sync-mailbox><enter-command>source ~/.mutt/studio@ak.tu-berlin.de.rc<enter><change-folder>!<enter>' macro attach W \ "<save-entry><bol>~/Downloads/<eol>" \ diff --git a/.mutt/studio@ak.tu-berlin.de.rc b/.mutt/studio@ak.tu-berlin.de.rc deleted file mode 100644 index e59ad96..0000000 --- a/.mutt/studio@ak.tu-berlin.de.rc +++ /dev/null @@ -1,11 +0,0 @@ -# Receive options -set from = "Elektronisches Studio TUB <studio@ak.tu-berlin.de>" -set sendmail = "/usr/bin/msmtp -a tu-berlin.de" -set folder = "~/Mail/studio@ak.tu-berlin.de" -set spoolfile = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set signature = "~/.mutt/studio@ak.tu-berlin.de.sig" - -color status red default - diff --git a/.mutt/studio@ak.tu-berlin.de.sig b/.mutt/studio@ak.tu-berlin.de.sig deleted file mode 100644 index 11f7cdd..0000000 --- a/.mutt/studio@ak.tu-berlin.de.sig +++ /dev/null @@ -1,18 +0,0 @@ -David Runge -Elektronisches Studio, Fachgebiet Audiokommunikation -Electronic Music Studio, Audio Communication Group - -Technische Universität Berlin -Fakultät I Geistes- und Bildungswissenschaften -Institut für Sprache und Kommunikation - -Faculty I Humanities -Institute of Speech and Communication - -Einsteinufer 17c, Sekr. E-N 8, 10587 Berlin -Germany -Tel: +493031422327 -Fax: +493031421143 -E-Mail: studio@ak.tu-berlin.de - -http://www.ak.tu-berlin.de/studio diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 705487d..de64f92 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -53,10 +53,10 @@ empty_tag_marker = "" lastfm_preferred_language = "en" -visualizer_in_stereo = "yes" -visualizer_fifo_path = "/run/user/1000/mpd/fifo" +visualizer_fifo_path = "~/.config/mpd/fifo" visualizer_output_name = "mpd_fifo" +visualizer_in_stereo = "yes" visualizer_sync_interval = 10 -visualizer_type = "spectrum" # spectrum/wave +visualizer_type = "ellipse" visualizer_color = "blue" visualizer_look = ●▮ diff --git a/.offlineimaprc b/.offlineimaprc index 83d7b3c..9101b96 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -1,9 +1,9 @@ [general] -accounts = sleepmap.de,tu-berlin.de,c-base.org +accounts = sleepmap.de maxsyncaccounts = 4 pythonfile = ~/bin/pass2offlineimap -# Automatic mailbox generationi for mutt +# Automatic mailbox generation for mutt [mbnames] enabled = yes filename = ~/.mutt/mailboxes.rc @@ -12,23 +12,6 @@ peritem = "+%(accountname)s/%(foldername)s" sep = " " footer = "\n" -[Account tu-berlin.de] -localrepository = tu-berlin-local -remoterepository = tu-berlin-remote -quick = -1 - -[Repository tu-berlin-local] -type = Maildir -localfolders = ~/Mail/tu-berlin.de/ - -[Repository tu-berlin-remote] -type = IMAP -remotehost = exchange.tu-berlin.de -remoteuser = davezerave@win.tu-berlin.de -remotepasseval = get_pass("davezerave@mail.tu-berlin.de") -folderfilter = lambda folder: folder not in ['Aufgaben', 'Entw&APw-rfe', 'Gel&APY-schte Elemente', 'Gesendete Elemente', 'Journal', 'Junk-E-Mail', 'Kalender', 'Kontakte', 'Notizen', 'Postausgang'] -sslcacertfile = /etc/ssl/cert.pem - [Account sleepmap.de] localrepository = sleepmap-local remoterepository = sleepmap-remote @@ -48,21 +31,3 @@ starttls = yes ssl = no sslcacertfile = /etc/ssl/cert.pem -[Account c-base.org] -localrepository = c-base-local -remoterepository = c-base-remote -quick = -1 - -[Repository c-base-local] -type = Maildir -localfolders = ~/Mail/c-base.org/ -nametrans = lambda folder: "INBOX" if "INBOX" in folder else "INBOX." + folder - -[Repository c-base-remote] -type = IMAP -remotehost = c-mail.c-base.org -remoteuser = dave -remotepasseval = get_pass("dave@c-base.org") -nametrans = lambda folder: re.sub('^INBOX\.', '', folder) -folderfilter = lambda folder: folder not in ['INBOX.INBOX'] -sslcacertfile = /etc/ssl/cert.pem diff --git a/.vdirsyncer/config b/.vdirsyncer/config index b014d15..ebd9acc 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -23,7 +23,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de [pair dave_calendar] a = "dave_calendar_local" b = "dave_calendar_remote" -collections = ["concerts", "contact_birthdays", "live", "flat", "private", "work"] +collections = ["concerts", "contact_birthdays", "live", "flat", "private", "work", "bus_shared_by_t4"] [storage dave_calendar_local] type = "filesystem" diff --git a/.vim/addons-settings.vim b/.vim/addons-settings.vim index b61938a..3addf02 100644 --- a/.vim/addons-settings.vim +++ b/.vim/addons-settings.vim @@ -197,3 +197,8 @@ let g:solarized_termtrans=1 " ================ YouCompleteMe ============== " set let g:EclimCompletionMethod = 'omnifunc' + +" ================ supercollider ================ +let g:scFlash = 1 +let g:scSplitDirection = "v" +let g:scSplitSize = 25 @@ -1,8 +1,8 @@ #!/usr/bin/env bash # use .Xmodmap -if [[ -f ~/.Xmodmap ]]; then - /usr/bin/xmodmap ~/.Xmodmap & +if [ -f ~/.Xmodmap ]; then + /usr/bin/xmodmap ~/.Xmodmap & fi # set X settings @@ -18,12 +18,12 @@ fi # setup screens on login using autorandr if [ -x "$HOME/bin/setup_screens" ]; then - $HOME/bin/setup_screens & + "$HOME/bin/setup_screens" & fi # lock X automatically after inactivity if [ -x "$HOME/bin/xorg_autolock" ]; then - $HOME/bin/xorg_autolock & + "$HOME/bin/xorg_autolock" & fi # lock X before going to sleep diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh index 8a86938..413dd3b 100644 --- a/.zsh.after/aliases.zsh +++ b/.zsh.after/aliases.zsh @@ -162,7 +162,6 @@ alias pac='sudo pacman -S' #Install specific package(s) from the repositories alias pacu='sudo pacman -U' #Install specific package not from the repositories but from a file alias pacre='sudo pacman -R' #Remove the specified package(s), retaining its configuration(s) and required dependencies alias pacrem='sudo pacman -Rns' #Remove specified package(s), its configuration(s) and unneeded depends -alias pacsearch="pacman -Sl | cut -d' ' -f2 | grep " #Search through all available packages in repo alias pacname="sudo pacman -Qi|grep Name|grep " #Search through names of packages by string alias pacri='pacman -Si' #Display information about a given package in the repositories alias pacrs='pacman -Ss' #Search for package(s) in the repositories diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh index 45dbe9b..89ba7dc 100644 --- a/.zsh.after/export.zsh +++ b/.zsh.after/export.zsh @@ -1,5 +1,4 @@ -# use xterm-color anywhere. Sane default for color and termite -if [[ -n $TMUX ]] && [[ $VENDOR != "apple" ]];then +if [[ -n $TMUX ]] && [[ $VENDOR != "apple" ]] && [[ ! -e /etc/debian_version ]]; then export TERM="tmux-256color" elif [[ -n $STY ]];then export TERM="screen-256color" diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh index b089ff6..e2af147 100644 --- a/.zsh.after/functions.zsh +++ b/.zsh.after/functions.zsh @@ -203,13 +203,13 @@ ex2() { ## RSYNC backupinfo() { - log_cyan "INFO" rsync\ -r\ -n\ -t\ -p\ -o\ + -h\ -g\ -v\ --progress\ @@ -232,6 +232,7 @@ backupfolder() { -t\ -p\ -o\ + -h\ -g\ -v\ --progress\ diff --git a/bin/backlight b/bin/backlight new file mode 100755 index 0000000..ac8a466 --- /dev/null +++ b/bin/backlight @@ -0,0 +1,99 @@ +#!/usr/bin/env bash +# set backlight through sysfs + +set -euo pipefail + +# brightness steps in percentage +brightness_step_size=5 +brightness_device=/sys/class/backlight/intel_backlight/brightness +brightness_max_device=/sys/class/backlight/intel_backlight/max_brightness +calculated_brightness=0 +amount=0 + +brightness_steps=$(echo "100/${brightness_step_size}" |bc -l) +maximum_brightness_raw=$(cat $brightness_max_device) +current_brightness_raw=$(cat $brightness_device) +brightness_one_percent_raw=$(echo "${maximum_brightness_raw}/100" |bc -l) +current_brightness_percentage=$(echo "${current_brightness_raw}/(${maximum_brightness_raw}/100)" |bc -l) +current_brightness_remainder=$(echo "${current_brightness_percentage}%${brightness_step_size}"|bc -l) +current_step=$(echo ${current_brightness_percentage}/${brightness_step_size}|bc -l) + +check_if_number() { + if [[ $1 =~ ^[!\-0-9]+$ ]]; then + echo "Not an Integer: $1" + exit 1 + fi +} + +calculate_increment() { + check_if_number $1 + if [ $1 -eq 0 ]; then + echo "There's nothing to do." + exit 1 + fi + if [ $1 -gt 0 ]; then + if [ $(printf '%.0f' $current_brightness_percentage) -eq 100 ]; then + echo "Already at 100%" + exit 0 + elif [ $(printf '%.0f' $(echo "${current_brightness_percentage}+$1"| bc)) -gt 100 ]; then + calculated_brightness=100 + else + calculated_brightness=$(printf '%.0f' $(echo "${current_brightness_percentage}+$1"| bc)) + fi + else + if [ $(printf '%.0f' $current_brightness_percentage) -eq 0 ]; then + echo "Already at 0%" + exit 0 + elif [ $(printf '%.0f' $(echo "${current_brightness_percentage}+$1"| bc)) -lt 0 ]; then + calculated_brightness=0 + else + calculated_brightness=$(printf '%.0f' $(echo "${current_brightness_percentage}+$1"| bc)) + fi + fi +} + +calculate_percentage() { + check_if_number $1 + if [ $1 -lt 0 ] || [ $1 -gt 100 ]; then + echo "Invalid range: $1" + exit 1 + fi + calculated_brightness=$1 +} + +percentage_to_raw() { + printf '%.0f' $(echo "$1*${brightness_one_percent_raw}"|bc -l) +} + +set_brightness() { + echo "$(percentage_to_raw $calculated_brightness)" > $brightness_device +} + +print_help() { + echo -e "Usage:\n $0 -d <decrement_by_x_percent> \n or $0 -i <increment_by_x_percent>" + exit 1 +} + +if [ ${#@} -gt 0 ]; then + while getopts 'hi:s:' flag; do + case "${flag}" in + h) + print_help + ;; + i) + calculate_increment $OPTARG + ;; + s) + calculate_percentage $OPTARG + ;; + *) + echo "Error! Try '${0} -h'." + exit 1 + ;; + esac + done +else + print_help +fi + +set_brightness @@ -19,7 +19,7 @@ function open_cryptdevice() { echo "Crypt device has already been opened: /dev/mapper/$2" echo "Continuing..." else - /usr/bin/sudo /usr/bin/cryptsetup luksOpen "/dev/disk/by-uuid/$1" $2 + /usr/bin/sudo /usr/bin/cryptsetup luksOpen "/dev/disk/by-uuid/$1" "$2" fi else echo "Error: Device $2 (UUID=$1) is not available." @@ -28,7 +28,7 @@ function open_cryptdevice() { } function close_cryptdevice() { - /usr/bin/sudo /usr/bin/cryptsetup luksClose $1 + /usr/bin/sudo /usr/bin/cryptsetup luksClose "$1" } function mount_cryptdevice() { @@ -50,35 +50,35 @@ function unmount_cryptdevice() { if [ -x "$HOME/.config/cs/pre_umount/$1" ]; then "$HOME/.config/cs/pre_umount/$1" fi - /usr/bin/sudo /usr/bin/umount /mnt/$1 + /usr/bin/sudo /usr/bin/umount "/mnt/$1" } function validate_cryptdevice_name() { - local _result_valid_name=$1 + local _result_valid_name="$1" local name_found=0 - local input_name=${2:-} + local input_name="${2:-}" for name in "${!devices[@]}"; do - if [ $name = "${input_name}" ]; then + if [ "$name" = "${input_name}" ]; then name_found=1 - eval $_result_valid_name="'$name_found'" + eval "$_result_valid_name"="$name_found" fi done } -validate_cryptdevice_name valid_name ${device_name} +validate_cryptdevice_name valid_name "${device_name}" if [ $valid_name -eq 0 ]; then echo "No such device: '$device_name'!" exit 1 fi -case $1 in +case "$command_name" in "open") - open_cryptdevice ${devices[${2}]} $2 - mount_cryptdevice $2 + open_cryptdevice "${devices[${2}]}" "$2" + mount_cryptdevice "$2" ;; "close") - unmount_cryptdevice $2 - close_cryptdevice $2 + unmount_cryptdevice "$2" + close_cryptdevice "$2" ;; *) echo "cs only understands 'open' and 'close'." @@ -249,12 +249,10 @@ if [ $list_mode -eq 1 ] && \ elif [ $list_mode -eq 1 ] && \ [ $aur_mode -eq 1 ] && \ [ $community_mode -eq 0 ];then - echo "AUR packages:" cat "$aur_packagelist" elif [ $list_mode -eq 1 ] && \ [ $aur_mode -eq 0 ] && \ [ $community_mode -eq 1 ];then - echo "Community packages:" cat "$community_packagelist" elif [ $list_mode -eq 1 ] && \ [ $aur_mode -eq 1 ] && \ diff --git a/bin/setup_screens b/bin/setup_screens index 1a84bba..7cd0b17 100755 --- a/bin/setup_screens +++ b/bin/setup_screens @@ -2,23 +2,29 @@ # Script to setup screens on login and lid-switch-action # Uses autorandr to determine which screens are connected and which to setup. # -# Per default a configuration named "internal" will be used, if the computer is +# Per default a configuration named "default" will be used, if the computer is # a laptop and not docked. # A configuration named "docked-closed" will be used during login, when the lid # is closed and docked. -# A configuration named "docked-open" will be used during login, when the lid +# A configuration named "docked-all" will be used during login, when the lid # is open and docked. set -e -u lid_state="" -docking_state="" fingerprint="" action="" x_user="" +display="" current_user="" path="" +# get DISPLAY number +get_display() +{ + display=$(pgrep -a Xorg|cut -d':' -f2| cut -d' ' -f1) +} + # get current user running X get_x_user() { @@ -41,15 +47,17 @@ get_path() function get_lid_state() { if [ -r "/proc/acpi/button/lid/LID/state" ]; then - lid_state="$(cat /proc/acpi/button/lid/LID/state|awk '{print $2}')" + lid_state="$(awk '{print $2}' /proc/acpi/button/lid/LID/state)" fi } # Get current docking state ("true" or "false") -function get_docking_state() +function is_docked() { - if [ -x "/usr/bin/busctl" ]; then - docking_state="$(busctl introspect org.freedesktop.login1 /org/freedesktop/login1|grep "\.Docked"|awk '{print $4}')" + if command -v busctl > /dev/null; then + busctl introspect org.freedesktop.login1 /org/freedesktop/login1| grep -E '^.Docked'| awk '{print $4}' + else + echo false fi } @@ -63,8 +71,8 @@ function get_setup_fingerprint() function get_configuration_fingerprint() { local fingerprint="" - if [ -r $HOME/.config/autorandr/$1/setup ]; then - fingerprint="$(md5sum $HOME/.config/autorandr/$1/setup| cut -d ' ' -f 1)" + if [ -r "$HOME/.config/autorandr/$1/setup" ]; then + fingerprint="$(md5sum "$HOME/.config/autorandr/$1/setup"| cut -d ' ' -f 1)" fi echo "$fingerprint" } @@ -73,19 +81,19 @@ function set_configuration() { local state=0 # if the computer is docked - if [ "$docking_state" = "true" ]; then + if is_docked ; then # if there's a lid-switch action if [ -n "$action" ]; then case "$action" in "open") - if [ $(get_configuration_fingerprint "docked-open") == "$fingerprint" ]; then - echo "Loading docked-open." + if [ "$(get_configuration_fingerprint 'docked-all')" == "$fingerprint" ]; then + echo "Loading docked-all." state=1 - autorandr -l docked-open + autorandr -l docked-all fi ;; "close") - if [ $(get_configuration_fingerprint "docked-closed") == "$fingerprint" ]; then + if [ "$(get_configuration_fingerprint 'docked-closed')" == "$fingerprint" ]; then echo "Loading docked-closed." state=1 autorandr -l docked-closed @@ -96,10 +104,10 @@ function set_configuration() # check the lid state case "$lid_state" in "open") - if [[ $(get_configuration_fingerprint "docked-open") == "$fingerprint" ]]; then - echo "Loading docked-open." + if [[ $(get_configuration_fingerprint "docked-all") == "$fingerprint" ]]; then + echo "Loading docked-all." state=1 - autorandr -l docked-open + autorandr -l docked-all fi ;; "closed") @@ -125,11 +133,11 @@ function set_configuration() fi fi fi - # if the screen still has not been setup, try using internal + # if the screen still has not been setup, try using default if [ $state -ne 1 ]; then - if [[ $(get_configuration_fingerprint "internal") == "$fingerprint" ]]; then - echo "Loading internal." - autorandr -l internal + if [[ $(get_configuration_fingerprint "default") == "$fingerprint" ]]; then + echo "Loading default." + autorandr -l default fi fi } @@ -147,27 +155,25 @@ fi logger "Calling 'setup_screens'" get_x_user +get_display get_current_user get_path # Export Xorg DISPLAY and XAUTHORITY -export DISPLAY=$(ls /tmp/.X*|grep "lock"|cut -d '.' -f2| cut -d '-' -f1|sed -e 's/X/:/') -export XAUTHORITY="$(eval echo ~$x_user/.Xauthority)" +export DISPLAY=":$display" +export XAUTHORITY="/home/$x_user/.Xauthority" # if the script caller is the current X user or root (and lightdm is the current X user) -if [ "$current_user" = "$x_user" ] || [ $current_user = "root" -a $x_user = "lightdm" ]; then +if [ "$current_user" == "$x_user" ]; then get_lid_state - get_docking_state get_setup_fingerprint set_configuration -else - if [ $current_user = "root" ]; then +elif [ "$current_user" == "root" ]; then logger "Running $path as user $x_user now." - runuser -l $x_user -c $path - else + runuser -l "$x_user" -c "$path" +else echo "$current_user is not currently running X and is not allowed to let the current X user run this script." exit 1 - fi fi exit 0 diff --git a/bin/startsway b/bin/startsway new file mode 100755 index 0000000..ee46560 --- /dev/null +++ b/bin/startsway @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +export XKB_DEFAULT_LAYOUT=us,de +export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle +mkdir -p "$HOME/.log" +/usr/bin/sway -dV > "$HOME/.log/sway.log" 2>&1 diff --git a/bin/xorg_autolock b/bin/xorg_autolock index f30ae3e..181548e 100755 --- a/bin/xorg_autolock +++ b/bin/xorg_autolock @@ -4,15 +4,16 @@ set -euo pipefail lock=${XDG_RUNTIME_DIR}/xorg_autolock.lock lock_block=${XDG_RUNTIME_DIR}/xorg_autolock_block +lock_cmd="$HOME/bin/xorg_lock" lockafter=600000 -rm -f ${lock} ${lock_block} +rm -f "${lock}" "${lock_block}" -while [ 1 ]; do - if [ ! -f ${lock} -a ! -f ${lock_block} ];then +while true; do + if [ ! -f "${lock}" ] && [ ! -f "${lock_block}" ];then if [ -x "/usr/bin/xssstate" ]; then - if [ $(xssstate -i) -ge $lockafter ]; then - $HOME/bin/xorg_lock + if [ "$(xssstate -i)" -ge $lockafter ] && [ -x "$lock_cmd" ]; then + $lock_cmd fi else echo "xssstate is note installed!" diff --git a/bin/xorg_lock b/bin/xorg_lock index 648099e..6ddeb0c 100755 --- a/bin/xorg_lock +++ b/bin/xorg_lock @@ -2,13 +2,13 @@ set -euo pipefail -lock=${XDG_RUNTIME_DIR}/xorg_autolock.lock -lockcmd="i3lock -n -e -c 000000 -f" +lock_file=${XDG_RUNTIME_DIR}/xorg_autolock.lock +lock_cmd="i3lock -n -e -c 000000 -f" if [ -x "/usr/bin/i3lock" ]; then - touch ${lock} - ${lockcmd} - rm -f ${lock} + touch "${lock_file}" + ${lock_cmd} + rm -f "${lock_file}" else echo "i3lock is not installed!" exit 1 |