diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-03-13 12:14:59 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-13 12:14:59 +0000 |
| commit | b4b6ad8508f11e703c300cb9ddf2cade876b318e (patch) | |
| tree | 6ed97284bab0543d51b6000cddf472720b482c20 /zshrc | |
| parent | 2163290664136a358648cf968572344d6406580e (diff) | |
| parent | 94e1faac9f163c66b053e1194e41fdfd633d1a4e (diff) | |
resolving conflicts
Diffstat (limited to 'zshrc')
| -rw-r--r-- | zshrc | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -39,9 +39,9 @@ alias -s py=vim # Directories alias u='cd ~/Dropbox/phd' alias uc='cd ~/Dropbox/phd/programs' -alias up='cd ~/Dropbox/phd/presentations' alias ul='cd ~/Dropbox/phd/literature' alias ur='cd ~/Dropbox/phd/reports' +alias up='cd ~/Dropbox/phd/presentations' alias papers='cd ~/Dropbox/phd/papers' alias books='cd ~/Dropbox/phd/books' alias cdd='cd ~/dotfiles' @@ -79,18 +79,18 @@ bindkey -a 'k' history-beginning-search-backward bindkey -a 'j' history-beginning-search-forward # Colorscheme -sleep 2 -h=`date +%H` -if [ $h -lt 9 ]; then - xdotool key Alt+t p Down Right Return - eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark` -elif [ $h -lt 17 ]; then - xdotool key Alt+t p Down Down Right Return - eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light` -else - xdotool key Alt+t p Down Right Return - eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark` -fi +# sleep 2 +# h=`date +%H` +# if [ $h -lt 9 ]; then +# xdotool key Alt+t p Down Right Return +# eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark` +# elif [ $h -lt 17 ]; then +# xdotool key Alt+t p Down Down Right Return +# eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light` +# else +# xdotool key Alt+t p Down Right Return +# eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark` +# fi # Crontab jobs crontab ~/dotfiles/crontab |