From 1201fa59bd92404604064130605163939c6db3dc Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Tue, 28 Jun 2022 16:27:09 -0400 Subject: [PATCH] update env --- dot_bashrc.tmpl | 11 -- dot_config/bash/aliases.sh | 2 +- dot_config/bash/direnv.sh | 3 + dot_config/bash/zoxide.sh | 5 + dot_config/nvim/init.vim | 210 +++++++------------------------------ 5 files changed, 47 insertions(+), 184 deletions(-) create mode 100644 dot_config/bash/direnv.sh create mode 100644 dot_config/bash/zoxide.sh diff --git a/dot_bashrc.tmpl b/dot_bashrc.tmpl index 8ed96ec..2749409 100644 --- a/dot_bashrc.tmpl +++ b/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 - diff --git a/dot_config/bash/aliases.sh b/dot_config/bash/aliases.sh index 975f7da..de754ae 100644 --- a/dot_config/bash/aliases.sh +++ b/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 diff --git a/dot_config/bash/direnv.sh b/dot_config/bash/direnv.sh new file mode 100644 index 0000000..565da5e --- /dev/null +++ b/dot_config/bash/direnv.sh @@ -0,0 +1,3 @@ +if which direnv > /dev/null 2>&1 ; then + eval "$(direnv hook bash)" +fi diff --git a/dot_config/bash/zoxide.sh b/dot_config/bash/zoxide.sh new file mode 100644 index 0000000..1b49b91 --- /dev/null +++ b/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 diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 2856e75..941dfd7 100644 --- a/dot_config/nvim/init.vim +++ b/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 :bp @@ -113,7 +118,7 @@ nnoremap 1 :source ~/.config/nvim/init.vim \| :PlugInstall map s :StripWhitespace nnoremap g :Rg -nnoremap p :Files +nnoremap f :Files nnoremap l :Buffers nnoremap :call SetNewPassword() @@ -141,168 +146,29 @@ noremap :call NumberToggle() " File Browser nnoremap e :NvimTreeToggle nnoremap r :NvimTreeRefresh -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 - -" TextEdit might fail if hidden is not set. -set hidden - -" Give more space for displaying messages. -"set cmdheight=1 - -" 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 - -" Always show the signcolumn, otherwise it would shift the text each time -" diagnostics appear/become resolved. -"if has("nvim-0.5.0") || has("patch-8.1.1564") - " Recently vim can merge signcolumn and number column into one -" set signcolumn=number -"else -" set signcolumn=yes -"endif - -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -"inoremap -" \ pumvisible() ? "\" : -" \ check_back_space() ? "\" : -" \ coc#refresh() -"inoremap pumvisible() ? "\" : "\" - -"function! s:check_back_space() abort -" let col = col('.') - 1 -" return !col || getline('.')[col - 1] =~# '\s' -"endfunction - -" Use to trigger completion. -"if has('nvim') -" inoremap coc#refresh() -"else -" inoremap coc#refresh() -"endif - -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -"inoremap pumvisible() ? coc#_select_confirm() -" \: "\u\\=coc#on_enter()\" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -"nmap [g (coc-diagnostic-prev) -"nmap ]g (coc-diagnostic-next) - -" GoTo code navigation. -"nmap gd (coc-definition) -"nmap gy (coc-type-definition) -"nmap gi (coc-implementation) -"nmap gr (coc-references) - -" Use K to show documentation in preview window. -"nnoremap K :call show_documentation() - -"function! s:show_documentation() -" if (index(['vim','help'], &filetype) >= 0) -" execute 'h '.expand('') -" elseif (coc#rpc#ready()) -" call CocActionAsync('doHover') -" else -" execute '!' . &keywordprg . " " . expand('') -" endif -"endfunction - -" Highlight the symbol and its references when holding the cursor. -"autocmd CursorHold * silent call CocActionAsync('highlight') - -" Symbol renaming. -"nmap rn (coc-rename) - -" Formatting selected code. -"xmap f (coc-format-selected) -"nmap f (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: `aap` for current paragraph -"xmap a (coc-codeaction-selected) -"nmap a (coc-codeaction-selected) - -" Remap keys for applying codeAction to the current buffer. -"nmap ac (coc-codeaction) -" Apply AutoFix to problem on the current line. -"nmap qf (coc-fix-current) - -" Map function and class text objects -" NOTE: Requires 'textDocument.documentSymbol' support from the language server. -"xmap if (coc-funcobj-i) -"omap if (coc-funcobj-i) -"xmap af (coc-funcobj-a) -"omap af (coc-funcobj-a) -"xmap ic (coc-classobj-i) -"omap ic (coc-classobj-i) -"xmap ac (coc-classobj-a) -"omap ac (coc-classobj-a) - -" Remap and for scroll float windows/popups. -"if has('nvim-0.4.0') || has('patch-8.2.0750') -" nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" -" nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -" inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" -" inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" -" vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" -" vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -"endif - -" Use CTRL-S for selections ranges. -" Requires 'textDocument/selectionRange' support of language server. -"nmap (coc-range-select) -"xmap (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', ) - -" 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 a :CocList diagnostics -" Manage extensions. -"nnoremap e :CocList extensions -" Show commands. -"nnoremap c :CocList commands -" Find symbol of current document. -"nnoremap o :CocList outline -" Search workspace symbols. -"nnoremap s :CocList -I symbols -" Do default action for next item. -"nnoremap j :CocNext -" Do default action for previous item. -"nnoremap k :CocPrev -" Resume latest coc list. -"nnoremap p :CocListResume +lua << EOF +require("nvim-tree").setup({ + sort_by = "case_sensitive", + view = { + adaptive_size = true, + mappings = { + list = { + { key = "u", action = "dir_up" }, + }, + }, + }, + renderer = { + group_empty = true, + highlight_git = true, + }, + filters = { + dotfiles = true, + }, + actions = { + open_file = { + quit_on_open = true, + }, + }, +}) +EOF