From a67cb5be3917cb41cdee679ed8abeb5406e30d45 Mon Sep 17 00:00:00 2001
From: Frieder Schlesier <fschl.code@gmail.com>
Date: Tue, 15 Dec 2015 01:21:21 +0100
Subject: [PATCH] update configs

---
 .gitconfig | 22 ++++++++++++++++++----
 .i3/config | 22 ++++++++++++++++++++--
 .profile   |  2 ++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 87dc2da..38a4eea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,21 @@
 [user]
-	name = fschl
-	email = fschl.code@gmail.com
+    name = Frieder Schlesier
+    email = fschl.code@gmail.com
+
+[github]
+    user = fschl
+
+    [merge]
+
+    # Include summaries of merged commits in newly created merge commit messages
+    log = true
+
+[diff]
+
+    # Detect copies as well as renames
+    renames = copies
+
 [credential]
-	helper = cache
+    helper = cache
 [color]
-	ui = true
+    ui = true
diff --git a/.i3/config b/.i3/config
index cbb5551..e1932f6 100644
--- a/.i3/config
+++ b/.i3/config
@@ -39,6 +39,8 @@ bindsym $mod+d exec dmenu_run
 # installed.
 # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 
+bindsym Ctrl+Shift+l exec i3lock -c 222222
+
 # change focus
 bindsym $mod+j focus left
 bindsym $mod+k focus down
@@ -109,6 +111,13 @@ 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
 
+# audio controls
+bindsym XF86AudioRaiseVolume exec amixer set Master 5+ #increase sound volume
+bindsym XF86AudioLowerVolume exec amixer set Master 5- #decrease sound volume
+bindsym XF86AudioMute exec amixer set Master 1+ toggle # mute sound
+bindsym XF86AudioMicMute exec amixer set Capture toggle # mute mic
+
+
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
@@ -157,7 +166,16 @@ bar {
 # run the merge for good colors
 #exec xrdb -merge /home/jessie/.Xresources
 #exec xrdb -merge /home/jessie/.Xdefaults
+bindsym $mod+p exec xrandr --output LVDS1 --left-of VGA1 --auto
+bindsym $mod+shift+p exec xrandr --output VGA1 --off
+
+assign [class="^Iceweasel$"] 1
+assign [class="^emacs$"] 2
+assign [class="^Eclipse$"] 3
+assign [class="^Icedove$"] 4
 
 # startup programs
-#exec --no-starup-id i3-msg 'workspace "1: irssi"; exec rxvt-unicode;'
-#exec --no-startup-id i3msg 'workspace 3; exec rxvt-unicode;'    
+exec --no-startup-id xrandr --output VGA1 --auto
+exec --no-startup-id xrandr --output LVDS1 --left-of VGA1 --auto
+exec --no-startup-id i3-msg 'exec iceweasel; rename workspace 1 to "1: web"'
+exec --no-startup-id i3-msg 'exec emacs24; rename workspace 2 to "2: emacs"; workspace 2'
diff --git a/.profile b/.profile
index c9db459..ea408e2 100644
--- a/.profile
+++ b/.profile
@@ -20,3 +20,5 @@ fi
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
+
+#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx