diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 39b0013..22d16fa 100644 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -3,43 +3,43 @@ set autoindent set autowrite " automatically write files when changing set background=dark +set backspace=indent,eol,start +set belloff=all +" set colorcolumn=120 +set expandtab " replace tabs with spaces automatically +set exrc +set foldmethod=manual +set hidden +set history=100 " command history +set icon +set incsearch +set nobackup +set nocompatible +set nofixendofline +set nohlsearch +set noswapfile +set nowrap +set number +set relativenumber set ruler " turns on col and row in lower right " used with `set ruler` set ruf=%30(%=%#LineNr#%.50F\ [%{strlen(&ft)?&ft:'none'}]\ %l:%c\ %p%%%) -set showmode " show command and insert mode -set tabstop=2 -set softtabstop=2 +set scrolloff=8 set shiftwidth=2 -set expandtab " replace tabs with spaces automatically -set textwidth=72 +set showmode " show command and insert mode +set signcolumn=no set smartindent set smarttab -set nofixendofline -set foldmethod=manual -set exrc -set relativenumber -set nohlsearch -set hidden -set nocompatible -set nu -set nowrap -set noswapfile -set nobackup +set softtabstop=2 +set tabstop=2 +set termguicolors +set textwidth=200 +set ttyfast " faster scrolling set undodir=~/.vim/undodir set undofile -set icon -set incsearch -set termguicolors -set scrolloff=8 -set signcolumn=yes -set colorcolumn=80 -set noerrorbells -set number -set wildmenu -set ttyfast " faster scrolling set viminfo='20,<1000,s1000 " prevents truncated yanks, deletes, etc. -set hidden -set history=100 " command history +set wildmenu + syntax enable filetype plugin on " sense the filesystem let mapleader = " " @@ -68,9 +68,15 @@ colorscheme gruvbox " highlight Normal guibg=none " ----------------------- utilities ---------------------------------- -" Edit/Reload vimr configuration file -nnoremap confe :e $HOME/.vimrc -nnoremap confr :source $HOME/.vimrc + +" fuzzy finder +let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } } + +" opens fuzzy finder under the current directory +nmap ff :call fzf#run(fzf#wrap({ 'source': 'find "$PWD" -type f' })) +" opens fuzzy finder for files under a git version control +nmap fg :call fzf#run(fzf#wrap({ 'source': 'git ls-files' })) + fun! TrimWhiteSpace() let l:save = winsaveview() diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 9a347b8..3f4d78d 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -161,6 +161,7 @@ alias g='git' alias ga='git add' alias gcb='git checkout -b' alias gco='git checkout' +alias gcm='git commit -m' #alias gma() { git add . && git commit -m "$1" } #alias gp() { git push } alias gs='git status'