From 7b677de5e4afd2eb0522129210d0fd2615ce2a2c Mon Sep 17 00:00:00 2001
From: DarthMooMancer <107283522+DarthMooMancer@users.noreply.github.com>
Date: Tue, 18 Nov 2025 00:09:30 -0500
Subject: [PATCH] merging mac and gentoo

---
 .config/ghostty/config | 12 ++++++++----
 .zshrc                 | 31 +++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.config/ghostty/config b/.config/ghostty/config
index b2a06c7..e446ba6 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -1,14 +1,10 @@
-# theme = "everforest-dark"
 theme = "rose-pine-moon"
 
-font-size = 10
 font-family = "Maple Mono SemiBold"
 font-thicken = true
 
 background-opacity = 0.85
 background = 000000
-# background-opacity = 1
-# background-blur = false
 confirm-close-surface = false
 window-padding-x = 6
 window-padding-y = 6
@@ -17,3 +13,11 @@ mouse-hide-while-typing = true
 adjust-cell-height = 15%
 alpha-blending = linear-corrected
 bold-is-bright = true
+
+[macos]
+font-size = 12
+option-macos = true
+
+[linux]
+font-size = 10
+option-linux = true
diff --git a/.zshrc b/.zshrc
index bd0cd0e..d21f263 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,21 +1,25 @@
-if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
-    dbus-run-session sway
+if [[ $(uname) != "Darwin" ]]; then
+	if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+		dbus-run-session sway
+	fi
+	bindkey "^[[1;5C" forward-word
+	bindkey "^[[1;5D" backward-word
+	bindkey "^[[3~" delete-char
+	bindkey "^[[5~" up-line
+	bindkey "^[[6~" down-line
 fi
 
 HISTFILE=~/.zsh_history
 HISTSIZE=100
 SAVEHIST=200
 
-bindkey "^[[1;5C" forward-word
-bindkey "^[[1;5D" backward-word
-bindkey "^[[3~" delete-char
-bindkey "^[[5~" up-line
-bindkey "^[[6~" down-line
-
 source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
 
 zinit light zsh-users/zsh-autosuggestions
 zinit light zdharma-continuum/fast-syntax-highlighting
+if [[ $(uname) == "Darwin" ]]; then
+	zinit light junegunn/fzf
+fi
 
 eval "$(starship init zsh)"
 eval "$(zoxide init --cmd cd zsh)"
@@ -24,10 +28,17 @@ autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit
 
 export PATH="$HOME/.local/bin:$PATH"
-myfetch.sh
 
 alias ls="ls -a --color"
 alias grep="rg"
 alias comp="make && doas make install && make clean"
 alias update_world='doas emerge --ask --update --newuse --deep @world'
-alias env="sh /home/andrew/personal/dotfiles/env.sh"
+if [[ $(uname) != "Darwin" ]]; then
+	alias env="sh /home/andrew/personal/dotfiles/env.sh"
+	myfetch.sh
+else
+	alias env='sh ~/personal/env/setup.sh'
+	export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
+	export PATH="$(brew --prefix llvm)/bin:$PATH"
+	export GOOGLE_CLOUD_PROJECT="development-477121"
+fi