From 2332284d8ecdcab319681dc0ccec7131a478ae4d Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Tue, 19 Feb 2019 14:02:45 -0700
Subject: [PATCH] MAINT: path cleanup and beets

---
 beets.yaml        | 21 +++++++++++++++++++++
 install.conf.yaml | 31 +++++++++++++++++--------------
 zsh/zprofile      |  5 +++++
 zsh/zshenv        | 41 ++++++++++++++++++++---------------------
 zsh/zshrc         |  2 ++
 5 files changed, 65 insertions(+), 35 deletions(-)
 create mode 100644 beets.yaml

diff --git a/beets.yaml b/beets.yaml
new file mode 100644
index 0000000..b446e64
--- /dev/null
+++ b/beets.yaml
@@ -0,0 +1,21 @@
+directory: ~/Music/beets/
+
+library: ~/Music/beets/mrdlib.blb
+
+import:
+    copy: true
+    write: true
+    resume: ask
+    art: true
+    quiet_fallback: skip
+    timid: true
+    log: beetslog.txt
+
+art_filename: albumart
+
+pluginpath:
+- ~/Music/beets/myplugins
+
+threaded: false
+
+color: true
diff --git a/install.conf.yaml b/install.conf.yaml
index a3624ad..970b835 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -1,17 +1,20 @@
 - clean: ['~']
 
 - link:
-    ~/.tmux.conf:        tmux.conf
-    ~/.gitconfig:        git/gitconfig
-    ~/.gitignore_global: git/gitignore_global
-    ~/.psqlrc:           psqlrc
-    ~/.zpreztorc:        zsh/zpreztorc
-    ~/.zlogin:           zsh/zlogin
-    ~/.zlogout:          zsh/zlogout
-    ~/.zprofile:         zsh/zprofile
-    ~/.zshenv:           zsh/zshenv
-    ~/.zshrc:            zsh/zshrc
-    ~/.aspell.en.pws:    aspell.en.pws
-    ~/.vimrc:            vimrc
-    ~/.mrconfig:         mrconfig
-    ~/.taskrc:           taskrc
+    ~/.tmux.conf:                tmux.conf
+    ~/.gitconfig:                git/gitconfig
+    ~/.gitignore_global:         git/gitignore_global
+    ~/.psqlrc:                   psqlrc
+    ~/.zpreztorc:                zsh/zpreztorc
+    ~/.zlogin:                   zsh/zlogin
+    ~/.zlogout:                  zsh/zlogout
+    ~/.zprofile:                 zsh/zprofile
+    ~/.zshenv:                   zsh/zshenv
+    ~/.zshrc:                    zsh/zshrc
+    ~/.aspell.en.pws:            aspell.en.pws
+    ~/.vimrc:                    vimrc
+    ~/.mrconfig:                 mrconfig
+    ~/.taskrc:                   taskrc
+    ~/.config/beets/config.yaml:
+      create: true
+      path: beets.yaml
diff --git a/zsh/zprofile b/zsh/zprofile
index 1300610..07bdddd 100644
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -1,2 +1,7 @@
 # Matthew Dillon
 # matthewrdillon@gmail.com
+
+# Doing this to get around `path_helper`, which reorders my path when I
+# least expect it!
+# https://github.com/sorin-ionescu/prezto/issues/381
+export PATH=$PATH_SAVE:$PATH
diff --git a/zsh/zshenv b/zsh/zshenv
index b57a502..b399f4e 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -58,36 +58,35 @@ fi
 # Paths
 #
 
-# shortcuts to projects
-export CDPATH="$CDPATH:$HOME/src/biocore"
-export CDPATH="$CDPATH:$HOME/src/caporaso-lab"
-export CDPATH="$CDPATH:$HOME/src/gregcaporaso"
-export CDPATH="$CDPATH:$HOME/src/qiime2"
-export CDPATH="$CDPATH:$HOME/src/thermokarst"
-export CDPATH="$CDPATH:."
-
-# miniconda
-export PATH="/opt/miniconda3/bin:$PATH"
-
-# macports
-export PATH="/opt/local/bin:$PATH"
-export PATH="/opt/local/sbin:$PATH"
-
-# golang
-export GOROOT=/opt/go
-export PATH="$GOROOT/bin:$PATH"
-
 typeset -gU cdpath fpath mailpath path
 
 # Set the the list of directories that cd searches.
 cdpath=(
+  # shortcuts to projects
+  $HOME/src/biocore
+  $HOME/src/caporaso-lab
+  $HOME/src/gregcaporaso
+  $HOME/src/qiime2
+  $HOME/src/thermokarst
+  .
   $cdpath
 )
 
 # Set the list of directories that Zsh searches for programs.
 path=(
-  $path
-  /usr/local/{bin,sbin}
+  # miniconda
+  /opt/miniconda3/bin
+
+  # macports
+  /opt/local/bin
+  /opt/local/sbin
+
+  # xquartz
+  /opt/X11/bin
+
+  # latex
+  /Library/Tex/texbin
 )
 
 export -U PATH
+export PATH_SAVE=$PATH
diff --git a/zsh/zshrc b/zsh/zshrc
index ff2f15e..1e9538a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -6,6 +6,8 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
+source /opt/miniconda3/etc/profile.d/conda.sh
+
 # shortcuts
 alias mailserver="sudo python -m smtpd -n -c DebuggingServer localhost:25"
 alias mongod="mongod --config /usr/local/etc/mongod.conf"