update env

dot_bashrc.tmpl

@@ -15,14 +15,3 @@ if [ -d "$HOME/.config/bash" ]; then
   done
 fi
 unset rc
-
-if which direnv > /dev/null 2>&1 ; then
-  eval "$(direnv hook bash)"
-fi
-
-if which zoxide > /dev/null 2>&1 ; then
-  eval "$(zoxide init bash)"
-  # shellcheck disable=SC2139
-  alias z="$(which zoxide)"
-fi
-

dot_config/bash/aliases.sh

@@ -1,5 +1,5 @@
 if which exa > /dev/null 2>&1 ; then
-  alias ls="exa"
+  alias ls="exa --icons -F -g"
 else
   alias ls="ls --color=auto"
 fi

dot_config/bash/direnv.sh

@@ -0,0 +1,3 @@
+if which direnv > /dev/null 2>&1 ; then
+  eval "$(direnv hook bash)"
+fi

dot_config/bash/zoxide.sh

@@ -0,0 +1,5 @@
+if which zoxide > /dev/null 2>&1 ; then
+  eval "$(zoxide init bash)"
+  # shellcheck disable=SC2139
+  alias z="$(which zoxide)"
+fi

dot_config/nvim/init.vim

@@ -1,18 +1,13 @@
-"let g:ale_disable_lsp = 1
-
 call plug#begin('~/.config/nvim/autoload/plugged')
 Plug 'junegunn/vim-easy-align'
-Plug 'dense-analysis/ale'
 Plug 'tpope/vim-rails'
 Plug 'vim-ruby/vim-ruby'
 Plug 'hashivim/vim-terraform'
 Plug 'cespare/vim-toml'
 Plug 'ntpeters/vim-better-whitespace'
-"Plug 'pearofducks/ansible-vim'
 Plug 'itchyny/vim-gitbranch'
 Plug 'rust-lang/rust.vim'
 Plug 'airblade/vim-gitgutter'
-"Plug 'elixir-editors/vim-elixir'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'vim-airline/vim-airline'
@@ -57,6 +52,16 @@ set nowb
 set noswapfile
 let mapleader = " "
 
+" TextEdit might fail if hidden is not set.
+set hidden
+
+" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
+" delays and poor user experience.
+set updatetime=300
+
+" Don't pass messages to |ins-completion-menu|.
+set shortmess+=c
+
 syntax on
 filetype on
 filetype plugin on
@@ -78,10 +83,10 @@ autocmd FileType *.md set expandtab
 nmap n nzz
 nmap N Nzz
 
-"colorscheme solarized
+" colorscheme solarized
 let g:airline_powerline_fonts=1
-let g:airline_theme='base16_one_light'
 let g:airline_theme='owo'
+let g:airline_theme='cobalt2'
 let g:airline#extensions#tabline#enabled = 1
 
 noremap <F2> :bp<CR>
@@ -113,7 +118,7 @@ nnoremap <silent><leader>1 :source ~/.config/nvim/init.vim \| :PlugInstall<CR>
 map <Leader>s :StripWhitespace<CR>
 
 nnoremap <leader>g :Rg<CR>
-nnoremap <leader>p :Files<CR>
+nnoremap <leader>f :Files<CR>
 nnoremap <silent><leader>l :Buffers<CR>
 
 nnoremap <F8> :call SetNewPassword()<CR>
@@ -141,168 +146,29 @@ noremap <F6> :call NumberToggle()<cr>
 " File Browser
 nnoremap <leader>e :NvimTreeToggle<CR>
 nnoremap <leader>r :NvimTreeRefresh<CR>
-let g:nvim_tree_auto_close = 1
-" let g:nvim_tree_quit_on_open = 1
-let g:nvim_tree_git_hl = 1
-lua require'nvim-tree'.setup()
-"autocmd BufEnter * ++nested if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif
 
-"set guifont=OperatorMono\ Nerd\ Font:h16
+lua << EOF
-
+require("nvim-tree").setup({
-" TextEdit might fail if hidden is not set.
+  sort_by = "case_sensitive",
-set hidden
+  view = {
-
+    adaptive_size = true,
-" Give more space for displaying messages.
+    mappings = {
-"set cmdheight=1
+      list = {
-
+        { key = "u", action = "dir_up" },
-" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
+      },
-" delays and poor user experience.
+    },
-set updatetime=300
+  },
-
+  renderer = {
-" Don't pass messages to |ins-completion-menu|.
+    group_empty = true,
-set shortmess+=c
+    highlight_git = true,
-
+  },
-" Always show the signcolumn, otherwise it would shift the text each time
+  filters = {
-" diagnostics appear/become resolved.
+    dotfiles = true,
-"if has("nvim-0.5.0") || has("patch-8.1.1564")
+  },
-  " Recently vim can merge signcolumn and number column into one
+  actions = {
-"  set signcolumn=number
+    open_file = {
-"else
+      quit_on_open = true,
-"  set signcolumn=yes
+    },
-"endif
+  },
-
+})
-" Use tab for trigger completion with characters ahead and navigate.
+EOF
-" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
-" other plugin before putting this into your config.
-"inoremap <silent><expr> <TAB>
-"      \ pumvisible() ? "\<C-n>" :
-"      \ <SID>check_back_space() ? "\<TAB>" :
-"      \ coc#refresh()
-"inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
-
-"function! s:check_back_space() abort
-"  let col = col('.') - 1
-"  return !col || getline('.')[col - 1]  =~# '\s'
-"endfunction
-
-" Use <c-space> to trigger completion.
-"if has('nvim')
-"  inoremap <silent><expr> <c-space> coc#refresh()
-"else
-"  inoremap <silent><expr> <c-@> coc#refresh()
-"endif
-
-" Make <CR> auto-select the first completion item and notify coc.nvim to
-" format on enter, <cr> could be remapped by other vim plugin
-"inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
-"                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
-
-" Use `[g` and `]g` to navigate diagnostics
-" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
-"nmap <silent> [g <Plug>(coc-diagnostic-prev)
-"nmap <silent> ]g <Plug>(coc-diagnostic-next)
-
-" GoTo code navigation.
-"nmap <silent> gd <Plug>(coc-definition)
-"nmap <silent> gy <Plug>(coc-type-definition)
-"nmap <silent> gi <Plug>(coc-implementation)
-"nmap <silent> gr <Plug>(coc-references)
-
-" Use K to show documentation in preview window.
-"nnoremap <silent> K :call <SID>show_documentation()<CR>
-
-"function! s:show_documentation()
-"  if (index(['vim','help'], &filetype) >= 0)
-"    execute 'h '.expand('<cword>')
-"  elseif (coc#rpc#ready())
-"    call CocActionAsync('doHover')
-"  else
-"    execute '!' . &keywordprg . " " . expand('<cword>')
-"  endif
-"endfunction
-
-" Highlight the symbol and its references when holding the cursor.
-"autocmd CursorHold * silent call CocActionAsync('highlight')
-
-" Symbol renaming.
-"nmap <leader>rn <Plug>(coc-rename)
-
-" Formatting selected code.
-"xmap <leader>f  <Plug>(coc-format-selected)
-"nmap <leader>f  <Plug>(coc-format-selected)
-
-"augroup mygroup
-"  autocmd!
-  " Setup formatexpr specified filetype(s).
-"  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
-  " Update signature help on jump placeholder.
-"  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
-"augroup end
-"
-" Applying codeAction to the selected region.
-" Example: `<leader>aap` for current paragraph
-"xmap <leader>a  <Plug>(coc-codeaction-selected)
-"nmap <leader>a  <Plug>(coc-codeaction-selected)
-
-" Remap keys for applying codeAction to the current buffer.
-"nmap <leader>ac  <Plug>(coc-codeaction)
-" Apply AutoFix to problem on the current line.
-"nmap <leader>qf  <Plug>(coc-fix-current)
-
-" Map function and class text objects
-" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
-"xmap if <Plug>(coc-funcobj-i)
-"omap if <Plug>(coc-funcobj-i)
-"xmap af <Plug>(coc-funcobj-a)
-"omap af <Plug>(coc-funcobj-a)
-"xmap ic <Plug>(coc-classobj-i)
-"omap ic <Plug>(coc-classobj-i)
-"xmap ac <Plug>(coc-classobj-a)
-"omap ac <Plug>(coc-classobj-a)
-
-" Remap <C-f> and <C-b> for scroll float windows/popups.
-"if has('nvim-0.4.0') || has('patch-8.2.0750')
-"  nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
-"  nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
-"  inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
-"  inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
-"  vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
-"  vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
-"endif
-
-" Use CTRL-S for selections ranges.
-" Requires 'textDocument/selectionRange' support of language server.
-"nmap <silent> <C-s> <Plug>(coc-range-select)
-"xmap <silent> <C-s> <Plug>(coc-range-select)
-
-" Add `:Format` command to format current buffer.
-"command! -nargs=0 Format :call CocAction('format')
-
-" Add `:Fold` command to fold current buffer.
-"command! -nargs=? Fold :call     CocAction('fold', <f-args>)
-
-" Add `:OR` command for organize imports of the current buffer.
-"command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
-
-" Add (Neo)Vim's native statusline support.
-" NOTE: Please see `:h coc-status` for integrations with external plugins that
-" provide custom statusline: lightline.vim, vim-airline.
-"set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
-
-" Mappings for CoCList
-" Show all diagnostics.
-"nnoremap <silent><nowait> <space>a  :<C-u>CocList diagnostics<cr>
-" Manage extensions.
-"nnoremap <silent><nowait> <space>e  :<C-u>CocList extensions<cr>
-" Show commands.
-"nnoremap <silent><nowait> <space>c  :<C-u>CocList commands<cr>
-" Find symbol of current document.
-"nnoremap <silent><nowait> <space>o  :<C-u>CocList outline<cr>
-" Search workspace symbols.
-"nnoremap <silent><nowait> <space>s  :<C-u>CocList -I symbols<cr>
-" Do default action for next item.
-"nnoremap <silent><nowait> <space>j  :<C-u>CocNext<CR>
-" Do default action for previous item.
-"nnoremap <silent><nowait> <space>k  :<C-u>CocPrev<CR>
-" Resume latest coc list.
-"nnoremap <silent><nowait> <space>p  :<C-u>CocListResume<CR>