regular update; quite many changes tbh
This commit is contained in:
ViktorBarzin
parent
eccf576f7c
commit
1cb47a0cc3
2 changed files with 73 additions and 19 deletions
37
.vimrc
37
.vimrc
|
|
@ -1,5 +1,5 @@
|
|||
" Source vimrc on vim startup
|
||||
autocmd! VimEnter * source ~/.vimrc
|
||||
" autocmd! VimEnter * source ~/.vimrc
|
||||
|
||||
" Load rename plugin
|
||||
so ~/.vim/Rename.vim
|
||||
|
|
@ -16,7 +16,6 @@ nnoremap <Leader>f :call ToggleFold()<CR>
|
|||
" Set relative line number and number to see current line number
|
||||
" set rnu
|
||||
set number
|
||||
|
||||
" Show commands as being written
|
||||
set showcmd
|
||||
|
||||
|
|
@ -148,7 +147,7 @@ if has('win32') || has ('win64')
|
|||
" ``<C>`` stands for ``CTRL`` and therefore ``<C-n>`` stands for ``CTRL+n``
|
||||
noremap <C-n> :nohl<CR>
|
||||
vnoremap <C-n> :nohl<CR>
|
||||
inoremap <C-n> :nohl<CR>
|
||||
"inoremap <C-n> :nohl<CR>
|
||||
|
||||
" Tab switching
|
||||
noremap<C-tab> :b#
|
||||
|
|
@ -210,6 +209,9 @@ au InsertLeave * match ExtraWhitespace /\s\+$/
|
|||
set t_Co=256
|
||||
color wombat256mod
|
||||
|
||||
" Spelling
|
||||
" set spell
|
||||
" set complete+=kpspell
|
||||
|
||||
" Enable syntax highlighting
|
||||
" You need to reload this file for the change to apply
|
||||
|
|
@ -222,6 +224,8 @@ syntax on
|
|||
" W391 - blank line at end of file
|
||||
let g:syntastic_python_flake8_args='--ignore=W391, E501'
|
||||
let g:syntastic_python_flake8_show_quickfix=0
|
||||
let g:pymode_lint_ignore="E501,W601,W391"
|
||||
let g:pymode_rope_lookup_project = 0
|
||||
|
||||
" Make quickfix screen smaller
|
||||
let g:syntastic_loc_list_height=1
|
||||
|
|
@ -271,10 +275,10 @@ set smartcase
|
|||
" Backup files are great so lets keep them in 1 place
|
||||
" Make sure you have ~/vimtmp/ folder. In the future will
|
||||
" move /vimtmp/ in $VIMHOME
|
||||
set backupdir=~/vimtmp//,.
|
||||
set directory=~/vimtmp//,.
|
||||
set dir=~/vimtmp//,.
|
||||
set undodir=~/vimtmp/undo//
|
||||
set backupdir=~/.vim/tmp//,.
|
||||
set directory=~/.vim/tmp//,.
|
||||
set dir=~/.vim/tmp//,.
|
||||
set undodir=~/.vim/tmp/undo//
|
||||
|
||||
|
||||
" Setup Pathogen to manage your plugins
|
||||
|
|
@ -407,3 +411,22 @@ vmap co :call CommentLines()<CR>
|
|||
" Encryption algo (vim -x file)
|
||||
set cm=blowfish2
|
||||
|
||||
" Improve perfomance with long lines
|
||||
set synmaxcol=200
|
||||
|
||||
|
||||
set autoread
|
||||
|
||||
" Autosave
|
||||
" augroup autoSaveAndRead
|
||||
" autocmd!
|
||||
" autocmd TextChanged,InsertLeave,FocusLost * silent! wall
|
||||
" autocmd CursorHold * silent! checktime
|
||||
" augroup END
|
||||
|
||||
" Lion alignment operator config (see https://github.com/tommcdo/vim-lion)
|
||||
let b:lion_squeeze_spaces = 1
|
||||
|
||||
set showmatch
|
||||
set matchtime=3
|
||||
|
||||
|
|
|
|||
55
.zshrc
55
.zshrc
|
|
@ -1,10 +1,12 @@
|
|||
VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python3.5
|
||||
#[[ $TERM != "screen" ]] && exec tmux
|
||||
VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3
|
||||
export WORKON_HOME=$HOME/.virtualenvs
|
||||
source /usr/local/bin/virtualenvwrapper.sh
|
||||
# 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=/root/.oh-my-zsh
|
||||
export ZSH=~/.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.
|
||||
|
|
@ -13,10 +15,16 @@ ZSH_THEME="bira"
|
|||
|
||||
# Uncomment the following line to use case-sensitive completion.
|
||||
# CASE_SENSITIVE="true"
|
||||
#
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
|
||||
|
||||
HISTSIZE=9000
|
||||
HISTFILESIZE=9000
|
||||
#HISTFILE="~/.bash_history"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion. Case
|
||||
# sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="true"
|
||||
HYPHEN_INSENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to disable bi-weekly auto-update checks.
|
||||
# DISABLE_AUTO_UPDATE="true"
|
||||
|
|
@ -44,7 +52,7 @@ COMPLETION_WAITING_DOTS="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"
|
||||
HIST_STAMPS="dd.mm.yyyy"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
# ZSH_CUSTOM=/path/to/new-custom-folder
|
||||
|
|
@ -53,7 +61,7 @@ COMPLETION_WAITING_DOTS="true"
|
|||
# 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)
|
||||
plugins=()
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
|
|
@ -65,11 +73,12 @@ source $ZSH/oh-my-zsh.sh
|
|||
# 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
|
||||
if [[ -n $SSH_CONNECTION ]]; then
|
||||
export EDITOR='vim'
|
||||
else
|
||||
# export EDITOR='mvim'
|
||||
export EDITOR='vim'
|
||||
fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
|
@ -89,5 +98,27 @@ eval "$(jump shell)"
|
|||
|
||||
# Load aliases
|
||||
. ~/.bash_aliases
|
||||
export PS1="%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%} $terminfo[bold]%2~ $(git_prompt_info)%{$reset_color%}
|
||||
╰─%B#%b ";
|
||||
#export PS1="%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%} $terminfo[bold]%2~ %{$reset_color%}
|
||||
#export PS1="%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%} $terminfo[bold]%2~ $(git_prompt_info)%{$reset_color%}
|
||||
#export PS1="%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%} $terminfo[bold]%2~ $(git_super_status)%{$reset_color%}
|
||||
#╰─%B#%b ";
|
||||
#PROMPT='%B%m%~%b$(git_super_status) '
|
||||
|
||||
j () {
|
||||
local dir="$(jump cd $@)"
|
||||
test -d "$dir" && cd "$dir"
|
||||
}
|
||||
|
||||
# . ~/.bash_completion
|
||||
|
||||
source $ZSH/custom/plugins/zsh-git-prompt/zshrc.sh
|
||||
|
||||
|
||||
# Locale settings for perl
|
||||
#export LC_CTYPE=en_US.UTF-8
|
||||
|
||||
#export LC_ALL=C
|
||||
#export LC_ALL=en_US.UTF-8
|
||||
#sudo usermod -aG docker viktor
|
||||
#newgrp docker
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue