Merge branch 'master' of gitlab.cs.fau.de:ik15ydit/config

.gitignore

@@ -40,6 +40,5 @@ user-dirs.dirs
 user-dirs.locale
 vlc/
 xarchiver/
-xconf/
 xfce4/
 xm1/

herbstluftwm/autostart

@@ -108,6 +108,14 @@ hc keybind $Mod-Shift-Tab   cycle_all -1
 hc keybind $Mod-c cycle
 #hc keybind $Mod-i jumpto urgent
 
+#pulseaudio
+hc keybind XF86AudioRaiseVolume spawn /bin/sh -c  'pactl set-sink-volume @DEFAULT_SINK@ +8%' #increase sound volume
+hc keybind $Mod-u spawn /bin/sh -c  'pactl set-sink-volume @DEFAULT_SINK@ +8%' 
+hc keybind XF86AudioLowerVolume spawn /bin/sh -c  'pactl set-sink-volume @DEFAULT_SINK@ 70%' #decrease sound volume
+hc keybind $Mod-Shift-u spawn /bin/sh -c  'pactl set-sink-volume @DEFAULT_SINK@ 70%' 
+hc keybind XF86AudioMute spawn /bin/sh -c  'pactl set-sink-mute @DEFAULT_SINK@ toggle'  #toggle mute
+hc keybind $Mod-m spawn /bin/sh -c  'pactl set-sink-mute @DEFAULT_SINK@ toggle' 
+
 # theme
 hc attr theme.tiling.reset 1
 hc attr theme.floating.reset 1

vim/rc

@@ -39,7 +39,7 @@ nnoremap Ctrl-l :nohlsearch
 
 "movement
 "move by visual line
-nnoremap w g<Up>:call HL_branch():@/
+nnoremap w g<Up>
 nnoremap s g<Down>
 nnoremap a <Left>
 nnoremap d <Right>
@@ -127,6 +127,9 @@ endif
 inoremap <F5> <C-O>:execute HL_branch()<CR>
 nnoremap <F5> :execute HL_branch()<CR>
 
+nnoremap w g<Up>:execute HL_branch()<CR>
+nnoremap s g<Down>:execute HL_branch()<CR>
+
 function HL_branch()
 let line=getline('.')
 "backslash muss escaped werden um + zu escapen in func

xconf/Xresources

@@ -0,0 +1,3 @@
+Rxvt.*.background: #000000
+Rxvt.*.foreground: #EEEEEE
+Rxvt.*.scrollBar: off

zshrc

@@ -9,6 +9,9 @@ LD_PRELOAD='/home/ik15ydit/.config/libcoloredstderr.so'
 COLORED_STDERR_FDS=2,
 export LD_PRELOAD COLORED_STDERR_FDS
 
+#markingbird
+export PYTHONPATH=/local/python3-typing
+
 #seperation string between commands
 setopt promptsubst
 PS1=%F{green}$'${(r:$COLUMNS::\u2500:)}'%f$PS1