diff --git a/install/cli-tools.sh b/install/cli-tools.sh index 68c3cdc4..282910ad 100755 --- a/install/cli-tools.sh +++ b/install/cli-tools.sh @@ -7,6 +7,7 @@ brew install curl brew install dnsmasq brew install git-flow brew install git-ftp +brew install golang brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac brew install htop brew install httpd @@ -17,6 +18,7 @@ brew install nss brew install openssl brew install php@7.3 brew install ripgrep +brew install ruby brew install switchaudio-osx # dnsmasq diff --git a/install/install.sh b/install/install.sh index ee5a93ba..54de3fea 100755 --- a/install/install.sh +++ b/install/install.sh @@ -16,9 +16,7 @@ brew install clipper brew install fzf brew install git brew install neovim --HEAD -brew install python brew install tmux -brew install ruby brew install zsh # install all submodules @@ -45,6 +43,7 @@ mkdir -p ~/Library/LaunchAgents brew services start clipper # install deps + plugins for neovim +brew install python pip3 install neovim curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh > installer.sh sh installer.sh ~/.config/nvim/dein diff --git a/nvim/config.vim b/nvim/config.vim index 084945c0..90f891e7 100644 --- a/nvim/config.vim +++ b/nvim/config.vim @@ -39,6 +39,7 @@ set sidescrolloff=5 set smartcase set softtabstop=2 set tabstop=2 +set termguicolors set virtualedit=all set visualbell set wildmode=list:longest,list:full diff --git a/nvim/init.vim b/nvim/init.vim index a52db1d7..70de9737 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -3,21 +3,19 @@ set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim " let dein handle all the plugins and bundles call dein#begin(expand('~/.config/nvim/dein')) - call dein#add('Shougo/dein.vim') - call dein#add('Shougo/deoplete.nvim') - call dein#add('Shougo/neosnippet') - call dein#add('ap/vim-css-color') call dein#add('christoomey/vim-tmux-navigator') call dein#add('easymotion/vim-easymotion') call dein#add('editorconfig/editorconfig-vim') call dein#add('junegunn/fzf', { 'merged': 0 }) call dein#add('junegunn/fzf.vim', { 'depends': 'fzf' }) - call dein#add('junegunn/goyo.vim') call dein#add('maxbrunsfeld/vim-yankstack') + call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' }) + call dein#add('rrethy/vim-hexokinase', { 'build': 'make hexokinase' }) call dein#add('sheerun/vim-polyglot') + call dein#add('shougo/dein.vim') + call dein#add('shougo/neosnippet') call dein#add('tpope/vim-commentary') call dein#add('tpope/vim-eunuch') - call dein#add('tpope/vim-fugitive') call dein#add('tpope/vim-ragtag') call dein#add('tpope/vim-repeat') call dein#add('tpope/vim-surround') @@ -27,7 +25,13 @@ call dein#begin(expand('~/.config/nvim/dein')) call dein#add('w0rp/ale') call dein#add('wellle/targets.vim') call dein#add('wellle/tmux-complete.vim') + call dein#add('wincent/ferret') call dein#add('wincent/terminus') + + " group these, since vim-twiggy/GV requires fugitive + call dein#add('tpope/vim-fugitive') + call dein#add('junegunn/gv.vim') + call dein#add('sodapopcan/vim-twiggy') call dein#end() " load the default config and mappings diff --git a/nvim/plugins.vim b/nvim/plugins.vim index 7e096e06..b2bbf61f 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -1,16 +1,12 @@ -" deoplete -let g:deoplete#enable_at_startup=1 -let g:deoplete#enable_smart_case=1 -let g:deoplete#auto_complete_delay=150 -let g:deoplete#auto_completion_start_length=4 +" colors +let g:Hexokinase_highlighters = ['backgroundfull'] +let g:Hexokinase_optInPatterns = ['full_hex', 'triple_hex', 'rgb', 'rgba', 'hsl', 'hsla'] +let g:Hexokinase_ftEnabled = ['css', 'scss', 'html', 'javascript', 'php', 'json', 'json5'] -inoremap deoplete#smart_close_popup()."\" -inoremap deoplete#smart_close_popup()."\" -inoremap =deoplete_cr_function() - -function! s:deoplete_cr_function() abort - return deoplete#close_popup() . "\" -endfunction +" ferret multifile search +let g:FerretExecutable='rg' +let g:FerretMaxResults=1000000 +let g:FerretNvim=1 " fugitive nnoremap gs :G20+ diff --git a/nvim/statusline.vim b/nvim/statusline.vim index 014fa472..5415c042 100644 --- a/nvim/statusline.vim +++ b/nvim/statusline.vim @@ -30,8 +30,8 @@ function! MyStatusLine(mode) return statusline endfunction -hi StatusLineColor ctermbg=white ctermfg=black -hi NoStatusLineColor ctermbg=black ctermfg=lightgrey +hi StatusLineColor ctermbg=White guibg=White ctermfg=Black guifg=Black +hi NoStatusLineColor ctermbg=NONE guibg=NONE ctermfg=LightGrey guifg=LightGrey au WinEnter * setlocal statusline=%!MyStatusLine('Enter') au WinLeave * setlocal statusline=%!MyStatusLine('Leave') diff --git a/tmux.conf b/tmux.conf index fe5b79d3..a5acbe3c 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,5 +1,6 @@ # Use a 256 color terminal -set -g default-terminal "xterm-256color" +set -g default-terminal "screen-256color" +set-option -sa terminal-overrides ',screen-256color:RGB' # zsh set -g default-shell $SHELL