Skip to content

Commit

Permalink
some improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Coves Prieto committed Jun 9, 2019
1 parent 4336b49 commit e2a5357
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
16 changes: 16 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,19 @@ elif type compctl &>/dev/null; then
}
compctl -K _npm_completion npm
fi

# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/home/escorponox/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/home/escorponox/anaconda3/etc/profile.d/conda.sh" ]; then
. "/home/escorponox/anaconda3/etc/profile.d/conda.sh"
else
export PATH="/home/escorponox/anaconda3/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<

10 changes: 9 additions & 1 deletion .config/nvim/coc-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,13 @@
"diagnostic.virtualText": true,
"diagnostic.enableMessage": "always",
"coc.preferences.hoverTarget": "preview",
"javascript.suggestionActions.enabled": false
"javascript.suggestionActions.enabled": false,
"list.normalMappings": {
"t": "action:tabe",
"s": "action:vsplit"
},
"list.insertMappings": {
"<C-t>": "action:tabe",
"<C-v>": "action:vsplit"
}
}
13 changes: 6 additions & 7 deletions .config/nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim'
Plug 'scrooloose/nerdtree'
Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
" Plug 'wincent/ferret'
Plug 'wincent/ferret'
" Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }

call plug#end()
Expand Down Expand Up @@ -70,6 +70,7 @@ set cursorline

" ======= duplicate line command ======
command! -count=0 DuplicateLine :-<count>,-0t.
command! -nargs=+ CopyLine execute split(<q-args>, ' ')[0] . ',' . split(<q-args>, ' ')[1] . 't.'

" ====== COC highlights =====
hi CocErrorHighlight ctermbg=124 guibg=#990026
Expand All @@ -81,7 +82,7 @@ hi CocHighlightText ctermbg=223 guibg=#2e3d6b

autocmd CursorHold * silent call CocActionAsync('highlight')

let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#tabline#enabled = 0

let g:airline#extensions#tabline#left_sep = '='
let g:airline#extensions#tabline#left_alt_sep = '|'
Expand Down Expand Up @@ -215,14 +216,13 @@ nnoremap ,bn :bn<CR>
" nnoremap ,e :buffers<CR>:buffer<Space>

" windows
nnoremap ,z <C-W>x
nnoremap ,z <C-W>\|
nnoremap ,h <C-W>h
nnoremap ,j <C-W>j
nnoremap ,k <C-W>k
nnoremap ,l <C-W>l
nnoremap ,= <C-W>=
" kill all windows but current
nnoremap ,x :only<CR>
nnoremap ,x <C-W>x
nnoremap ,c :close<CR>
" tabs
Expand All @@ -239,6 +239,7 @@ nmap <Leader>hi <Plug>GitGutterPreviewHunk
"duplicate
nnoremap ,a :DuplicateLine<space>
nnoremap ,A :CopyLine<space>
"complete
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
Expand All @@ -255,8 +256,6 @@ nmap <silent> gl <Plug>(coc-codelens-action)
nmap <silent> <C-k> <Plug>(coc-diagnostic-prev)
nmap <silent> <C-j> <Plug>(coc-diagnostic-next)


" ==== nameless buffers ===
command -bang CloseNamelessBuffers call s:CloseNamelessBuffers(<bang>0)

Expand Down
1 change: 1 addition & 0 deletions .tmux.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bind-key = select-layout even-horizontal
bind-key v split-window -h
bind-key -r o select-pane -t :.+
bind-key -r O select-pane -t :.-

set -g default-terminal "xterm-256color"
set-option -ga terminal-overrides ",xterm-256color:Tc"
Expand Down

0 comments on commit e2a5357

Please sign in to comment.