~kiwec/dotfiles

0fd8b8a721545e8e20d5b4b7ccc9af224986b6a4 — Kiwec 5 years ago d0cd43c
Dotfiles update
2 files changed, 25 insertions(+), 9 deletions(-)

M .bashrc
M .config/nvim/init.vim
M .bashrc => .bashrc +1 -0
@@ 26,6 26,7 @@ PROMPT_COMMAND='set_prompt'
alias ls='ls -Ahlq --color=tty'
alias pamixer='python2 ~/.bin/pulseaudio-mixer-cli.py'
alias cal='cal -m'
alias kssh='ssh root@ocean.kiwec.net'
alias redsky='node ~/Documents/GitHub/redskycli/index.js'
alias ga='git add --all'
alias vi='nvim'

M .config/nvim/init.vim => .config/nvim/init.vim +24 -9
@@ 8,16 8,15 @@ Plugin 'dhruvasagar/vim-table-mode'
Plugin 'Shougo/deoplete.nvim'
Plugin 'Shougo/neosnippet'
Plugin 'Shougo/neosnippet-snippets'
Plugin 'honza/vim-snippets'
Plugin 'scrooloose/syntastic'
Plugin 'scrooloose/nerdtree'
Plugin 'ctrlpvim/ctrlp.vim'
Plugin 'mattn/emmet-vim'
Plugin 'Yggdroot/indentLine'
Plugin 'tpope/vim-surround'
Plugin 'tpope/vim-fugitive'
Plugin 'bling/vim-airline'
Plugin 'wookiehangover/jshint.vim'
Plugin 'nathanaelkane/vim-indent-guides'
Plugin 'pangloss/vim-javascript'
Plugin 'tpope/vim-endwise'
Plugin 'junegunn/vim-easy-align'


@@ 36,8 35,20 @@ let g:table_mode_corner="|"
let g:deoplete#enable_at_startup = 1
let g:neocomplete#enable_smart_case = 1
let g:neocomplete#sources#syntax#min_keyword_length = 3
inoremap <silent> <CR> <C-r>=<SID>custom_return()<CR>
function! s:custom_return()
  return (pumvisible() ? "\<C-y>" : "" ) . "\<CR>"
endfunction
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"

" NeoSnippets
imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
\ "\<Plug>(neosnippet_expand_or_jump)"
\: pumvisible() ? "\<C-n>" : "\<TAB>"
smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
\ "\<Plug>(neosnippet_expand_or_jump)"
\: "\<TAB>"

" Syntastic
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}


@@ 46,6 57,8 @@ let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 1
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
let g:syntastic_cpp_compiler = 'clang++'
let g:syntastic_cpp_compiler_options = ' -std=c++14 -stdlib=libc++'

" NERDTree
map <C-n> :NERDTreeToggle<CR>


@@ 62,12 75,9 @@ autocmd FileType html,css EmmetInstall
" Solarized colorscheme
syntax enable
set background=dark
let g:solarized_termcolors=256
let g:solarized_termcolors = 256
colorscheme solarized

" IndentLine
let g:indentLine_char = '│'

" Easy-align
xmap ga <Plug>(EasyAlign)
nmap ga <Plug>(EasyAlign)


@@ 78,6 88,11 @@ let g:airline_powerline_fonts = 1
" JSHint
let JSHintUpdateWriteOnly=1

" Ident Guides
let g:indent_guides_enable_on_vim_startup = 1
let g:indent_guides_auto_colors = 0
hi IndentGuidesEven ctermbg=black

set number
set linebreak
set showbreak=+++


@@ 93,11 108,11 @@ set autoindent
set cindent
set shiftwidth=2
set smartindent
set smarttab
set softtabstop=2
 
set tabstop=2
set noexpandtab 
set ruler
 
set undolevels=1000
set backspace=indent,eol,start
let mapleader = ","