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

* 'master' of sleepmap.de:config/dotfiles:
  .gitignore: Adding packages/ folder to ignore. Removing unused folders from ignore list.
  .config/conky/blckbx-*: Adding conky configurations for blckbx.
  .gnupg/dirmngr_ldapservers.conf: Adding empty configuration, so that dirmngr won't complain.
  .makepkg.conf: Adding default BUILDDIR /tmp/makepkg.
  .config/SuperCollider/startup.scd: Automatically initializing and connecting MIDI devices.
  .ssh/config: Adding global trvlr ssh config.

7 files changed, 203 insertions, 4 deletions

diff --git a/.config/SuperCollider/startup.scd b/.config/SuperCollider/startup.scd
index 4d51dbf..9d905a2 100644
--- a/.config/SuperCollider/startup.scd
+++ b/.config/SuperCollider/startup.scd
@@ -16,4 +16,8 @@ if(("aplay -l |grep 'Scarlett 18i20' > /dev/null".systemCmd) == 0, {
 });
 postln("Loaded settings for: "++Server.local.options.device);
 
+postln("Initializing and connecting MIDI devices.");
+MIDIClient.init;
+MIDIIn.connectAll;
+
 //TODO: load all quarks from ~/git/audio automatically, don't use symlinks
diff --git a/.config/conky/blckbx-general.conf b/.config/conky/blckbx-general.conf
new file mode 100644
index 0000000..212cd2f
--- /dev/null
+++ b/.config/conky/blckbx-general.conf
@@ -0,0 +1,109 @@
+conky.config = {
+background = true,
+total_run_times = 0,
+update_interval = 1,
+own_window = true,
+own_window_type = 'override',
+own_window_argb_visual = true,
+own_window_argb_value = 0,
+own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager',
+double_buffer = true,
+draw_shades = true,
+draw_outline = false,
+draw_borders = false,
+draw_graph_borders = false,
+alignment = 'top_right',
+maximum_width = 260,
+gap_x = 10,
+gap_y = 40,
+no_buffers = yes,
+uppercase = false,
+cpu_avg_samples = 1,
+net_avg_samples = 1,
+override_utf8_locale = yes,
+color1 = 'EAEAEA',
+color2 = '00FF66',
+color3 = '11EAEA',
+color4 = 'EAEAEA',
+color5 = 'FF3F3F',
+color6 = '22FFFF',
+color7 = 'FF8888',
+text_buffer_size = 512,
+pad_percents = 0,
+short_units = true,
+format_human_readable = true,
+default_bar_height = 5,
+default_bar_width = 200,
+if_up_strictness = 'link',
+font = 'Inconsolata:size=9',
+use_xft = true
+}
+
+conky.text = [[
+${color5}Kernel: ${color1}${kernel}
+${color5}Date: ${color1}${time %Y%m%d}
+${color5}Time: ${color1}${time %H:%M:%S}
+${if_existing /etc/hostname trvlr}
+${color5}CPU:
+${color3}${cpubar cpu1}
+${color3}${cpubar cpu2}
+${color3}${cpubar cpu3}
+${color3}${cpubar cpu4}
+${color3}Frequency: ${color1}${freq} Mhz
+${endif}\
+${if_existing /etc/hostname dvzrv}
+${color5}CPU:
+${color3}${cpubar cpu1}
+${color3}${cpubar cpu2}
+${color3}${cpubar cpu3}
+${color3}${cpubar cpu4}
+${color3}${cpubar cpu5}
+${color3}${cpubar cpu6}
+${color3}${cpubar cpu7}
+${color3}${cpubar cpu8}
+${color3}Frequency: ${color1}${freq} Mhz
+${endif}\
+
+${color5}Memory: ${color1}$memwithbuffers/ $cached/ $memmax
+${color3}$membar
+
+${color5}Load: ${color1}${loadavg}
+
+${if_existing /etc/hostname trvlr}\
+${color5}Battery: ${color1} ${battery_short} (${battery_time})
+${color3}${battery_bar}
+${endif}\
+
+\
+${color5}I/O:
+${color3}/dev/sda:   ${color1}${diskio /dev/sda}
+${if_existing /dev/sdb}\
+${color3}/dev/sdb:   ${color1}${diskio /dev/sdb}
+${endif}\
+${if_existing /dev/sdc}\
+${color3}/dev/sdc:   ${color1}${diskio /dev/sdc}
+${endif}\
+${if_existing /dev/sdd}\
+${color3}/dev/sdd:   ${color1}${diskio /dev/sdd}
+${endif}\
+${if_existing /dev/sde}\
+${color3}/dev/sde:   ${color1}${diskio /dev/sde}
+${endif}\
+
+${color5}Mail:
+${color3}dave@sleepmap.de: ${color1}${unseen_mails /home/dave/Mail/sleepmap.de/INBOX 30}/${seen_mails /home/dave/Mail/sleepmap.de/INBOX 30}
+${color3}dave@c-base.org: ${color1}${unseen_mails /home/dave/Mail/c-base.org/INBOX 30}/${seen_mails /home/dave/Mail/c-base.org/INBOX 30}
+${color3}davezerave@tu-berlin.de: ${color1}${unseen_mails /home/dave/Mail/tu-berlin.de/INBOX 30}/${seen_mails /home/dave/Mail/tu-berlin.de/INBOX 30}
+
+${color5}Processes:
+${color3}${top name 1} ${color1}${top cpu 1} ${top mem 1} ${top pid 1} ${top user 1}
+${color3}${top name 2} ${color1}${top cpu 2} ${top mem 2} ${top pid 2} ${top user 2}
+${color3}${top name 3} ${color1}${top cpu 3} ${top mem 3} ${top pid 3} ${top user 3}
+${color3}${top name 4} ${color1}${top cpu 4} ${top mem 4} ${top pid 4} ${top user 4}
+${color3}${top name 5} ${color1}${top cpu 5} ${top mem 5} ${top pid 5} ${top user 5}
+${color3}${top name 6} ${color1}${top cpu 6} ${top mem 6} ${top pid 6} ${top user 6}
+${color3}${top name 7} ${color1}${top cpu 7} ${top mem 7} ${top pid 7} ${top user 7}
+${color3}${top name 8} ${color1}${top cpu 8} ${top mem 8} ${top pid 8} ${top user 8}
+${color3}${top name 9} ${color1}${top cpu 9} ${top mem 9} ${top pid 9} ${top user 9}
+${color3}${top name 10} ${color1}${top cpu 10} ${top mem 10} ${top pid 10} ${top user 10}
+]]
diff --git a/.config/conky/blckbx-network.conf b/.config/conky/blckbx-network.conf
new file mode 100644
index 0000000..dcf2ccc
--- /dev/null
+++ b/.config/conky/blckbx-network.conf
@@ -0,0 +1,73 @@
+conky.config = {
+background = true,
+total_run_times = 0,
+update_interval = 1,
+own_window = true ,
+own_window_type = 'override',
+own_window_argb_visual = true,
+own_window_argb_value = 0,
+own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager',
+double_buffer = true,
+draw_shades = true,
+draw_outline = false,
+draw_borders = false,
+draw_graph_borders = false,
+alignment = 'top_right',
+minimum_width = 260,
+gap_x = 330,
+gap_y = 40,
+no_buffers = true,
+uppercase = false,
+cpu_avg_samples = 1,
+net_avg_samples = 1,
+override_utf8_locale = true,
+color1 = 'EAEAEA',
+color2 = '00FF66',
+color3 = '11EAEA',
+color4 = 'EAEAEA',
+color5 = 'FF3F3F',
+color6 = '22FFFF',
+color7 = 'FF8888',
+text_buffer_size = 512,
+pad_percents = 0,
+short_units = true,
+format_human_readable = true,
+default_bar_height = 5,
+default_bar_width = 200,
+if_up_strictness = 'link',
+font = 'Inconsolata:size=9',
+use_xft = true,
+}
+
+conky.text = [[
+${color5}Network:\
+${if_up wlp3s0}
+${color3}wlp3s0: ${color1}${addr wlp3s0}
+${color3}essid: ${color1}${wireless_essid wlp3s0}
+${color3}ext: ${color1}${execpi 360 ~/bin/checkip}
+${color3}gway: ${color1}${exec route -n | grep wlp3s0 | grep UG | awk '{print $2}'}
+${color3}dns: ${color1}${nameserver 0}
+${color3}speed: ${color1}${exec iwconfig wlp3s0 | grep "Bit Rate" | cut -d"=" -f2 | cut -d" " -f1} Mb/s
+${color3}frq: ${color1}${wireless_freq wlp3s0}
+${color3}channel: ${color1}${wireless_channel wlp3s0}
+${color3}quality: ${color1}${wireless_link_qual wlp3s0}
+${color3}level: ${color1}${exec iwconfig wlp3s0 | grep "Signal" | cut -d"=" -f3 }
+${color3}rate: ${color1}${downspeed wlp3s0} / ${upspeed wlp3s0}\
+
+${endif}\
+${if_up enp0s25}
+${color3}enp0s25: ${color1}${addr enp0s25}
+${color3}external: ${color1}${execpi 360 ~/bin/checkip}
+${color3}gateway: ${color1}${exec route -n | grep enp0s25 | grep UG |awk '{print $2}'}
+${color3}dns: ${color1}${nameserver 0}
+${color3}rate: ${color1}${downspeed enp0s25} / ${upspeed enp0s25}\
+
+${endif}\
+
+${color5}OpenVPN:
+${color3}sleepmap: ${color1}${execpi 30 systemctl is-active openvpn-client@sleepmap}
+${color3}secure: ${color1}${execpi 30 systemctl is-active openvpn-client@secure}
+
+${color5}Connections:
+${execpi 5 lsof -ni| grep ESTABLISHED| grep -v 127.0.0.1| awk '{print "${color3}"$1,"${color1}"$9;}' }
+]]
diff --git a/.gitignore b/.gitignore
index 36d054e..f8a5913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,11 +42,9 @@ Pictures/
 Videos/
 backup/
 bin/pass2offlineimapc
