From 98c89a360d351418ebb82f5c05805c9aeed4b0b6 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Wed, 22 Jan 2020 15:21:23 -0700
Subject: [PATCH] MAINT: macos catalina (#4)

---
 README.md     | 48 +++++++++++++++++++++++-------------------------
 alacritty.yml |  1 -
 git/gitconfig |  2 ++
 vimrc         |  2 --
 zsh/zshenv    |  6 ++++++
 zsh/zshrc     |  6 ++++++
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index e9603d1..dd74e30 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,37 @@
 # Dotfiles
 
 ```bash
-$ sudo zypper install \
-  the_silver_searcher \
-  cmus \
-  ctags \
-  docker \
-  gcc \
-  git \
-  htop \
-  mr \
-  nodejs10 \
-  postgresql \
-  postgresql-server \
-  postgresql-devel \
-  tlp \
-  tmux \
-  tree \
-  vim \
-  wget \
-  xz \
-  zsh
 $ git clone https://github.com/thermokarst/dotfiles.git ~/.dotfiles
 $ cd ~/.dotfiles
 $ git remote rename origin thermokarst
-$ sudo chsh $USER -s zsh
+$ 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
+$ source ~/.zshrc
+$ nix-env -i \
+  alacritty \
+  docker \
+  git \
+  htop \
+  mr \
+  postgresql \
+  silver-searcher \
+  tmux \
+  vim \
+  wget \
+  xz
+$ base16_ashes
 $ curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 $ vim +PlugInstall
 $ mr checkout
-$ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
-$ sudo sh Miniconda3-latest-Linux-x86_64.sh  # install to /opt/miniconda3
+$ 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-linux-conda.yml
-$ conda env create -n q2dev --file qiime2-latest-py36-linux-conda.yml
+$ 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/alacritty.yml b/alacritty.yml
index c66b92d..27a7974 100644
--- a/alacritty.yml
+++ b/alacritty.yml
@@ -9,7 +9,6 @@ window:
 scrolling:
   history: 10000
   multiplier: 3
-  faux_multiplier: 3
   auto_scroll: false
 tabspaces: 8
 font:
diff --git a/git/gitconfig b/git/gitconfig
index e4393f6..64abf21 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -50,5 +50,7 @@
     la = "!git config -l | grep alias | cut -c 7-"
 [push]
     default = upstream
+[credential]
+    helper = osxkeychain
 [pull]
     rebase = true
diff --git a/vimrc b/vimrc
index ddf4f2f..697395f 100644
--- a/vimrc
+++ b/vimrc
@@ -17,8 +17,6 @@ call plug#begin()
   Plug 'mustache/vim-mustache-handlebars'
   " the silver searcher
   Plug 'mileszs/ack.vim'
-  " ctag generation
-  Plug 'jsfaint/gen_tags.vim'
   " fzf setup
   Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 call plug#end()
diff --git a/zsh/zshenv b/zsh/zshenv
index 1460639..8479bd9 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -2,6 +2,12 @@
 # Defines environment variables.
 #
 
+#
+# Nix
+#
+
+export NIX_IGNORE_SYMLINK_STORE=1
+
 #
 # Browser
 #
diff --git a/zsh/zshrc b/zsh/zshrc
index ac41886..7402bcf 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -6,6 +6,10 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
+if [[ -s "${HOME}/.nix-profile/etc/profile.d/nix.sh" ]]; then
+  source $HOME/.nix-profile/etc/profile.d/nix.sh
+fi
+
 if [[ -s "/opt/miniconda3/etc/profile.d/conda.sh" ]]; then
   source /opt/miniconda3/etc/profile.d/conda.sh
 fi
@@ -69,3 +73,5 @@ function back_things_up() {
 
 
 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh