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

This commit is contained in:
2016-10-04 17:29:59 -04:00
8 changed files with 1260 additions and 44 deletions

View File

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

View File

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

View File

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

View File

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

1214
.vim/colors/materialbox.vim Normal file

File diff suppressed because it is too large Load Diff

2
.vimrc
View File

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

4
.zshrc
View File

@@ -57,10 +57,6 @@ fi
# Turn off the ability for other people to message your terminal using wall # Turn off the ability for other people to message your terminal using wall
mesg n 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 export SMLNJ_HOME=/usr
# The following lines were added by compinstall # The following lines were added by compinstall

View File

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