aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <david.runge@native-instruments.de>2019-01-10 11:46:01 +0100
committerDavid Runge <david.runge@native-instruments.de>2019-01-10 11:46:01 +0100
commit7c6516dd36414e7208d573bba463b0a9364e745b (patch)
tree5c50f8d99bfbfaeb1673b3d06c08c82908a20178
parent89189971dff6a4070cfee0f05eb468e28902bfb8 (diff)
parent324e2d6adff3acc74098b5f1a19e94ba2171917b (diff)
downloaddotfiles-7c6516dd36414e7208d573bba463b0a9364e745b.tar.gz
dotfiles-7c6516dd36414e7208d573bba463b0a9364e745b.tar.bz2
dotfiles-7c6516dd36414e7208d573bba463b0a9364e745b.tar.xz
dotfiles-7c6516dd36414e7208d573bba463b0a9364e745b.zip
Merge branch 'master' of git.sleepmap.de:config/dotfiles
* 'master' of git.sleepmap.de:config/dotfiles: bin/backlight: Adding more thorough description. Adding better help printout. Only print help on -h. Print current brightness in percentage when not giving any parameter. bin/realtime-suggestions: Now upstreamed ( https://github.com/linuxaudio/realtime-suggestions ). bin/xorg_autolock: Removing useless script. .xprofile: Remove xorg_autolock (as it's causing a lot of trouble with screen suspend and killing of user environment on shutdown. bin/realtime-suggestions: Switching to info level for detection of audio group. bin/realtime-suggestions: Switching the kernel_config location to somewhere below /boot, if the default below /proc/config.gz was not found. Rewriting all kernel config checks to use a unified function kernel_config_has() and cmdline checks to use kernel_cmdline_has(). bin/realtime-suggestions: Changing check for policy directory in check_cpu_governor(), so that we fail if we don't at least find one policy dir. bin/realtime-suggestions: Guarding against non-existing cpufreq dir in /sys, when running check_cpu_governor(). Mentioning default value in check_max_user_watches(). bin/realtime-suggestions: Adding check for virtualization/containerization. .config/systemd/user/gpg-refresh.*: Adding local systemd user service for PGP key refresh. bin/realtime-suggestions: Fixing unitialized variable in message printout. bin/realtime-suggestions: Adding check for Linux kernel. bin/realtime-suggestions: Switching WARNING to CHANGE. Only checking for CONFIG_NO_HZ_{,COMMON,FULL}. bin/realtime-suggestions: Ignoring /boot mount points (it's very unlikely to use that for anything but boot stuff). bin/realtime-suggestions: Adding realtime-suggestions. .ssh/config: Using a ed25519 key for apu-access. .config/packages-community.txt: Adding eq10q and osc2midi. .xserverrc: Redirect output to a log file. .config/khal/config: Adding Nanni's personal calendar. .vdirsyncer/config: Adding nanni's personal calendar.
-rw-r--r--.config/khal/config20
-rw-r--r--.config/packages-community.txt2
-rw-r--r--.config/systemd/user/gpg-refresh.service6
-rw-r--r--.config/systemd/user/gpg-refresh.timer10
-rw-r--r--.ssh/config2
-rw-r--r--.vdirsyncer/config2
-rw-r--r--.xprofile5
-rw-r--r--.xserverrc2
-rwxr-xr-xbin/backlight13
-rwxr-xr-xbin/xorg_autolock25
10 files changed, 42 insertions, 45 deletions
diff --git a/.config/khal/config b/.config/khal/config
index 3e6026c..d808a0f 100644
--- a/.config/khal/config
+++ b/.config/khal/config
@@ -4,37 +4,41 @@
[[local]]
path = ~/.calendars/local
readonly = True
-color = light red
+color = 'light red'
# cloud.sleepmap.de
[[birthdays]]
path = ~/.calendars/contact_birthdays
readonly = True
-color = white
+color = 'white'
[[concerts]]
path = ~/.calendars/concerts
-color = brown
+color = 'brown'
[[flat]]
path = ~/.calendars/flat
-color = light blue
+color = 'light blue'
[[live]]
path = ~/.calendars/live
-color = light magenta
+color = 'light magenta'
[[private]]
path = ~/.calendars/private
-color = dark cyan
+color = 'dark cyan'
[[work]]
path = ~/.calendars/work
-color = dark magenta
+color = 'dark magenta'
[[t4]]
path = ~/.calendars/bus_shared_by_t4
-color = dark cyan
+color = 'dark cyan'
+
+[[nanni]]
+path = ~/.calendars/personal_shared_by_nanni
+color = 'light magenta'
[sqlite]
path = ~/.config/khal/khal.db
diff --git a/.config/packages-community.txt b/.config/packages-community.txt
index 0667244..edba02d 100644
--- a/.config/packages-community.txt
+++ b/.config/packages-community.txt
@@ -42,6 +42,7 @@ dssi
dssi-vst
ecasound
elyxer
+eq10q
eteroj.lv2
fabla
faust
@@ -112,6 +113,7 @@ nomacs
non-daw
non-sequencer
ntk
+osc2midi
padthv1
patchage
patchmatrix
diff --git a/.config/systemd/user/gpg-refresh.service b/.config/systemd/user/gpg-refresh.service
new file mode 100644
index 0000000..3b7ff65
--- /dev/null
+++ b/.config/systemd/user/gpg-refresh.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=GnuPG cryptographic key refresh
+Documentation=man:gpg(1)
+
+[Service]
+ExecStart=/usr/bin/gpg --refresh-keys
diff --git a/.config/systemd/user/gpg-refresh.timer b/.config/systemd/user/gpg-refresh.timer
new file mode 100644
index 0000000..44c3e68
--- /dev/null
+++ b/.config/systemd/user/gpg-refresh.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Timer for GnuPG cryptographic key refresh
+
+[Timer]
+OnCalendar=daily
+AccuracySec=1h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/.ssh/config b/.ssh/config
index 8978c42..1c86677 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -45,7 +45,7 @@ Host apu-access
User dave
ServerAliveInterval 120
Compression yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
IdentitiesOnly yes
ControlMaster auto
ControlPath ~/.ssh/socket-%r@%h:%p
diff --git a/.vdirsyncer/config b/.vdirsyncer/config
index ebd9acc..39926ab 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", "bus_shared_by_t4"]
+collections = ["concerts", "contact_birthdays", "live", "flat", "private", "work", "bus_shared_by_t4", "personal_shared_by_nanni"]
[storage dave_calendar_local]
type = "filesystem"
diff --git a/.xprofile b/.xprofile
index 116c4b4..1549ad1 100644
--- a/.xprofile
+++ b/.xprofile
@@ -21,11 +21,6 @@ if [ -x "$HOME/bin/setup_screens" ]; then
"$HOME/bin/setup_screens" &
fi
-# lock X automatically after inactivity
-if [ -x "$HOME/bin/xorg_autolock" ]; then
- "$HOME/bin/xorg_autolock" &
-fi
-
# lock X before going to sleep
if [ -x "/usr/bin/xss-lock" ]; then
/usr/bin/xss-lock xorg_lock &
diff --git a/.xserverrc b/.xserverrc
index fe79c4b..cd27661 100644
--- a/.xserverrc
+++ b/.xserverrc
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/bin/Xorg -nolisten tcp -keeptty "$@" vt$XDG_VTNR
+exec /usr/bin/Xorg -nolisten tcp -keeptty "$@" vt$XDG_VTNR > ~/.log/xorg.log 2>&1
diff --git a/bin/backlight b/bin/backlight
index ac8a466..be0dadf 100755
--- a/bin/backlight
+++ b/bin/backlight
@@ -1,5 +1,9 @@
#!/usr/bin/env bash
-# set backlight through sysfs
+#
+# Sets backlight through /sys/class/backlight/intel_backlight/brightness
+# Note: This requires the file to be user-writable!
+# Changes can be applied either by (positive or negative) relative increment
+# [-i] or as an absolute value [-s] (in percentage).
set -euo pipefail
@@ -70,8 +74,8 @@ set_brightness() {
}
print_help() {
- echo -e "Usage:\n $0 -d <decrement_by_x_percent> \n or $0 -i <increment_by_x_percent>"
- exit 1
+ echo -e "Usage: $0 [-i <increment_in_percent>] [-s <brightness_in_percent>]"
+ exit 0
}
if [ ${#@} -gt 0 ]; then
@@ -93,7 +97,8 @@ if [ ${#@} -gt 0 ]; then
esac
done
else
- print_help
+ echo "$current_brightness_percentage"
+ exit 0
fi
set_brightness
diff --git a/bin/xorg_autolock b/bin/xorg_autolock
deleted file mode 100755
index 181548e..0000000
--- a/bin/xorg_autolock
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-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}"
-
-while true; do
- if [ ! -f "${lock}" ] && [ ! -f "${lock_block}" ];then
- if [ -x "/usr/bin/xssstate" ]; then
- if [ "$(xssstate -i)" -ge $lockafter ] && [ -x "$lock_cmd" ]; then
- $lock_cmd
- fi
- else
- echo "xssstate is note installed!"
- exit 1
- fi
- fi
-
- sleep 1
-done