summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachIR <zachir@librem.one>2025-06-30 00:26:51 -0500
committerZachIR <zachir@librem.one>2025-06-30 00:26:51 -0500
commit154e2cc089726fdc1635f4f540a898f874b75b60 (patch)
tree433e42730e33685cba4d4c0772e390491ea8fb4e
parentf473b0506fb988f29d60abc754c0ef31ec9e1128 (diff)
parentfaa34b8084be0814a05512e009d9ffa1ea349670 (diff)
Merge branch 'master' into car
-rw-r--r--X11/xresources2
-rw-r--r--zsh/zshrc10
2 files changed, 10 insertions, 2 deletions
diff --git a/X11/xresources b/X11/xresources
index d5c4550..7115b96 100644
--- a/X11/xresources
+++ b/X11/xresources
@@ -30,7 +30,7 @@ st.termname: st-256color
st.shell: /usr/bin/tmux
! The following options options can be reloaded via USR1 signal.
-!st.font: mononoki Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
+!st.font: Fira Code Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
!st.font2: Symbola:pixelsize=12:antialias=true:autohint=true;
st.borderpx: 3
! st alpha
diff --git a/zsh/zshrc b/zsh/zshrc
index 532fb15..0e87993 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,13 @@
#zmodload zsh/zprof
-if [ -d "$HOME/.zplug" ]; then
+if [ -n "$ZPLUG_HOME" ]; then
+ if [ -d "$ZPLUG_HOME" ]; then
+ export ZPLUG_INSTALLED="y"
+ source "$ZPLUG_HOME/init.zsh"
+ fi
+elif [ -d "$XDG_DATA_HOME/zplug" ]; then
+ export ZPLUG_INSTALLED="y"
+ source "$XDG_DATA_HOME/zplug/init.zsh"
+elif [ -d "$HOME/.zplug" ]; then
export ZPLUG_INSTALLED="y"
source "$HOME/.zplug/init.zsh"
fi