merging mac and gentoo

This commit is contained in:
DarthMooMancer
2025-11-18 00:09:30 -05:00
parent 4d16d9b8bd
commit 7b677de5e4
2 changed files with 29 additions and 14 deletions
+8 -4
View File
@@ -1,14 +1,10 @@
# theme = "everforest-dark"
theme = "rose-pine-moon" theme = "rose-pine-moon"
font-size = 10
font-family = "Maple Mono SemiBold" font-family = "Maple Mono SemiBold"
font-thicken = true font-thicken = true
background-opacity = 0.85 background-opacity = 0.85
background = 000000 background = 000000
# background-opacity = 1
# background-blur = false
confirm-close-surface = false confirm-close-surface = false
window-padding-x = 6 window-padding-x = 6
window-padding-y = 6 window-padding-y = 6
@@ -17,3 +13,11 @@ mouse-hide-while-typing = true
adjust-cell-height = 15% adjust-cell-height = 15%
alpha-blending = linear-corrected alpha-blending = linear-corrected
bold-is-bright = true bold-is-bright = true
[macos]
font-size = 12
option-macos = true
[linux]
font-size = 10
option-linux = true
+18 -7
View File
@@ -1,21 +1,25 @@
if [[ $(uname) != "Darwin" ]]; then
if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
dbus-run-session sway dbus-run-session sway
fi 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 HISTFILE=~/.zsh_history
HISTSIZE=100 HISTSIZE=100
SAVEHIST=200 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" source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
zinit light zsh-users/zsh-autosuggestions zinit light zsh-users/zsh-autosuggestions
zinit light zdharma-continuum/fast-syntax-highlighting zinit light zdharma-continuum/fast-syntax-highlighting
if [[ $(uname) == "Darwin" ]]; then
zinit light junegunn/fzf
fi
eval "$(starship init zsh)" eval "$(starship init zsh)"
eval "$(zoxide init --cmd cd zsh)" eval "$(zoxide init --cmd cd zsh)"
@@ -24,10 +28,17 @@ autoload -Uz _zinit
(( ${+_comps} )) && _comps[zinit]=_zinit (( ${+_comps} )) && _comps[zinit]=_zinit
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"
myfetch.sh
alias ls="ls -a --color" alias ls="ls -a --color"
alias grep="rg" alias grep="rg"
alias comp="make && doas make install && make clean" alias comp="make && doas make install && make clean"
alias update_world='doas emerge --ask --update --newuse --deep @world' alias update_world='doas emerge --ask --update --newuse --deep @world'
if [[ $(uname) != "Darwin" ]]; then
alias env="sh /home/andrew/personal/dotfiles/env.sh" 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