From 47fdcca7ad96391101b073428e2f1591aa12a26c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <danielflanagan@Daniels-MacBook-Pro.local>
Date: Tue, 10 May 2022 11:23:32 -0700
Subject: [PATCH] Add macos goodies?

---
 common/bash/rc                          | 1 +
 common/envs                             | 1 +
 common/fish/config.fish                 | 2 +-
 common/fish/paths.fish                  | 2 +-
 common/fish/prompt.fish                 | 5 ++---
 common/neovim/colors/base16-donokai.vim | 2 +-
 os/macos/config.d.fish                  | 4 ++++
 7 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 os/macos/config.d.fish

diff --git a/common/bash/rc b/common/bash/rc
index 58215a5..34f4e2c 100644
--- a/common/bash/rc
+++ b/common/bash/rc
@@ -8,3 +8,4 @@ command -v fish >/dev/null 2>&1 && grep fish /etc/shells >/dev/null 2>&1 && {
 	echo "  You can also try fish temporarily by running 'fish'. No 'chsh' commitment required."
 	echo "  If you're in bash intentionally for some reason, then ignore this message."
 }
+. "$HOME/.cargo/env"
diff --git a/common/envs b/common/envs
index c14dd3d..d3d3272 100644
--- a/common/envs
+++ b/common/envs
@@ -2,6 +2,7 @@ os/linux
 os/linux/arch
 os/linux/nix
 os/linux/debian
+os/macos
 host/desktop
 host/desktop/wallwart
 host/desktop/rising
diff --git a/common/fish/config.fish b/common/fish/config.fish
index a9f764c..f106100 100755
--- a/common/fish/config.fish
+++ b/common/fish/config.fish
@@ -12,7 +12,7 @@ end
 
 if has_command brew && test -f (brew --prefix asdf)/lib/asdf.fish
 	set -Ux ASDF_DIR (brew --prefix asdf)
-	source (brew --prefix asdf)/lib/asdf.fish
+	source (brew --prefix asdf)/libexec/asdf.fish
 else if test -f $HOME/.asdf/asdf.fish
 	source $HOME/.asdf/asdf.fish
 else if test -f /opt/asdf-vm/asdf.fish
diff --git a/common/fish/paths.fish b/common/fish/paths.fish
index a8451ef..cf5c303 100644
--- a/common/fish/paths.fish
+++ b/common/fish/paths.fish
@@ -71,4 +71,4 @@ if test -n "$NIX_PATH"
 	set NIX_PATH :
 end
 test -d $HOME/.nix-defexpr/channels && \
-	 set --export --universal NIX_PATH $HOME/.nix-defexpr/channels:$NIX_PATH
+	set --export --universal NIX_PATH $HOME/.nix-defexpr/channels:$NIX_PATH
diff --git a/common/fish/prompt.fish b/common/fish/prompt.fish
index 902841f..e0aceef 100644
--- a/common/fish/prompt.fish
+++ b/common/fish/prompt.fish
@@ -12,9 +12,8 @@ end
 function preprocess_pwd
 	test (pwd) = / && echo "/" && return 1
 	test (pwd) = $NICE_HOME && echo "~" && return 0
-	# TODO: fix for macOS
-	echo (pwd) | cut -c2- | \
-		awk '{split($0,p,"/");for(k in p){if(k==length(p)){printf "/%s",p[k]}else{printf "/%.'$MAX_PATH_PIECE_CHARS[1]'s",p[k]}}}'
+	pwd | cut -c2- | \
+		awk '{n=split($0,p,"/");for(i=1;i<=n;i++){if(i==n){printf "/%s",p[i]}else{printf "/%.'$MAX_PATH_PIECE_CHARS[1]'s",p[i]}}}'
 end
 
 function fish_prompt
diff --git a/common/neovim/colors/base16-donokai.vim b/common/neovim/colors/base16-donokai.vim
index 3af3c64..676c00e 120000
--- a/common/neovim/colors/base16-donokai.vim
+++ b/common/neovim/colors/base16-donokai.vim
@@ -1 +1 @@
-/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim
\ No newline at end of file
+/Users/danielflanagan/.config/lytedev-dotfiles/common/colors/vim
\ No newline at end of file
diff --git a/os/macos/config.d.fish b/os/macos/config.d.fish
new file mode 100644
index 0000000..c8d40de
--- /dev/null
+++ b/os/macos/config.d.fish
@@ -0,0 +1,4 @@
+#!/usr/bin/env fish
+
+fish_add_path /opt/homebrew/sbin
+fish_add_path /opt/homebrew/bin