From fa8c6ba9b35e02140d08cdd17e31c1fbd3f356d9 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Sun, 9 Aug 2020 13:57:46 -0700
Subject: [PATCH] MAINT: cleaning up nix deps

---
 README.md | 29 ++++++++++++++++-------------
 vimrc     |  4 ----
 zsh/zshrc |  3 +++
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b39c137..0b1ad55 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,44 @@
-# Dotfiles
+# dotfiles
 
 ```bash
 $ git clone https://github.com/thermokarst/dotfiles.git ~/.dotfiles
 $ cd ~/.dotfiles
 $ git remote rename origin thermokarst
-$ sudo bash -c "echo nix /System/Volumes/Data/nix | tr ' ' '\t' >> /etc/synthetic.conf"
-$ sudo mkdir /System/Volumes/Data/nix
-$ sudo chown $USER /System/Volumes/Data/nix
-# REBOOT
 $ git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell
 $ git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
 $ ./install
-$ curl https://nixos.org/nix/install | sh
+$ sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume
 $ source ~/.zshrc
 $ nix-env -i \
   alacritty \
+  cmus \
   docker \
+  elixir \
   git \
   htop \
+  nodejs \
   postgresql \
   reattach-to-user-namespace \
   silver-searcher \
   syncthing \
   tmux \
-  universal-ctags \
   vim \
   wget \
-  xz
+  xz \
+  yarn
 $ base16_ashes
 $ curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
+$ sudo sh Miniconda3-latest-MacOSX-x86_64.sh -p /opt/miniconda3 -b
+$ sudo conda update conda
+$ wget https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-osx-conda.yml
+$ conda env create -n q2dev --file qiime2-latest-py36-osx-conda.yml
+```
 
+## optional vscode extensions
+
+```bash
 $ code --install-extension AndrsDC.base16-themes
 $ code --install-extension ecmel.vscode-html-css
 $ code --install-extension formulahendry.auto-close-tag
@@ -44,9 +52,4 @@ $ code --install-extension ms-vsliveshare.vsliveshare
 $ code --install-extension redhat.vscode-yaml
 $ code --install-extension vscodevim.vim
 $ code --install-extension wakatime.vscode-wakatime
-$ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-$ sudo sh Miniconda3-latest-MacOSX-x86_64.sh -p /opt/miniconda3 -b
-$ sudo conda update conda
-$ wget https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-osx-conda.yml
-$ conda env create -n q2dev --file qiime2-latest-py36-osx-conda.yml
 ```
diff --git a/vimrc b/vimrc
index c5ceb5e..812cfca 100644
--- a/vimrc
+++ b/vimrc
@@ -36,7 +36,6 @@ nnoremap <silent> ]B :blast<CR>
 call plug#begin('~/.vim/plugged')
   Plug 'airblade/vim-gitgutter'
   Plug 'chriskempson/base16-vim'
-  Plug 'ludovicchabant/vim-gutentags'
   Plug 'ntpeters/vim-better-whitespace'
   Plug 'sheerun/vim-polyglot'
   Plug 'tpope/vim-vinegar'
@@ -49,9 +48,6 @@ call plug#end()
 let base16colorspace=256
 source ~/.vimrc_background
 
-" for Plug 'ludovicchabant/vim-gutentags'
-let g:gutentags_cache_dir = '~/.gutentags_cache'
-
 " for Plug 'ntpeters/vim-better-whitespace'
 let g:better_whitespace_enabled=1
 let g:strip_whitespace_on_save=1
diff --git a/zsh/zshrc b/zsh/zshrc
index 7bbe2fd..b525129 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -20,6 +20,9 @@ alias i="ipython3"
 
 BASE16_SHELL=$HOME/.config/base16-shell/
 [ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
+if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then
+  source $HOME/.nix-profile/etc/profile.d/nix.sh;
+fi
 
 # Backup shortcuts (borrowed parts from https://github.com/laurent22/rsync-time-backup
 function prune_backups() {