diff options
| -rw-r--r-- | vim/vimrc | 2 | ||||
| -rw-r--r-- | zshrc | 83 |
2 files changed, 22 insertions, 63 deletions
@@ -95,7 +95,7 @@ set tabstop=4 set softtabstop=4 set shiftwidth=4 set autoindent -set cindent +" set cindent " Folds set foldcolumn=0 @@ -1,78 +1,34 @@ -# Key remapping - -# Path to your oh-my-zsh installation. +# Path to oh-my-zsh export ZSH=$HOME/.oh-my-zsh -# 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. +# Theme ZSH_THEME="eastwood" -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. +# Enable correction ENABLE_CORRECTION="true" -# Uncomment the following line to display red dots whilst waiting for completion. +# Dots for completion COMPLETION_WAITING_DOTS="true" -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# HIST_STAMPS="mm/dd/yyyy" - # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder -# 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) -# Add wisely, as too many plugins slow down shell startup. +# Plugins plugins=(vi-mode git) +# Source oh-my-zsh source $ZSH/oh-my-zsh.sh # User configuration - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 +# Editor export EDITOR=/usr/bin/vim # ssh # export SSH_KEY_PATH="~/.ssh/dsa_id" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - +# Apps for filetypes alias -s vim=vim alias -s cpp=vim alias -s c=vim @@ -80,7 +36,7 @@ alias -s tex=vim alias -s pdf=zathura alias -s py=vim -# Easy access to directories +# Directories alias u='cd ~/Dropbox/phd' alias uc='cd ~/Dropbox/phd/programs' alias up='cd ~/Dropbox/phd/presentations' @@ -88,7 +44,10 @@ alias ul='cd ~/Dropbox/phd/literature' alias ur='cd ~/Dropbox/phd/reports' alias cdd='cd ~/dotfiles' -# Easy access to programs +# Commands +alias tmux="TERM=screen-256color-bce tmux" +alias g='git' +alias v=$EDITOR alias tmux="TERM=screen-256color-bce tmux" alias g='git' alias v='vim' @@ -102,14 +61,14 @@ alias mail='offlineimap' # alias clear='print "\ec"' # Configuration -alias zconf='vim ~/.zshrc' -alias mconf='vim ~/.mutt/muttrc' -alias vconf='vim ~/.vim/vimrc' -alias zaconf='vim ~/.zathurarc' -alias tconf='vim ~/.tmux.conf' -alias viconf='vim ~/.vifm/vifmrc' -alias oconf='vim ~/.offlineimaprc' -alias xconf='vim ~/.xmodmap' +alias ez='vim ~/.zshrc' +alias em='vim ~/.mutt/muttrc' +alias ev='vim ~/.vim/vimrc' +alias eza='vim ~/.zathurarc' +alias et='vim ~/.tmux.conf' +alias evi='vim ~/.vifm/vifmrc' +alias eo='vim ~/.offlineimaprc' +alias ex='vim ~/.xmodmap' # Fix smart search history bindkey -a 'k' history-beginning-search-backward |