updates...
This commit is contained in:
		
							parent
							
								
									e853d10ffd
								
							
						
					
					
						commit
						160f28ffb9
					
				| 
						 | 
				
			
			@ -1,5 +1,17 @@
 | 
			
		|||
{
 | 
			
		||||
      "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "typescript", "typescriptreact", "go"],
 | 
			
		||||
      "eslint.autoFixOnSave": true,
 | 
			
		||||
      "diagnostic.checkCurrentLine": true
 | 
			
		||||
  "coc.preferences.formatOnSaveFiletypes": [
 | 
			
		||||
    "css",
 | 
			
		||||
    "markdown",
 | 
			
		||||
    "javascript",
 | 
			
		||||
    "typescript",
 | 
			
		||||
    "typescriptreact",
 | 
			
		||||
    "go",
 | 
			
		||||
    "ruby"
 | 
			
		||||
  ],
 | 
			
		||||
  "eslint.autoFixOnSave": true,
 | 
			
		||||
  "diagnostic.checkCurrentLine": true,
 | 
			
		||||
  "solargraph.autoformat": true,
 | 
			
		||||
  "solargraph.formatting": true,
 | 
			
		||||
  "solargraph.hover": true,
 | 
			
		||||
  "solargraph.diagnostics": true,
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -51,6 +51,7 @@ Plug 'junegunn/fzf.vim'
 | 
			
		|||
Plug 'leafgarland/typescript-vim'
 | 
			
		||||
Plug 'airblade/vim-gitgutter'
 | 
			
		||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
 | 
			
		||||
Plug 'github/copilot.vim'
 | 
			
		||||
 | 
			
		||||
" Initialize plugin system
 | 
			
		||||
call plug#end()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -94,3 +94,19 @@ if has('nvim-0.4.0') || has('patch-8.2.0750')
 | 
			
		|||
  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
 | 
			
		||||
 | 
			
		||||
let g:coc_global_extensions = [
 | 
			
		||||
            \'coc-tsserver',
 | 
			
		||||
            \'coc-css',
 | 
			
		||||
            \'coc-eslint',
 | 
			
		||||
            \'coc-highlight',
 | 
			
		||||
            \'coc-html',
 | 
			
		||||
            \'coc-prettier',
 | 
			
		||||
            \'coc-solargraph',
 | 
			
		||||
            \'coc-vimlsp',
 | 
			
		||||
            \'coc-actions',
 | 
			
		||||
      \'coc-go',
 | 
			
		||||
      \'coc-explorer',
 | 
			
		||||
      \'coc-json', 
 | 
			
		||||
      \'coc-git'
 | 
			
		||||
      \]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										44
									
								
								.zshrc
								
								
								
								
							
							
						
						
									
										44
									
								
								.zshrc
								
								
								
								
							| 
						 | 
				
			
			@ -1,16 +1,44 @@
 | 
			
		|||
source "$HOME/.antigen/antigen.zsh"
 | 
			
		||||
if [ ! -f $HOME/antigen/antigen.zsh ]; then
 | 
			
		||||
    echo <<EOF
 | 
			
		||||
    Antigen not installed!
 | 
			
		||||
 | 
			
		||||
    git clone https://github.com/zsh-users/antigen.git ~/antigen
 | 
			
		||||
EOF
 | 
			
		||||
else
 | 
			
		||||
    source "$HOME/antigen/antigen.zsh"
 | 
			
		||||
 | 
			
		||||
antigen use oh-my-zsh
 | 
			
		||||
antigen bundle arialdomartini/oh-my-git
 | 
			
		||||
antigen theme arialdomartini/oh-my-git-themes oppa-lana-style
 | 
			
		||||
 | 
			
		||||
antigen apply
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
export NVM_DIR="$HOME/.nvm"
 | 
			
		||||
  [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
 | 
			
		||||
  [ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
 | 
			
		||||
alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 | 
			
		||||
 | 
			
		||||
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
 | 
			
		||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 | 
			
		||||
 | 
			
		||||
if [ ! -f ~/.fzf.zsh ]; then 
 | 
			
		||||
    echo <<EOF 
 | 
			
		||||
    FZF Not installed!
 | 
			
		||||
 | 
			
		||||
    git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
 | 
			
		||||
    ~/.fzf/install
 | 
			
		||||
EOF
 | 
			
		||||
else
 | 
			
		||||
    source ~/.fzf.zsh
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! type rvm &> /dev/null; then
 | 
			
		||||
echo <<EOF
 | 
			
		||||
RVM Not installed. You should probably do this:
 | 
			
		||||
 | 
			
		||||
mkdir -p ~/.rvm/src && cd ~/.rvm/src && rm -rf ./rvm && \
 | 
			
		||||
git clone --depth 1 https://github.com/rvm/rvm.git && \
 | 
			
		||||
cd rvm && ./install
 | 
			
		||||
EOF
 | 
			
		||||
else
 | 
			
		||||
    # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 | 
			
		||||
    export PATH="$PATH:$HOME/.rvm/bin"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 | 
			
		||||
export PATH=$PATH:$(go env GOPATH)/bin
 | 
			
		||||
alias config='/usr/bin/git --git-dir=/Users/rporter/.cfg/ --work-tree=/Users/rporter'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue