Merge branch 'master' of gitlab.com:marty-oehme/dotfiles

.config/i3/config

@@ -196,5 +196,14 @@ bindsym $mod+Shift+s exec --no-startup-id `[ $(printf "NO\nYES" | dmenu \
 # lock i3 screen
 bindsym $mod+Shift+p exec i3lock
 
+# enable function (/media) key functionality
+# TODO: set up next song, previous song, pause, etc
+# see: https://www.reddit.com/r/i3wm/comments/3a6nh3/help_how_to_use_function_keys_in_i3_config/
+bindsym XF86MonBrightnessUp exec `xbacklight -inc 10`
+bindsym XF86MonBrightnessDown exec `xbacklight -dec 10`
+bindsym XF86AudioMute exec `pulsemixer --toggle-mute`
+bindsym XF86AudioRaiseVolume exec `pulsemixer --change-volume +5`
+bindsym XF86AudioLowerVolume exec `pulsemixer --change-volume -5`
+
 # set a pretty wallpaper
 exec_always --no-startup-id feh --bg-scale ~/Pictures/wall.jpg

.config/i3status/config

@@ -0,0 +1,111 @@
+###############################################################################
+# ceerious i3 status config
+# see "man i3status" for documentation.
+#
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+###############################################################################
+
+general {
+    interval = 1
+    colors = true
+    color_good = '#88b090'
+    color_degraded = '#ccdc90'
+    color_bad = '#e89393'
+}
+
+order += "volume master"
+order += "disk /"
+#order += "disk /data"
+#order += "disk /home"
+#order += "run_watch DHCP"
+#order += "ipv6"
+#order += "run_watch VPN"
+order += "wireless wlp4s0"
+#order += "ethernet enp5s0"
+order += "battery 0"
+order += "cpu_temperature 0"
+order += "cpu_usage 0"
+order += "load"
+order += "tztime local"
+
+#wireless wlp4s0 {
+#    format_up = "%quality  %essid %ip"
+#    format_down = ""
+#}
+
+#ethernet enp5s0 {
+#    # if you use %speed, i3status requires root privileges
+#    format_up = "%ip (%speed)"
+#    format_down = ""
+#}
+
+battery 0 {
+    format = "%status %percentage %remaining"
+    format_down = ""
+    last_full_capacity = true
+    integer_battery_capacity = true
+    low_threshold = 11
+    threshold_type = percentage
+    hide_seconds = true
+    status_chr = " "
+    status_bat = " "
+    status_unk = " "
+    status_full = " "
+}
+
+run_watch DHCP {
+    pidfile = "/var/run/dhclient*.pid"
+}
+
+run_watch VPN {
+    pidfile = "/var/run/vpnc/pid"
+}
+
+#%Y-%m-%d %H:%M:%S'
+tztime local {
+    format = " %d/%m/%Y   %H:%M"
+}
+
+load {
+    format = " %1min"
+}
+
+cpu_usage {
+    format = " %usage"
+}
+
+cpu_temperature 0 {
+    format = " %degrees°C"
+}
+
+disk "/" {
+    format = " %avail"
+    prefix_type	= custom
+    low_threshold = 20
+    threshold_type = percentage_avail
+}
+
+#disk "/data" {
+#    format = " %avail"
+#    prefix_type = custom
+#    low_threshold = 20
+#    threshold_type = percentage_avail
+#}
+
+#disk "/data" {
+#        format = " %avail"
+#        prefix_type = custom
+#        low_threshold = 20
+#        threshold_type = percentage_avail
+#}
+
+volume master {
+    format = "%volume  "
+    format_muted = " "
+    device = "default"
+    mixer = "Master"
+    mixer_idx = 0
+}

.config/shell/rc.d/base-aliases.sh

@@ -28,5 +28,5 @@ alias cl="clear"
 
 # let me exit out of the shell same way as vim
 # TODO integrate session management with w?
-alias "q"="exit"
-alias "wq"="exit"
+alias ":q"="exit"
+alias ":wq"="exit"

.xinitrc

@@ -35,8 +35,8 @@ fi
 # Remaps Capslock key to control.
 # (only works for x environment - I haven't needed it for non-x yet)
 setxkbmap -option ctrl:nocaps
-# sets default to german layout, with possibility to switch to us
-setxkbmap -layout de,us
+# sets default to EURkey layout, with possibility to switch to german
+setxkbmap -layout eu,de
 # allows switching layouts with alt+space
 setxkbmap -option grp:alt_shift_toggle
 # quit out of X with ctrl+alt+backspace
@@ -56,7 +56,7 @@ type compton >/dev/null 2>&1 && compton &
 type flashfocus >/dev/null 2>&1 && flashfocus -l never &
 
 # additional config options for Touchpad devices ONLY
-if [ dmesg | grep "Touchpad" | wc -l > 0 ]; then
+if [ $(dmesg | grep "Touchpad" | wc -l) > 0 ]; then
   # enable touch tapping for XPS13 touchpad - for different devices get the touchpad name with xinput list-prop <TAB>
   xinput set-prop "DLL075B:01 06CB:76AF Touchpad" "libinput Tapping Enabled" 1
 fi