Merge branch 'master' of tesuji.6.orbekk.com:/storage/projects/dotfiles

7 files changed, 127 insertions, 49 deletions

diff --git a/bin/setup.sh b/bin/setup.sh
index 217be3c..0aec1ef 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -65,6 +65,7 @@ create_symlink ../dotfiles/ssh/config .ssh/config
 if which i3 >/dev/null; then
   mkdir -p .i3
   create_symlink ../dotfiles/i3/config .i3/config
+  create_symlink dotfiles/i3status.conf .i3status.conf
 else
   printf "${orange}[SKIPPED]${none} i3 not installed.\n"
 fi
diff --git a/i3/config b/i3/config
index 61290fb..6f4cfa3 100644
--- a/i3/config
+++ b/i3/config
@@ -11,21 +11,21 @@
 
 # font for window titles. ISO 10646 = Unicode
 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-font xft:Droid Sans Bold 9
+font xft:Droid Sans Bold 7
 
 # use Mouse+Mod4 to drag floating windows to their wanted position
 floating_modifier Mod4
 
 # start a terminal
-bindsym Mod4+Return exec urxvt
+bindsym Mod4+Return exec gnome-terminal
 
-bindsym Pause exec i3lock
+bindsym Pause exec i3lock -c 2A3462
 
 # kill focused window
 bindsym Mod4+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym Mod4+d exec dmenu_run
+bindsym Mod4+d exec dmenu_run -fn -*-*-*-*-*-*-20-*-*-*-*-*-*-*
 
 # change focus
 bindsym Mod4+h focus left
