Merge branch 'master' of github.com:aarongut/dotfiles

.config/redshift.conf

@@ -1,6 +1,6 @@
 [redshift]
 temp-day=6500
-temp-night=4000
+temp-night=3500
 
 transition=0
 

.i3/config

@@ -49,7 +49,7 @@ bindsym XF86AudioNext exec --no-startup-id mpc next
 bindsym XF86AudioPrev exec --no-startup-id mpc prev
 
 # lock
-bindsym XF86ScreenSaver exec i3lock -c 2e93f4
+bindsym XF86ScreenSaver exec --no-startup-id lock -c 2e93f4
 
 # print screen
 bindsym Print exec scrot
@@ -197,7 +197,7 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 # move workspace between windows
-bindsym $mod+m move workspace to output left
+bindsym $mod+m move workspace to output up
 
 set $base #5f88Af
 set $base_text #C1D6EA
@@ -212,9 +212,9 @@ bar {
 # Laptop Screen
 	output LVDS1
 	output LVDS2
+	output LVDS-1
+	output DP-1
 	status_command py3status
-	tray_output LVDS1
-	tray_output LVDS2
 	colors {
 		background $base
 		statusline $base_text

.vim/indent/ocaml.vim

@@ -0,0 +1,4 @@
+setlocal expandtab
+setlocal tabstop=4
+setlocal softtabstop=2
+setlocal shiftwidth=2

bin/lock

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+IMG=/tmp/lock.png
+SCREENSHOT="scrot $IMG"
+
+$SCREENSHOT
+convert -scale 10% -scale 1000% $IMG $IMG
+i3lock -i $IMG
+rm -f $IMG

bin/resetscreen

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-xrandr --output VGA1 --left-of LVDS1 --auto
+xrandr --output DP-1 --above LVDS-1 --auto
 
-feh --randomize --bg-fill ~/Pictures/Backgrounds/*
+feh --randomize --bg-fill ~/Backgrounds/*