latest
This commit is contained in:
parent
1156d76cbe
commit
96c45e0529
1
Makefile
1
Makefile
|
|
@ -2,7 +2,6 @@ default: install
|
|||
|
||||
install: prereqs
|
||||
cat ./profile.sh > $(HOME)/.profile
|
||||
rsync -avP ./home/ $(HOME)/
|
||||
bash setup.sh
|
||||
|
||||
prereqs:
|
||||
|
|
|
|||
|
|
@ -4,37 +4,25 @@ let mapleader=","
|
|||
|
||||
let g:go_version_warning = 0
|
||||
|
||||
silent !mkdir -p ~/.nvim/plug > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.nvim/backup > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.nvim/undo > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.nvim/swap > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.nvim/autoload > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.nvim/plugged > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/plug > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/backup > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/swap > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/autoload > /dev/null 2>&1
|
||||
silent !mkdir -p ~/.vim/plugged > /dev/null 2>&1
|
||||
|
||||
|
||||
" amazon linux 2 epel has old nvim, this is required:
|
||||
let g:go_version_warning = 0
|
||||
"let g:go_version_warning = 0
|
||||
|
||||
if empty(glob('~/.nvim/plug/plug.vim'))
|
||||
silent !curl -fLo ~/.nvim/plug/plug.vim --create-dirs
|
||||
if empty(glob('~/.vim/plug/plug.vim'))
|
||||
silent !curl -fLo ~/.vim/plug/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
source ~/.nvim/plug/plug.vim
|
||||
source ~/.vim/plug/plug.vim
|
||||
|
||||
"Plug 'zchee/deoplete-go', { 'for': 'go' }
|
||||
"Plug 'zchee/deoplete-jedi', { 'for': 'python' }
|
||||
|
||||
call plug#begin('~/.nvim/plug')
|
||||
|
||||
if has('nvim')
|
||||
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
|
||||
Plug 'roxma/nvim-yarp'
|
||||
Plug 'roxma/vim-hug-neovim-rpc'
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
endif
|
||||
call plug#begin('~/.vim/plug')
|
||||
|
||||
Plug 'nathanaelkane/vim-indent-guides'
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
|
|
@ -42,8 +30,8 @@ let g:indent_guides_enable_on_vim_startup = 1
|
|||
Plug 'tpope/vim-sensible'
|
||||
Plug 'preservim/nerdtree'
|
||||
Plug 'ryanoasis/vim-devicons'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
"Plug 'vim-airline/vim-airline'
|
||||
"Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
|
||||
Plug 'prettier/vim-prettier', {
|
||||
\ 'do': 'yarn install',
|
||||
|
|
@ -53,10 +41,10 @@ let g:prettier#autoformat = 1
|
|||
let g:prettier#autoformat_require_pragma = 0
|
||||
|
||||
|
||||
"Plug 'fatih/molokai'
|
||||
Plug 'morhetz/gruvbox'
|
||||
Plug 'fatih/molokai'
|
||||
"Plug 'morhetz/gruvbox'
|
||||
Plug 'sbdchd/neoformat'
|
||||
Plug 'LnL7/vim-nix'
|
||||
"Plug 'LnL7/vim-nix'
|
||||
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" syntastic
|
||||
|
|
@ -79,7 +67,7 @@ let g:rehash256 = 1
|
|||
let g:molokai_original = 1
|
||||
let g:gruvbox_italic = 1
|
||||
"colorscheme molokai
|
||||
colorscheme gruvbox
|
||||
"colorscheme gruvbox
|
||||
|
||||
noremap <Leader>w :w<cr>
|
||||
noremap <Leader><cr> i<cr><Esc>
|
||||
|
|
@ -104,7 +92,7 @@ let g:go_info_mode='gopls'
|
|||
let g:go_auto_type_info = 1
|
||||
|
||||
|
||||
"highlight SyntasticErrorSign guifg=white guibg=red
|
||||
highlight SyntasticErrorSign guifg=white guibg=red
|
||||
|
||||
"Plug 'scrooloose/nerdtree'
|
||||
"Plug 'ludovicchabant/vim-gutentags'
|
||||
|
|
@ -119,17 +107,17 @@ let g:gutentags_generate_on_new = 1
|
|||
"call plug#end()
|
||||
|
||||
|
||||
let g:airline_powerline_fonts = 1
|
||||
"let g:airline_powerline_fonts = 1
|
||||
|
||||
if !exists('g:airline_symbols')
|
||||
let g:airline_symbols = {}
|
||||
endif
|
||||
"if !exists('g:airline_symbols')
|
||||
" let g:airline_symbols = {}
|
||||
"endif
|
||||
|
||||
" unicode symbols
|
||||
" let g:airline_left_sep = '▶'
|
||||
" let g:airline_right_sep = '◀'
|
||||
let g:airline_symbols.crypt = '🔒'
|
||||
let g:airline_symbols.linenr = '☰'
|
||||
" let g:airline_symbols.crypt = '🔒'
|
||||
" let g:airline_symbols.linenr = '☰'
|
||||
" let g:airline_symbols.linenr = '␊'
|
||||
" let g:airline_symbols.linenr = ''
|
||||
" let g:airline_symbols.linenr = '¶'
|
||||
|
|
@ -193,10 +181,10 @@ set autoindent
|
|||
"set signcolumn=yes
|
||||
set backspace=indent,eol,start
|
||||
set backup
|
||||
set backupdir=~/.nvim/backup//
|
||||
set backupdir=~/.vim/backup//
|
||||
set cmdheight=3
|
||||
"set clipboard=unnamed
|
||||
set directory=~/.nvim/swap//
|
||||
set directory=~/.vim/swap//
|
||||
set encoding=utf-8
|
||||
set expandtab
|
||||
set fileencodings=utf-8
|
||||
|
|
@ -212,13 +200,13 @@ set showcmd
|
|||
set smartcase
|
||||
set smarttab
|
||||
set softtabstop=4
|
||||
set spellfile=~/.nvim/spellfile.utf-8.add
|
||||
set spellfile=~/.vim/spellfile.utf-8.add
|
||||
set spelllang=en
|
||||
set tabstop=4
|
||||
set termencoding=utf-8
|
||||
set ttyfast
|
||||
set tw=76
|
||||
set undodir=~/.nvim/undo//
|
||||
set undodir=~/.vim/undo//
|
||||
set undofile
|
||||
set wildignore+=*.pyc
|
||||
set writebackup
|
||||
|
|
@ -1,6 +1,3 @@
|
|||
alias vim="nvim"
|
||||
alias vi="nvim"
|
||||
|
||||
export GOPATH="/usr/local/go"
|
||||
if [[ ! -d $GOPATH ]]; then
|
||||
sudo mkdir -p $GOPATH
|
||||
|
|
@ -8,4 +5,5 @@ if [[ ! -d $GOPATH ]]; then
|
|||
fi
|
||||
|
||||
export PATH="$PATH:$HOME/bin"
|
||||
export PATH="$PATH:$HOME/.yarn/bin"
|
||||
_byobu_sourced=1 . /usr/bin/byobu-launch
|
||||
|
|
|
|||
12
setup.sh
12
setup.sh
|
|
@ -4,21 +4,23 @@ source ./profile.sh
|
|||
PKGS="
|
||||
byobu
|
||||
go
|
||||
neovim
|
||||
node
|
||||
vim
|
||||
"
|
||||
sudo amazon-linux-extras install epel -y
|
||||
sudo amazon-linux-extras install docker -y
|
||||
sudo yum -y install $PKGS
|
||||
sudo yum upgrade -y
|
||||
|
||||
rsync -avP ./home/ $HOME/
|
||||
|
||||
sudo npm install -g yarn
|
||||
|
||||
yarn global add prettier
|
||||
|
||||
# setup vim
|
||||
echo "" | nvim +PlugInstall +qall
|
||||
nvim +GoInstallBinaries +qall
|
||||
nvim +PlugInstall +qall
|
||||
echo "" | vim +PlugInstall +qall
|
||||
vim +GoInstallBinaries +qall
|
||||
vim +PlugInstall +qall
|
||||
|
||||
# configure byobu
|
||||
byobu-launcher-install
|
||||
|
|
|
|||
Loading…
Reference in New Issue