@@ -160,10 +160,11 @@ mode "resize" {
 # finds out, if available)
 bar {
         status_command i3status
-        font xft:Droid Sans Mono 10
+        font xft:Droid Sans Mono 8
 }
 
 exec xrdb -merge $HOME/.Xresources
 exec setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
+exec xbindkeys
 exec google-chrome &
-exec xautolock -time 10 -locker 'i3lock' &
+exec xautolock -time 10 -locker 'i3lock -c 2A3462' &
diff --git a/i3status.conf b/i3status.conf
new file mode 100644
index 0000000..7cea47b
--- /dev/null
+++ b/i3status.conf
@@ -0,0 +1,67 @@
+general {
+        colors = true
+        interval = 5
+}
+
+order += "ipv6"
+order += "disk /"
+#order += "run_watch DHCP"
+#order += "run_watch VPN"
+order += "wireless wlp4s0"
+order += "ethernet enp0s25"
+order += "battery 0"
+order += "cpu_temperature 0"
+order += "load"
+order += "volume master"
+order += "time"
+
+volume master {
+    format = "♪: %volume"
+    format_muted = "♪: muted (%volume)"
+    device = "default"
+    mixer = "Master"
+    mixer_idx = 0
+}
+
+
+wireless wlp4s0 {
+        format_up = "%essid %ip"
+        format_down = ""
+}
+
+ethernet enp0s25 {
+        # if you use %speed, i3status requires root privileges
+        format_up = "E: %ip (%speed)"
+        format_down = ""
+}
+
+battery 0 {
+        last_full_capacity = true
+        low_threshold = 15
+        threshold_type = time
+        format = "%status %percentage %remaining (%consumption)"
+}
+
+run_watch DHCP {
+        pidfile = "/var/run/dhclient*.pid"
+}
+
+run_watch VPN {
+        pidfile = "/var/run/vpnc/pid"
+}
+
+time {
+	format = "%Y-%m-%d %H:%M:%S"
+}
+
+load {
+	format = "%1min"
+}
+
+cpu_temperature 0 {
+	format = "T: %degrees °C"
+}
+
+disk "/" {
+	format = "/: %free"
+}
diff --git a/taskrc b/taskrc
index 0150b97..3c1d1ca 100644
--- a/taskrc
+++ b/taskrc
@@ -23,7 +23,7 @@ report.gtd.sort=tags+,due+,project+,description+
 #include /usr/share/task/light-16.theme
 # include /usr/share/task/light-256.theme
 #include /usr/share/task/dark-16.theme
-#include /usr/share/task/dark-256.theme
+include /usr/share/task/dark-256.theme
 #include /usr/share/task/dark-red-256.theme
 #include /usr/share/task/dark-green-256.theme
 #include /usr/share/task/dark-blue-256.theme
@@ -32,46 +32,46 @@ report.gtd.sort=tags+,due+,project+,description+
 #include /usr/share/task/dark-gray-256.theme
 #include /usr/share/task/solarized-light-256.theme
 # Copy of light-256.theme:
-color=on
-color.header=color4
-color.footnote=color4
-color.error=color4
-color.debug=color4
-color.summary.bar=black on rgb141
-color.summary.background=white on color0
-color.history.add=color0 on rgb500
-color.history.done=color0 on rgb050
-color.history.delete=color0 on rgb550
-color.burndown.pending=on rgb200
-color.burndown.started=on rgb520
-color.burndown.done=on rgb011
-color.sync.added=rgb011
-color.sync.changed=rgb520
-color.sync.rejected=rgb200
-color.undo.before=color1
-color.undo.after=color2
-color.calendar.today=color15 on rgb013
-color.calendar.due=color0 on color9
-color.calendar.due.today=color15 on color1
-color.calendar.overdue=color0 on color1
-color.calendar.weekend=on color253
-color.calendar.holiday=color0 on color3
-color.calendar.weeknumber=rgb013
-color.recurring=rgb013
-color.overdue=color1
-color.due.today=rgb400
-color.due=color9
-color.active=rgb210
-color.pri.none=
-color.pri.H=color232
-color.pri.M=color237
-color.pri.L=color242
-color.tagged=rgb020
-color.blocked=gray12 on gray4
-color.blocking=gray12 on gray6
-color.project.none=
-color.tag.none=
-color.alternate=on color254
+#color=on
+#color.header=color4
+#color.footnote=color4
+#color.error=color4
+#color.debug=color4
+#color.summary.bar=black on rgb141
+#color.summary.background=white on color0
+#color.history.add=color0 on rgb500
+#color.history.done=color0 on rgb050
+#color.history.delete=color0 on rgb550
+#color.burndown.pending=on rgb200
+#color.burndown.started=on rgb520
+#color.burndown.done=on rgb011
+#color.sync.added=rgb011
+#color.sync.changed=rgb520
+#color.sync.rejected=rgb200
+#color.undo.before=color1
+#color.undo.after=color2
+#color.calendar.today=color15 on rgb013
+#color.calendar.due=color0 on color9
+#color.calendar.due.today=color15 on color1
+#color.calendar.overdue=color0 on color1
+#color.calendar.weekend=on color253
+#color.calendar.holiday=color0 on color3
+#color.calendar.weeknumber=rgb013
+#color.recurring=rgb013
+#color.overdue=color1
+#color.due.today=rgb400
+#color.due=color9
+#color.active=rgb210
+#color.pri.none=
+#color.pri.H=color232
+#color.pri.M=color237
+#color.pri.L=color242
+#color.tagged=rgb020
+#color.blocked=gray12 on gray4
+#color.blocking=gray12 on gray6
+#color.project.none=
+#color.tag.none=
+#color.alternate=on color254
 
 # Custom colors
 color.blocking=rgb111 on rgb543
diff --git a/vimrc b/vimrc
index 8daa02e..f821440 100755
--- a/vimrc
+++ b/vimrc
@@ -6,6 +6,7 @@ set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 " TODO(orbekk): Try ctrlp.vim instead.
 " Plugin 'wincent/command-t'
+Plugin 'chriskempson/base16-vim'
 Plugin 'chriskempson/vim-tomorrow-theme'
 Plugin 'gmarik/Vundle.vim'
 Plugin 'ctrlpvim/ctrlp.vim'
@@ -47,11 +48,13 @@ map <leader>r :CtrlPMRU<CR>
 
 set wildignore+=*.class,target/*,project/*
 
-set guifont=DroidSansMono\ 10
+"set guifont=DroidSansMono\ 10
+set guifont="Source Code Pro 10"
 set guioptions-=m
 set guioptions-=T
 set guioptions-=r
-colorscheme Tomorrow
+set background=dark
+colorscheme base16-tomorrow
 
 set colorcolumn=81
 
diff --git a/xbindkeysrc-pincer b/xbindkeysrc-pincer
new file mode 100644
index 0000000..ecf693f
--- /dev/null
+++ b/xbindkeysrc-pincer
@@ -0,0 +1,5 @@
+"xbacklight -inc 20"
+  XF86MonBrightnessUp
+
+"xbacklight -dec 20"
+  XF86MonBrightnessDown
diff --git a/zshrc b/zshrc
index f454158..4856cd2 100755
--- a/zshrc
+++ b/zshrc
@@ -52,6 +52,7 @@ setopt DVORAK
 # alias ls="ls --color"
 if which gvim >/dev/null; then
   alias vi="gvim --remote"
+  alias e="gvim --remote"
 fi
 alias ff="fileutil --gfs_user=gfp-reporting"
 alias diff=colordiff