From 95f3caa85198360394b8d6a953d780949027b8f6 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Wed, 25 Sep 2019 19:28:00 -0400 Subject: [PATCH 1/5] Remove poetry from path --- bash/.profile | 3 --- 1 file changed, 3 deletions(-) diff --git a/bash/.profile b/bash/.profile index ccd4b19..0848c72 100644 --- a/bash/.profile +++ b/bash/.profile @@ -59,6 +59,3 @@ if [ -f /usr/local/etc/bash_completion ] then . /usr/local/etc/bash_completion fi - -# -#export PATH="$HOME/.poetry/bin:$PATH" From 0a1ab9455ebcec82b6375013c21ffb653905f407 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 30 Sep 2019 19:41:12 -0400 Subject: [PATCH 2/5] Prevent pyenv from hijacking virtualenvs --- bash/.profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/.profile b/bash/.profile index 0848c72..7d6438a 100644 --- a/bash/.profile +++ b/bash/.profile @@ -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 -)" From 20fd41a89de3ffcf6c01cf8d36de585c67d1d10c Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Thu, 2 Jan 2020 06:38:04 -0500 Subject: [PATCH 3/5] Add poetry to the path --- bash/.profile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bash/.profile b/bash/.profile index 7d6438a..ff3170e 100644 --- a/bash/.profile +++ b/bash/.profile @@ -59,3 +59,5 @@ if [ -f /usr/local/etc/bash_completion ] then . /usr/local/etc/bash_completion fi + +export PATH="$HOME/.poetry/bin:$PATH" From b0b02c51b1d82d8b6f7e9f547d6cc68e9a494906 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 13 Jan 2020 14:07:04 -0500 Subject: [PATCH 4/5] Add auto install of latest git --- install.sh | 7 +++++++ nvim/.config/nvim/init.vim | 1 + 2 files changed, 8 insertions(+) diff --git a/install.sh b/install.sh index 1ee0309..f6254c2 100755 --- a/install.sh +++ b/install.sh @@ -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 diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index ac64386..ea6c37e 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -64,5 +64,6 @@ nmap :TagbarToggle " 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 From edc99041edebe89e90dd0dc6ddf09cb5b44ffb91 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Thu, 6 Feb 2020 20:04:13 -0500 Subject: [PATCH 5/5] Fixup vim colors --- nvim/.config/nvim/colors.vim | 48 ++++++++++++++++++++++++++++++++++++ nvim/.config/nvim/init.vim | 46 +++++++++++++++++++++++++++++++++- nvim/.config/nvim/plugs.vim | 1 + tmux/.tmux.conf | 2 +- 4 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 nvim/.config/nvim/colors.vim diff --git a/nvim/.config/nvim/colors.vim b/nvim/.config/nvim/colors.vim new file mode 100644 index 0000000..f1b39b5 --- /dev/null +++ b/nvim/.config/nvim/colors.vim @@ -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 + + diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index ea6c37e..a86e010 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -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 :NERDTreeToggle @@ -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 diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim index ac5eed6..74bdf85 100644 --- a/nvim/.config/nvim/plugs.vim +++ b/nvim/.config/nvim/plugs.vim @@ -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 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index cee3823..378ef09 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -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