From 300fd1b732ccdbe32b6d9a054549548476b29cba Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 14 May 2021 15:09:51 -0500
Subject: [PATCH] Use global instead of universal fish_user_paths

---
 common/fish/paths.fish          | 12 ++++++------
 common/git/config               |  3 ---
 host/laptop/third/config.d.fish |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/common/fish/paths.fish b/common/fish/paths.fish
index 868668d..bc5df33 100755
--- a/common/fish/paths.fish
+++ b/common/fish/paths.fish
@@ -2,7 +2,7 @@
 
 set -Ux GOPATH $HOME/.go
 
-set -U fish_user_paths \
+set -g fish_user_paths \
 	$HOME/.go \
 	$GOPATH/bin \
 	$DOTFILES_PATH/common/bin \
@@ -13,14 +13,14 @@ set -U fish_user_paths \
 	$HOME/.netlify/helper/bin
 
 for d in $ENV_PATH/*/bin
-	test -d $d && set -Ua fish_user_paths $d
+	test -d $d && set -ga fish_user_paths $d
 end
 
-test -d $HOME/.local/bin && set -Ua fish_user_paths $HOME/.local/bin
-test -d $HOME/.bin && set -Ua fish_user_paths $HOME/.local/bin
+test -d $HOME/.local/bin && set -ga fish_user_paths $HOME/.local/bin
+test -d $HOME/.bin && set -ga fish_user_paths $HOME/.local/bin
 
-has_command python && set -Ua fish_user_paths (python -m site --user-base)/bin
-has_command ruby && set -Ua fish_user_paths (ruby -e 'print Gem.user_dir')/bin
+has_command python && set -ga fish_user_paths (python -m site --user-base)/bin
+has_command ruby && set -ga fish_user_paths (ruby -e 'print Gem.user_dir')/bin
 
 if set -q NICE_HOME
 else
diff --git a/common/git/config b/common/git/config
index ad2210f..bf05120 100644
--- a/common/git/config
+++ b/common/git/config
@@ -1,6 +1,3 @@
-[push]
-	default = current
-
 [user]
 	name = Daniel Flanagan
 	email = daniel@lyte.dev
diff --git a/host/laptop/third/config.d.fish b/host/laptop/third/config.d.fish
index 956d991..a3fce7c 100644
--- a/host/laptop/third/config.d.fish
+++ b/host/laptop/third/config.d.fish
@@ -1,2 +1,2 @@
 set e $argv[1]
-set -Ua fish_user_paths $e/bin
+set -ga fish_user_paths $e/bin