-build/
-git/
-make/
 cloud/
-svn/
+git/
+packages/
 
 .ICEauthority
 .Mathematica/
diff --git a/.gnupg/dirmngr_ldapservers.conf b/.gnupg/dirmngr_ldapservers.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.gnupg/dirmngr_ldapservers.conf
diff --git a/.makepkg.conf b/.makepkg.conf
index 8d10dc5..fba4240 100644
--- a/.makepkg.conf
+++ b/.makepkg.conf
@@ -1,2 +1,3 @@
 PACKAGER="David Runge <dave@sleepmap.de>"
 GPGKEY="0x54C28F4FF5A1A949"
+BUILDDIR=/tmp/makepkg
diff --git a/.ssh/config b/.ssh/config
index 12e1527..448e0fc 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -90,6 +90,20 @@ Host gdvzrv
   ControlPath ~/.ssh/socket-%r@%h:%p
   ProxyCommand ssh sleepmap.de -W %h:%p
 
+Host gtrvlr
+  Hostname trvlr
+  Port 22
+  user dave
+  ForwardAgent yes
+  IdentityFile ~/.ssh/id_ed25519
+  IdentitiesOnly yes
+  ServerAliveInterval 120
+  Compression yes
+  ForwardX11Trusted yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
+  ProxyCommand ssh sleepmap.de -W %h:%p
+
 Host gpitheunlord
   Hostname pitheunlord
   Port 22