Browse Source

Small changes

master
Taylor Bockman 5 years ago
parent
commit
6ba1c2774a
  1. 14
      dotfiles/config/nvim/init.vim
  2. 2
      dotfiles/zshrc

14
dotfiles/config/nvim/init.vim

@ -8,11 +8,10 @@ endif
call plug#begin('~/.config/nvim/plugged') call plug#begin('~/.config/nvim/plugged')
" Solarized theme " Material theme
Plug 'altercation/vim-colors-solarized' Plug 'hzchirs/vim-material'
set background=dark
" Zenburn theme colorscheme vim-material
Plug 'vim-scripts/zenburn'
" Syntastic " Syntastic
Plug 'scrooloose/syntastic' Plug 'scrooloose/syntastic'
@ -35,6 +34,7 @@ Plug 'mileszs/ack.vim'
" Improved vim status bar " Improved vim status bar
Plug 'bling/vim-airline' Plug 'bling/vim-airline'
Plug 'vim-airline/vim-airline-themes' Plug 'vim-airline/vim-airline-themes'
let g:airline_theme='material'
" Indent guides " Indent guides
Plug 'Yggdroot/indentLine' Plug 'Yggdroot/indentLine'
@ -57,7 +57,6 @@ Plug 'wavded/vim-stylus'
Plug 'raichoo/haskell-vim' Plug 'raichoo/haskell-vim'
Plug 'OCamlPro/ocp-indent' Plug 'OCamlPro/ocp-indent'
Plug 'slim-template/vim-slim' Plug 'slim-template/vim-slim'
Plug 'fatih/vim-go'
Plug 'isRuslan/vim-es6' Plug 'isRuslan/vim-es6'
" SBT integration for vim " SBT integration for vim
@ -220,9 +219,6 @@ endif
let g:syntastic_javascript_checkers = ['eslint'] let g:syntastic_javascript_checkers = ['eslint']
let g:syntastic_javascript_jsxhint_exec = 'eslint' let g:syntastic_javascript_jsxhint_exec = 'eslint'
" Color customizations
colorscheme zenburn
" Python-mode settings " Python-mode settings
" disable pymode folding " disable pymode folding

2
dotfiles/zshrc

@ -29,7 +29,7 @@ export GOPATH=$HOME/go/
export PATH=$PATH:"$GOPATH/bin" export PATH=$PATH:"$GOPATH/bin"
alias emacs='emacs -nw' alias emacs='emacs -nw'
alias vim='emacs' # LOL alias vim='nvim'
alias irssi='TERM=screen-256color irssi' alias irssi='TERM=screen-256color irssi'
alias scheme='rlwrap mit-scheme' alias scheme='rlwrap mit-scheme'
alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start' alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'

Loading…
Cancel
Save