fixed merge conflict
This commit is contained in:
commit
48cff4710f
15
.bashrc##
15
.bashrc##
|
|
@ -97,8 +97,8 @@ fi
|
|||
# ~/.bash_aliases, instead of adding them here directly.
|
||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||
|
||||
if [ -f ~/.bash_aliases ]; then
|
||||
. ~/.bash_aliases
|
||||
if [ -f ~/.aliases ]; then
|
||||
. ~/.aliases
|
||||
fi
|
||||
|
||||
# split tmux window for monitoring with watch or any command
|
||||
|
|
@ -131,17 +131,6 @@ fi
|
|||
|
||||
TERM=xterm-256color
|
||||
|
||||
# Junit setup
|
||||
export JUNIT_HOME=/home/andrei/.junit
|
||||
export CLASSPATH=$JUNIT_HOME/junit4.12.jar:$JUNIT_HOME/hamcrest-core-1.3.jar
|
||||
|
||||
# editor setup
|
||||
export VISUAL=vim
|
||||
export EDITOR="$VISUAL"
|
||||
|
||||
export PATH=/usr/local/cuda-8.0/bin${PATH:+:${PATH}}
|
||||
export LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
export LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/lib/nvidia-384:/usr/local/cuda/extras/CUPTI/lib64"
|
||||
export CUDA_HOME=/usr/local/cuda
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
# ZSH Theme - Preview: https://raw.githubusercontent.com/KorvinSilver/blokkzh/master/preview.png
|
||||
# Mod of the gnzh theme
|
||||
|
||||
setopt prompt_subst
|
||||
|
||||
(){
|
||||
|
||||
local PR_USER PR_USER_OP PR_PROMPT PR_HOST PR_AT
|
||||
local userName hostName atSign promptSign
|
||||
local returnSymbol promptSymbolFrom promptSymbolTo promptSymbol rvmSymbol
|
||||
|
||||
# Switch to ASCII characters in Linux term
|
||||
if [[ ${TERM} == "linux" ]];
|
||||
then
|
||||
returnSymbol='<<'
|
||||
promptSymbolFrom='/-'
|
||||
promptSymbolTo='\-'
|
||||
promptSymbol='>'
|
||||
rvmSymbol='%F{red}rvm%f'
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX='-[%F{yellow}git '
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX='%f]'
|
||||
ZSH_THEME_VIRTUALENV_PREFIX='-[%F{green}python '
|
||||
ZSH_THEME_VIRTUALENV_SUFFIX='%f]'
|
||||
else
|
||||
returnSymbol='↵'
|
||||
promptSymbolFrom='┌─'
|
||||
promptSymbolTo='└─'
|
||||
promptSymbol='➤'
|
||||
rvmSymbol='%F{red}🔻%f'
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX='─[%F{yellow} '
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX='%f]'
|
||||
ZSH_THEME_VIRTUALENV_PREFIX='─[%F{green}🐍 '
|
||||
ZSH_THEME_VIRTUALENV_SUFFIX='%f]'
|
||||
fi
|
||||
|
||||
# Check the UID
|
||||
if [[ $UID -ne 0 ]]; then # normal user
|
||||
PR_USER='%F{yellow}%n%f'
|
||||
PR_USER_OP='%F{yellow}%#%f'
|
||||
PR_PROMPT="${promptSymbol}"
|
||||
PR_AT='@'
|
||||
else # root
|
||||
PR_USER=''
|
||||
PR_USER_OP=''
|
||||
PR_PROMPT="%F{red}${promptSymbol}%f"
|
||||
PR_AT=''
|
||||
fi
|
||||
|
||||
# Check if we are on SSH or not
|
||||
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
PR_HOST='%B%F{magenta}%M%f%b' # SSH, root
|
||||
else
|
||||
PR_HOST='%F{green}%M%f' # SSH, normal user
|
||||
fi
|
||||
elif [[ $UID -eq 0 ]]; then
|
||||
PR_HOST='%B%F{red}%M%f%b' # no SSH, root
|
||||
else
|
||||
PR_HOST='%F{cyan}%M%f' # no SSH, normal user
|
||||
fi
|
||||
|
||||
local return_code="%(?..%F{red}%? ${returnSymbol}%f)"
|
||||
|
||||
local user_host="${PR_USER}${PR_AT}${PR_HOST}"
|
||||
local current_dir="%B%F{blue}%~%f%b"
|
||||
local rvm_ruby=''
|
||||
if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect user-local rvm installation
|
||||
rvm_ruby='─['${rvmSymbol}' %F{red}$(${HOME}/.rvm/bin/rvm-prompt i v g s)%f]'
|
||||
elif which rvm-prompt &> /dev/null; then # detect system-wide rvm installation
|
||||
rvm_ruby='─['${rvmSymbol}' %F{red}$(rvm-prompt i v g s)%f]'
|
||||
elif which rbenv &> /dev/null; then # detect Simple Ruby Version Management
|
||||
rvm_ruby='─['${rvmSymbol}' %F{red}$(rbenv version | sed -e "s/ (set.*$//")%f]'
|
||||
fi
|
||||
|
||||
local git_branch='$(git_prompt_info)'
|
||||
local venv_python='$(virtualenv_prompt_info)'
|
||||
|
||||
PROMPT="${promptSymbolFrom}[${user_host}]${rvm_ruby}${venv_python}─[${current_dir}]${git_branch}
|
||||
${promptSymbolTo}$PR_PROMPT "
|
||||
|
||||
RPROMPT="${return_code}"
|
||||
}
|
||||
4
.vimrc
4
.vimrc
|
|
@ -18,10 +18,10 @@ Plugin 'itchyny/lightline.vim'
|
|||
|
||||
Plugin 'airblade/vim-gitgutter'
|
||||
|
||||
Plugin 'altercation/vim-colors-solarized'
|
||||
|
||||
Plugin 'suan/vim-instant-markdown'
|
||||
|
||||
Plugin 'kien/rainbow_parentheses.vim'
|
||||
|
||||
" All of your Plugins must be added before the following line
|
||||
call vundle#end() " required
|
||||
filetype plugin indent on " required
|
||||
|
|
|
|||
|
|
@ -0,0 +1,95 @@
|
|||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH=/home/andrei/.oh-my-zsh
|
||||
|
||||
# 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
|
||||
ZSH_THEME="blokkzh"
|
||||
|
||||
# Set list of themes to load
|
||||
# Setting this variable when ZSH_THEME="blokkzh"
|
||||
# cause zsh load theme from this variable instead of
|
||||
# looking in ~/.oh-my-zsh/themes/
|
||||
# An empty array have no effect
|
||||
# ZSH_THEME="blokkzh"
|
||||
|
||||
# Uncomment the following line to use case-sensitive completion.
|
||||
# CASE_SENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion. Case
|
||||
# sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="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="true"
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting 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=(
|
||||
git
|
||||
)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
# You may need to manually set your language environment
|
||||
# export LANG=en_US.UTF-8
|
||||
|
||||
# Preferred editor for local and remote sessions
|
||||
# if [[ -n $SSH_CONNECTION ]]; then
|
||||
# export EDITOR='vim'
|
||||
# else
|
||||
# export EDITOR='mvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
||||
# ssh
|
||||
# export SSH_KEY_PATH="~/.ssh/rsa_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"
|
||||
source $HOME/.aliases
|
||||
Loading…
Reference in New Issue