Merge branch 'master' of github.com:ntietz/config
This commit is contained in:
commit
23111761a5
6 changed files with 105 additions and 5 deletions
|
@ -30,7 +30,7 @@ fi
|
|||
export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
|
||||
export TERM=xterm-256color
|
||||
|
||||
if [ -d "$HOME/.pyenv" ]
|
||||
if [ -d "$HOME/.pyenv" ] && [ -z ${PYENV_SHELL+x} ]
|
||||
then
|
||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
||||
eval "$(pyenv init -)"
|
||||
|
@ -60,5 +60,4 @@ then
|
|||
. /usr/local/etc/bash_completion
|
||||
fi
|
||||
|
||||
#
|
||||
#export PATH="$HOME/.poetry/bin:$PATH"
|
||||
export PATH="$HOME/.poetry/bin:$PATH"
|
||||
|
|
|
@ -109,6 +109,12 @@ function install_wtfutil() {
|
|||
cp ./wdir/wtfutil ~/.bin/
|
||||
}
|
||||
|
||||
function install_git_latest() {
|
||||
sudo add-apt-repository ppa:git-core/ppa
|
||||
sudo apt update
|
||||
sudo apt install git
|
||||
}
|
||||
|
||||
#install_utilities # TODO
|
||||
install_docker
|
||||
install_docker_compose
|
||||
|
@ -117,4 +123,5 @@ install_google_cloud_sdk
|
|||
install_pyenv
|
||||
install_ctags
|
||||
install_wtfutil
|
||||
install_git_latest
|
||||
|
||||
|
|
48
nvim/.config/nvim/colors.vim
Normal file
48
nvim/.config/nvim/colors.vim
Normal file
|
@ -0,0 +1,48 @@
|
|||
|
||||
set termguicolors
|
||||
set background=dark
|
||||
let g:gruvbox_italic=1
|
||||
let g:gruvbox_italicize_strings=1
|
||||
colorscheme gruvbox
|
||||
|
||||
" Override some of the Gruvbox colors since they're broken for Haskell
|
||||
hi! link haskellType GruvboxBlue
|
||||
hi! link haskellIdentifier GruvboxAqua
|
||||
hi! link haskellSeparator GruvboxFg4
|
||||
hi! link haskellDelimiter GruvboxOrange
|
||||
hi! link haskellOperators GruvboxPurple
|
||||
|
||||
hi! link haskellBacktick GruvboxOrange
|
||||
hi! link haskellStatement GruvboxPurple
|
||||
hi! link haskellConditional GruvboxPurple
|
||||
|
||||
hi! link haskellLet GruvboxRed
|
||||
hi! link haskellDefault GruvboxRed
|
||||
hi! link haskellWhere GruvboxRed
|
||||
hi! link haskellBottom GruvboxRedBold
|
||||
hi! link haskellImportKeywords GruvboxPurpleBold
|
||||
hi! link haskellDeclKeyword GruvboxOrange
|
||||
hi! link haskellDecl GruvboxOrange
|
||||
hi! link haskellDeriving GruvboxPurple
|
||||
hi! link haskellAssocType GruvboxAqua
|
||||
|
||||
hi! link haskellNumber GruvboxAqua
|
||||
hi! link haskellPragma GruvboxRedBold
|
||||
|
||||
hi! link haskellTH GruvboxAquaBold
|
||||
hi! link haskellForeignKeywords GruvboxGreen
|
||||
hi! link haskellKeyword GruvboxRed
|
||||
hi! link haskellFloat GruvboxAqua
|
||||
hi! link haskellInfix GruvboxPurple
|
||||
hi! link haskellQuote GruvboxGreenBold
|
||||
hi! link haskellShebang GruvboxYellowBold
|
||||
hi! link haskellLiquid GruvboxPurpleBold
|
||||
hi! link haskellQuasiQuoted GruvboxBlueBold
|
||||
hi! link haskellRecursiveDo GruvboxPurlpe
|
||||
hi! link haskellQuotedType GruvboxRed
|
||||
hi! link haskellPreProc GruvboxFg4
|
||||
hi! link haskellTypeRoles GruvboxRedBold
|
||||
hi! link haskellTypeForall GruvboxRed
|
||||
hi! link haskellPatternKeyword GruvboxBlue
|
||||
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
source $HOME/.config/nvim/plug/plug.vim
|
||||
source $HOME/.config/nvim/plugs.vim
|
||||
|
||||
syntax on
|
||||
filetype plugin indent on
|
||||
|
||||
" Open NERDTree using a nice shortcut
|
||||
map <C-n> :NERDTreeToggle<CR>
|
||||
|
||||
|
@ -39,8 +42,49 @@ let g:vimwiki_list = [ {'path': '~/Code/ntietz/vimwiki'} ]
|
|||
|
||||
set spell
|
||||
|
||||
colorscheme gruvbox
|
||||
set termguicolors
|
||||
set background=dark
|
||||
let g:gruvbox_italic=1
|
||||
colorscheme gruvbox
|
||||
|
||||
hi! link haskellType GruvboxBlue
|
||||
hi! link haskellIdentifier GruvboxAqua
|
||||
hi! link haskellSeparator GruvboxFg4
|
||||
hi! link haskellDelimiter GruvboxOrange
|
||||
hi! link haskellOperators GruvboxPurple
|
||||
|
||||
hi! link haskellBacktick GruvboxOrange
|
||||
hi! link haskellStatement GruvboxPurple
|
||||
hi! link haskellConditional GruvboxPurple
|
||||
|
||||
hi! link haskellLet GruvboxRed
|
||||
hi! link haskellDefault GruvboxRed
|
||||
hi! link haskellWhere GruvboxRed
|
||||
hi! link haskellBottom GruvboxRedBold
|
||||
hi! link haskellImportKeywords GruvboxPurpleBold
|
||||
hi! link haskellDeclKeyword GruvboxOrange
|
||||
hi! link haskellDecl GruvboxOrange
|
||||
hi! link haskellDeriving GruvboxPurple
|
||||
hi! link haskellAssocType GruvboxAqua
|
||||
|
||||
hi! link haskellNumber GruvboxAqua
|
||||
hi! link haskellPragma GruvboxRedBold
|
||||
|
||||
hi! link haskellTH GruvboxAquaBold
|
||||
hi! link haskellForeignKeywords GruvboxGreen
|
||||
hi! link haskellKeyword GruvboxRed
|
||||
hi! link haskellFloat GruvboxAqua
|
||||
hi! link haskellInfix GruvboxPurple
|
||||
hi! link haskellQuote GruvboxGreenBold
|
||||
hi! link haskellShebang GruvboxYellowBold
|
||||
hi! link haskellLiquid GruvboxPurpleBold
|
||||
hi! link haskellQuasiQuoted GruvboxBlueBold
|
||||
hi! link haskellRecursiveDo GruvboxPurlpe
|
||||
hi! link haskellQuotedType GruvboxRed
|
||||
hi! link haskellPreProc GruvboxFg4
|
||||
hi! link haskellTypeRoles GruvboxRedBold
|
||||
hi! link haskellTypeForall GruvboxRed
|
||||
hi! link haskellPatternKeyword GruvboxBlue
|
||||
|
||||
set autoread
|
||||
set updatetime=100
|
||||
|
@ -64,5 +108,6 @@ nmap <F8> :TagbarToggle<CR>
|
|||
" Turn off polyglot for go so they play nice
|
||||
if exists('g:loaded_polyglot')
|
||||
let g:polyglot_disabled = ['go']
|
||||
let g:polyglot_disabled = ['rst']
|
||||
endif
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ Plug 'vim-airline/vim-airline' " Display more contextual information
|
|||
|
||||
" language support
|
||||
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
|
||||
Plug 'neovimhaskell/haskell-vim'
|
||||
Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting for many languages
|
||||
|
||||
" vimwiki
|
||||
|
|
|
@ -3,7 +3,7 @@ bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
|
|||
|
||||
set -sg escape-time 0
|
||||
|
||||
set -g default-terminal "screen-256color"
|
||||
set -g default-terminal "tmux-256color"
|
||||
|
||||
# disable automatic window renaming
|
||||
set-window-option -g status-interval 1
|
||||
|
|
Loading…
Reference in a new issue