From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 7 Jan 2016 18:07:34 +0000 (+0100)
Subject: update i3 and vimrc
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=59341d0430a1e1b51be924d969628bee99e7fe36;p=dotfiles.git

update i3 and vimrc
---

diff --git a/.config/i3/config b/.config/i3/config
index 4d180ad..62adfd0 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -12,7 +12,8 @@
 set $mod Mod4
 
 # lock the screen after 10 minutes
-exec xautolock -locker 'i3lock -c ccff00; systemctl suspend'
+exec xautolock -locker \
+	'sudo -K; echo RELOADAGENT | gpg-connect-agent; i3lock -c ccff00'
 # set a background
 exec convert -size 1600x900 plasma:fractal -modulate 20,100,10 png:- | display -window root
 # set the backlight
@@ -20,14 +21,16 @@ exec xbacklight -set 50
 # set the network switcher
 exec netctltray
 
-# Custom keybindings
+# lock the screen
 bindsym $mod+l exec xautolock -locknow
+
+# put a password in the clipboard
 bindsym $mod+p exec passmenu
 
-# Font for window titles.
+# font for window titles.
 font pango:DejaVu Sans Mono 8
 
-# Use Mouse+$mod to drag floating windows to their wanted position
+# use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 hide_edge_borders none
 
@@ -37,7 +40,7 @@ bindsym $mod+Return exec i3-sensible-terminal
 # kill focused window
 bindsym $mod+Shift+quotedbl kill
 
-# start dmenu (a program launcher)
+# start dmenu
 bindsym $mod+e exec dmenu_run -i -f -fn 'xft:DejaVu Sans Mono:style=Book:pixelsize=12'
 
 # change focus
@@ -58,12 +61,6 @@ bindsym $mod+Shift+t move down
 bindsym $mod+Shift+n move up
 bindsym $mod+Shift+s move right
 
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
 # split in horizontal orientation
 bindsym $mod+d split h
 
diff --git a/.config/i3status/config b/.config/i3status/config
index ea861b0..ba3cf2d 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -39,5 +39,5 @@ tztime local {
 }
 
 disk "/" {
-	format = "%percentage_free %total"
+	format = "%free/%total free"
 }
diff --git a/.vimrc b/.vimrc
index a484c4a..bf5bb9c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -23,6 +23,8 @@ set nowritebackup
 set noswapfile
 set colorcolumn=80
 set textwidth=79
+set shiftwidth=4
+set tabstop=4
 
 " List characters to mark trailing whitespace etc
 set listchars=nbsp:¬,tab:▸\ ,eol:↩,extends:»,precedes:«,trail:•