commit 2c1359b078da9e90fdd0a707c75ba9aa80d1bd60
parent 90fd25f817520e83dcfed2ed1a7657c7b2426233
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date: Sat, 12 Jan 2013 11:26:56 +0100
oh my zsh now used for zshrc
Diffstat:
6 files changed, 95 insertions(+), 53 deletions(-)
diff --git a/.Xdefaults b/.Xdefaults
@@ -3,32 +3,63 @@ Xcursor.theme: Vanilla-DMZ-AA
Xcursor.size: 22
! terminal colors ------------------------------------------------------------
-xterm*background: black
-xterm*foreground: white
+
+! tangoesque scheme
+*background: #111111
+*foreground: #babdb6
+! Black (not tango) + DarkGrey
+*color0: #000000
+*color8: #555753
+! DarkRed + Red
+*color1: #ff6565
+*color9: #ff8d8d
+! DarkGreen + Green
+*color2: #93d44f
+*color10: #c8e7a8
+! DarkYellow + Yellow
+*color3: #eab93d
+*color11: #ffc123
+! DarkBlue + Blue
+*color4: #204a87
+*color12: #3465a4
+! DarkMangenta + Mangenta
+*color5: #ce5c00
+*color13: #f57900
+!DarkCyan + Cyan (both not tango)
+*color6: #89b6e2
+*color14: #46a4ff
+! LightGrey + White
+*color7: #cccccc
+*color15: #ffffff
+
! xterm ----------------------------------------------------------------------
-xterm*termName: xterm-256color
-xterm*geometry: 80x25
-!xterm*faceName: terminus:bold:pixelsize=11
-!!xterm*font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-*
-!xterm*dynamicColors: true
-!!xterm*metaSendsEscape: true
-!!xterm*eightBitInput: false
-!!xterm*eightBitControl: false
-!!xterm*eightBitOutput: true
+!xterm*background: black
+!xterm*background: black
+!xterm*foreground: white
+!xterm*termName: xterm-256color
+!xterm*geometry: 80x25
+!!xterm*faceName: terminus:bold:pixelsize=11
+!!!xterm*font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-*
+!xterm*font: 8x15
+!!xterm*dynamicColors: true
+!!!xterm*metaSendsEscape: true
+!!!xterm*eightBitInput: false
+!!!xterm*eightBitControl: false
+!!!xterm*eightBitOutput: true
-!xterm*utf8: 1
-xterm*utf8: 2
-xterm*eightBitInput: true
+!!xterm*utf8: 1
+!xterm*utf8: 2
+!xterm*eightBitInput: true
-xterm*saveLines: 512
-xterm*scrollKey: true
-xterm*scrollTtyOutput: false
-!xterm*scrollBar: true
-mxterm*rightScrollBar: true
-xterm*jumpScroll: true
-xterm*multiScroll: true
-xterm*toolBar: false
+!xterm*saveLines: 512
+!xterm*scrollKey: true
+!xterm*scrollTtyOutput: false
+!!xterm*scrollBar: true
+!xterm*rightScrollBar: true
+!xterm*jumpScroll: true
+!xterm*multiScroll: true
+!xterm*toolBar: false
! xpdf -----------------------------------------------------------------------
xpdf*enableFreetype: yes
diff --git a/.mutt/muttrc b/.mutt/muttrc
@@ -7,7 +7,7 @@ set my_realname = "Anders Damsgaard Christensen"
# NFIT password
# Gmail password
# Encrypt it using `gpg -o ~/.sec/pass.gpg -e pass.txt`.
-# Delete the plaintext pass.txt afterwards.
+# Delete the plaintext pass.txt afterwards, e.g. `shred pass.txt && rm pass.txt`.
set my_tmp_secret = `gpg -o ~/.sec/.tmp -d ~/.sec/pass.gpg`
# NFIT credentials
@@ -143,3 +143,4 @@ macro index M "T.*\n;WN" "Mark all messages as read"
# Last, but not least, get mutt to display its version on startup.
push <show-version>
+alias mfullumc Marissa Fullum-Campbell <mfullumc@ucsc.edu>
diff --git a/.vim/.netrwhist b/.vim/.netrwhist
@@ -1,6 +1,8 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =4
+let g:netrw_dirhist_cnt =6
let g:netrw_dirhist_1='/home/adc/code/simple_DEM/output'
let g:netrw_dirhist_2='/home/adc/.config/awesome'
let g:netrw_dirhist_3='/home/adc/.config/chromium'
let g:netrw_dirhist_4='/home/adc/code/dotfiles'
+let g:netrw_dirhist_5='/home/adc'
+let g:netrw_dirhist_6='/home/adc/.config'
diff --git a/.xinitrc b/.xinitrc
@@ -1,7 +1,7 @@
#!/bin/sh
# Set background color
-xsetroot -solid '#101010' &
+xsetroot -solid '#000000' &
# Disable beeps
xset -b
@@ -17,7 +17,7 @@ xbindkeys
xmodmap ~/.Xmodmap
# Set display color profile
-xcalib ~/doc/colorprofile.icc
+[ -f ~/doc/colorprofile.icc ] && xcalib ~/doc/colorprofile.icc
# Make sure this is before the 'exec' command or it won't be executed.
[ -f ~/.xprofile ] && . ~/.xprofile
@@ -35,6 +35,8 @@ dunst &
# Automatically suspend system after 20 mins of inactivity
#xautolock -time 20 -locker "sudo pm-suspend" &
+# Automatically lock the screen after 10 mins of inactivity
+xautolock -time 10 -locker "i3lock -c 000000" &
#DEFAULT_SESSION=awesome
DEFAULT_SESSION=i3
diff --git a/.xprofile b/.xprofile
@@ -4,4 +4,4 @@ export LC_ALL=
export LC_COLLATE="C"
export LC_CTYPE="en_US.UTF-8"
-#export TERMINAL=xterm
+export TERMINAL=xterm
diff --git a/.zshrc b/.zshrc
@@ -1,34 +1,40 @@
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=10000
-SAVEHIST=10000
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
-# Set vi-like movement on cmd lines
-#bindkey -v
-bindkey -e
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+#ZSH_THEME="robbyrussell"
+ZSH_THEME="gnzh"
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/adc/.zshrc'
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
-# Enable autocompletion
-autoload -Uz compinit
-compinit
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
-# End of lines added by compinstall
+# Comment this out to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
-# Make default promt use theme
-autoload -U promptinit
-promptinit
-prompt adam2
+# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
-# aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
-# path
-export PATH=~/bin:$PATH
-export PATH=~/code/metasploit:$PATH
-export PATH=~/.gem/ruby/1.9.1/bin:$PATH
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
