From 3d26c043f9909c0d0ae0974c9d062ca656f407fb Mon Sep 17 00:00:00 2001
From: Ando <divinegod@gmail.com>
Date: Fri, 22 Nov 2024 15:14:15 +1100
Subject: [PATCH] new mac new me

---
 Brewfile                         |  3 ---
 Makefile                         | 16 +++++-----------
 fish/.config/fish/config.fish    | 22 +++++-----------------
 fish/.config/fish/fish_variables | 29 ++++++++++++-----------------
 4 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/Brewfile b/Brewfile
index 3eaf047..dbccc72 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,8 +1,5 @@
 tap "armmbed/formulae"
 tap "homebrew/bundle"
-tap "homebrew/cask"
-tap "homebrew/cask-fonts"
-tap "homebrew/core"
 tap "homebrew/services"
 tap "osx-cross/avr"
 tap "qmk/qmk"
diff --git a/Makefile b/Makefile
index d49b43c..90fdc29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+FISH      := $(shell fish --version 2>/dev/null)
 BREW      := $(shell brew --version 2>/dev/null)
 CLI_TOOLS := $(xcode-select --install 2>&1 | grep installed;)
 RUSTUP    := $(shell rustup --version 2>/dev/null)
@@ -9,9 +10,6 @@ stow:
 	stow fish
 	stow git
 	stow alacritty
-	stow vim
-	stow nvim
-	stow tmux
 	stow bat
 
 install:
@@ -28,15 +26,11 @@ endif
 ifndef BREW
 	echo "Homebrew isn't installed... Installing"
 	/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+	echo >> /Users/dg/.zprofile
+	echo 'eval "$$(/opt/homebrew/bin/brew shellenv)"' >> /Users/dg/.zprofile
+	eval "$$(/opt/homebrew/bin/brew shellenv)"
 else
 endif
 
-	brew bundle
+	/opt/homebrew/bin/brew bundle
 	make stow
-
-	curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-
-ifeq ($(wildcard ~/.tmux/plugins/tpm/.),)
-	git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-endif
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index a28f8ad..13a91de 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,19 +1,7 @@
-set -g fish_key_bindings fish_vi_key_bindings
-
-set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
-fish_add_path "$HOME/.cargo/bin"
-fish_add_path "$HOME/.poetry/bin"
-fish_add_path "$HOME/go/bin"
-fish_add_path "$HOME/.local/bin"
-fish_add_path "$HOME/Luxonis/depthai/entrypoint"
-
-if status --is-interactive
-  set -x EDITOR "hx"
-  eval (/opt/homebrew/bin/brew shellenv)
-  atuin init fish | source
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+    fish_vi_key_bindings
+    atuin init fish | source
 end
 
-direnv hook fish | source
-
-status is-login; and pyenv init --path | source
-status is-interactive; and pyenv init - | source
+eval "$(/opt/homebrew/bin/brew shellenv)"
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 075d109..c490d25 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -1,36 +1,31 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR --export PYENV_ROOT:/Users/dg/\x2epyenv
 SETUVAR __fish_initialized:3400
-SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish
-SETUVAR fish_color_autosuggestion:cc99cc
+SETUVAR fish_color_autosuggestion:brblack
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:99cc99
-SETUVAR fish_color_comment:ffcc66
+SETUVAR fish_color_command:blue
+SETUVAR fish_color_comment:red
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:cc99cc
-SETUVAR fish_color_error:f2777a
-SETUVAR fish_color_escape:66cccc
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
 SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:6699cc
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:6699cc
-SETUVAR fish_color_param:d3d0c8
-SETUVAR fish_color_quote:ffcc66
-SETUVAR fish_color_redirection:d3d0c8
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
 SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/Users/dg/\x2epyenv/bin\x1e/usr/local/sbin\x1e/Users/dg/go/bin\x1e/Users/dg/\x2epoetry/bin\x1e/Users/dg/\x2ecargo/bin
-SETUVAR nvm_data:/Users/dg/\x2elocal/share/nvm
-SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist