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

.Xresources

@@ -1,31 +1,38 @@
 URxvt.scrollBar: false
-urxvt.font: xft:DejavuSansMono:pixelsize=9
+urxvt.font: xft:DejavuSansMono:pixelsize=12
 URxvt.letterSpace: -1
 
-! tangoesque scheme
-*background: #111111
-*foreground: #eeeeee
-! Black (not tango) + DarkGrey
-*color0:  #000000
-*color8:  #444743
+*background: #282828
+*foreground: #eceff1
+
+! Black + DarkGrey
+*color0: #1d272b
+*color8: #263238
+
 ! DarkRed + Red
-*color1:  #ff6565
-*color9:  #ff8d8d
+*color1: #c62828
+*color9: #cc241d
+
 ! DarkGreen + Green
-*color2:  #93e44f
-*color10: #c8e7a8
+*color2: #2e7d32
+*color10: #43a0f7
+
 ! DarkYellow + Yellow
-*color3:  #eab93d
-*color11: #ffc123
+*color3: #f57f17
+*color11: #fdd835
+
 ! DarkBlue + Blue
-*color4:  #204ad4
-*color12: #3465a4
+*color4: #1565c0
+*color12: #1e88e5
+
 ! DarkMagenta + Magenta
-*color5:  #ce5c00
-*color13: #f57900
-!DarkCyan + Cyan (both not tango)
-*color6:  #89b6e2
-*color14: #46a4ff
+*color5: #6a1b9a
+*color13: #8e24aa
+
+! Dark Cyan + Cyan
+*color6: #303f9f
+*color14: #3949ab
+
 ! LightGrey + White
-*color7:  #cccccc
-*color15: #ffffff
+*color7: #eceff1
+*color15: #fafdff

.config/i3status/config

@@ -2,18 +2,18 @@ general {
         colors = true
         interval = 5
 	output_format = "i3bar"
-	color_good = "#FFE181"
-	color_degraded = "#C1D6EA"
-	color_bad = "#FFAA81"
+	color_good = "#43a0f7"
+	color_degraded = "#1565c0"
+	color_bad = "#c62828"
 }
 
 order += "disk /"
-order += "ethernet eth0"
+order += "ethernet enp0s3"
 order += "battery 0"
 order += "weather_yahoo"
 order += "time"
 
-ethernet eth0 {
+ethernet enp0s3 {
         # if you use %speed, i3status requires root privileges
         format_up = "E: %ip (%speed)"
         format_down = "E: down"

.i3/config

@@ -204,12 +204,12 @@ bindsym $mod+r mode "resize"
 # move workspace between windows
 bindsym $mod+m move workspace to output up
 
-set $base #5f88Af
-set $base_text #C1D6EA
-set $contrast #FFE181
-set $contrast_text #CBA62F
-set $bold #FFAA81
-set $bold_text #FFDECF
+set $base #282828
+set $base_text #eceff1
+set $contrast #303f9f
+set $contrast_text #eceff1
+set $bold #f57f17
+set $bold_text #eceff1
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)

.tmux.conf

@@ -37,12 +37,12 @@ bind b split-window -v
 
 #lookin' good
 set-window-option -g window-status-format " #I: #W "
-set-window-option -g status-fg colour243
-set-window-option -g status-bg colour235
+set-window-option -g status-fg colour7
+set-window-option -g status-bg colour3
 
 set-window-option -g window-status-current-format " #I: #W "
-set-window-option -g window-status-current-fg colour143
-set-window-option -g window-status-current-bg colour235
+set-window-option -g window-status-current-fg colour7
+set-window-option -g window-status-current-bg colour6
 
 set-option -g pane-active-border-fg colour94
 

.vimrc

@@ -23,11 +23,11 @@ set title
 
 " Search betterer
 set incsearch
+colorscheme materialbox
 set hlsearch
 set ignorecase
 set smartcase
 
-colorscheme materialbox
 set background=dark
 set t_ut=
 

.zshrc

@@ -57,10 +57,6 @@ fi
 # Turn off the ability for other people to message your terminal using wall
 mesg n
 
-# OPAM configuration
-. /home/amgutier/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
-eval `opam config env`
-
 export SMLNJ_HOME=/usr
 
 # The following lines were added by compinstall

install.sh

@@ -3,5 +3,4 @@ git submodule init;
 git submodule sync;
 git submodule update;
 
-rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE  --no-perms . ~;
-cp ./.gitconfig ~/.gitconfig;
+rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" --exclude "bin/" -avhE  --no-perms . ~;