diff --git a/.bashrc b/.bashrc index 4cd0937..dc3419d 100644 --- a/.bashrc +++ b/.bashrc @@ -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 <<< + diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index e8d3cc8..15878fd 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -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": { + "": "action:tabe", + "": "action:vsplit" + } } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 77eb48f..c8c6e2c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -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() @@ -70,6 +70,7 @@ set cursorline " ======= duplicate line command ====== command! -count=0 DuplicateLine :-,-0t. +command! -nargs=+ CopyLine execute split(, ' ')[0] . ',' . split(, ' ')[1] . 't.' " ====== COC highlights ===== hi CocErrorHighlight ctermbg=124 guibg=#990026 @@ -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 = '|' @@ -215,14 +216,13 @@ nnoremap ,bn :bn " nnoremap ,e :buffers:buffer " windows -nnoremap ,z x +nnoremap ,z \| nnoremap ,h h nnoremap ,j j nnoremap ,k k nnoremap ,l l nnoremap ,= = -" kill all windows but current -nnoremap ,x :only +nnoremap ,x x nnoremap ,c :close " tabs @@ -239,6 +239,7 @@ nmap hi GitGutterPreviewHunk "duplicate nnoremap ,a :DuplicateLine +nnoremap ,A :CopyLine "complete inoremap pumvisible() ? "\" : "\" @@ -255,8 +256,6 @@ nmap gl (coc-codelens-action) nmap (coc-diagnostic-prev) nmap (coc-diagnostic-next) - - " ==== nameless buffers === command -bang CloseNamelessBuffers call s:CloseNamelessBuffers(0) diff --git a/.tmux.conf b/.tmux.conf index 125afd6..d75e6c5 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -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"