diff options
| author | Julian Teu <julianteu@protonmail.com> | 2018-04-07 11:19:54 +0200 |
|---|---|---|
| committer | Julian Teu <julianteu@protonmail.com> | 2018-04-07 11:19:54 +0200 |
| commit | 754ae9b40221d38dc176e6c04f17b341f2390242 (patch) | |
| tree | 5afdc7660746c4e6c5ca91f5d8a4721191eea4e3 | |
| parent | b93c3f2121601b8f4ebf73747de412f4cbadf28f (diff) | |
Added vim plugin and setup git lol
| -rw-r--r-- | .vimrc | 2 | ||||
| -rw-r--r-- | .zshrc | 15 |
2 files changed, 14 insertions, 3 deletions
@@ -15,6 +15,8 @@ Plugin 'tpope/vim-surround' Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-speeddating' +Plugin 'vim-scripts/ReplaceWithRegister' + Plugin 'zchee/deoplete-jedi' Plugin 'sirtaj/vim-openscad' @@ -6,6 +6,7 @@ export TERM="xterm-256color" # Path to your oh-my-zsh installation. export ZSH=/home/julian/.oh-my-zsh +echo "Setting theme" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes @@ -49,12 +50,14 @@ ZSH_THEME="bullet-train" # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder +echo "Loading plugins" # 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=(git sudo) +echo "Loading zsh" source $ZSH/oh-my-zsh.sh # User configuration @@ -86,7 +89,7 @@ source $ZSH/oh-my-zsh.sh # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" - +echo "Setting up bullet train" BULLETTRAIN_PROMPT_ORDER=( git context @@ -104,7 +107,7 @@ PATH=/home/julian/Scripts:$PATH PATH=/home/julian/.gem/ruby/2.4.0/bin:$PATH #fortune -n 100 | cowsay - +echo "Loading powerline" if [[ -r /usr/share/powerline/bindings/zsh/powerline.zsh ]]; then source /usr/share/powerline/bindings/zsh/powerline.zsh fi @@ -114,8 +117,14 @@ alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME' alias python="python3" alias pip="pip3" alias sudo="sudo " +alias vim="nvim" #alias emacs="emacsclient -c" #alias cmacs="emacsclient -nw -c" +#Setup git lol +git config --global alias.lol "log --graph --decorate --abbrev-commit --all" + +#eval $(thefuck --alias) -eval $(thefuck --alias) +echo "Done" +clear |