From 85d491cf64c23bdd1fa238ba6058b0b96b967beb Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Sun, 6 Jun 2021 15:33:27 -0700
Subject: [PATCH] maint: back to macports

---
 README.md            | 18 ++++++++++++++----
 vscode/settings.json |  1 -
 zsh/zshenv           |  8 ++++++--
 zsh/zshrc            |  3 ---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 17046a6..fd65a07 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,19 @@
 # dotfiles
 
 ```bash
-$ git clone --origin thermokart ssh://git@pingo.thermokar.st:dotfiles ~/.dotfiles
+$ git clone --origin pingo ssh://git@pingo.thermokar.st/dotfiles ~/.dotfiles
 $ 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"
 $ cd ~/.dotfiles
 $ ./install
 $ source ~/.zshrc
-$ sudo port install \
+# At the time of this commit, cmus depends on mp4v2 - the latest version
+# (ae4bd4f26c27327c8d188e127022d9231f8c7d4b) doesn't appear to be linking
+# correctly, so I had to manually install an older version.
+$ sudo -s
+$ yes | port install \
     ImageMagick \
+    cargo \
     cmus \
     curl \
     git \
@@ -16,7 +21,6 @@ $ sudo port install \
     htop \
     nodejs16 \
     pass \
-    pinetry-mac \
     syncthing-macos \
     the_silver_searcher \
     tmux \
@@ -28,18 +32,20 @@ $ sudo port install \
 $ base16_ashes
 $ curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+$ vim +PlugInstall
 $ 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-py38-osx-conda.yml
 $ conda env create -n q2dev --file qiime2-latest-py38-osx-conda.yml
-$ conda env create -n dotfiles -c conda-forge pygit2
+$ conda create -n dotfiles -c conda-forge pygit2
 $ conda run -n dotfiles python ~/.dotfiles/bin/sync_git_repos.py ~/.dotfiles/repos.ini
 ```
 
 ## manual apps
 
 - chrome
+- cisco anyconnect
 - docker desktop
 - firefox
 - garageband
@@ -48,10 +54,14 @@ $ conda run -n dotfiles python ~/.dotfiles/bin/sync_git_repos.py ~/.dotfiles/rep
 - melodics
 - passff-host
 - postgres.app
+- renoise
+- signal
+- slack
 - steermouse
 - thunderbird
 - virtualbox
 - vscode
+- xcode
 - zoom
 
 ## optional vscode extensions
diff --git a/vscode/settings.json b/vscode/settings.json
index 825084e..c4c012c 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -26,6 +26,5 @@
     "python.defaultInterpreterPath": "~/.conda/envs/q2dev/bin/python",
     "python.terminal.activateEnvInCurrentTerminal": true,
     "python.languageServer": "Microsoft",
-    "git.enabled": false,
     "liveshare.authenticationProvider": "GitHub"
 }
diff --git a/zsh/zshenv b/zsh/zshenv
index d33b1ee..bfacf69 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -74,11 +74,15 @@ typeset -gU cdpath fpath mailpath path
 
 # Set the list of directories that Zsh searches for programs.
 path=(
-  $path
-
   # miniconda
   /opt/miniconda3/bin
 
+  # macports
+  /opt/local/bin
+  /opt/local/sbin
+
+  $path
+
   # npm
   $HOME/.npm-packages/bin
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 93a43b0..f4039d6 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -21,9 +21,6 @@ alias greg="grep"
 
 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() {