diff --git a/config/hypr/hyprland.lua b/config/hypr/hyprland.lua index 2fb53fba..a47cf60d 100644 --- a/config/hypr/hyprland.lua +++ b/config/hypr/hyprland.lua @@ -10,7 +10,7 @@ end -- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH. package.path = os.getenv("HOME") .. "/.config/?.lua;" - .. (os.getenv("OMARCHY_PATH") or (os.getenv("HOME") .. "/.local/share/omarchy")) + .. (os.getenv("OMARCHY_PATH") or "/usr/share/omarchy") .. "/?.lua;" .. package.path diff --git a/config/systemd/user/omarchy-recover-internal-monitor.service b/config/systemd/user/omarchy-recover-internal-monitor.service index b890f3fa..1e32afc7 100644 --- a/config/systemd/user/omarchy-recover-internal-monitor.service +++ b/config/systemd/user/omarchy-recover-internal-monitor.service @@ -5,7 +5,7 @@ ConditionPathExists=%h/.local/state/omarchy/toggles/hypr/internal-monitor-disabl [Service] Type=oneshot -ExecStart=%h/.local/share/omarchy/bin/omarchy-hw-recover-internal-monitor +ExecStart=/usr/bin/omarchy-hw-recover-internal-monitor [Install] WantedBy=graphical-session-pre.target diff --git a/default/bash/rc b/default/bash/rc index 3042e427..63e62497 100644 --- a/default/bash/rc +++ b/default/bash/rc @@ -1,6 +1,7 @@ -source ~/.local/share/omarchy/default/bash/envs -source ~/.local/share/omarchy/default/bash/shell -source ~/.local/share/omarchy/default/bash/aliases -source ~/.local/share/omarchy/default/bash/functions -source ~/.local/share/omarchy/default/bash/init -[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc +: "${OMARCHY_PATH:=/usr/share/omarchy}" +source "$OMARCHY_PATH/default/bash/envs" +source "$OMARCHY_PATH/default/bash/shell" +source "$OMARCHY_PATH/default/bash/aliases" +source "$OMARCHY_PATH/default/bash/functions" +source "$OMARCHY_PATH/default/bash/init" +[[ $- == *i* ]] && bind -f "$OMARCHY_PATH/default/bash/inputrc" diff --git a/default/hypr/paths.lua b/default/hypr/paths.lua index 1a8f9ef3..b3676d04 100644 --- a/default/hypr/paths.lua +++ b/default/hypr/paths.lua @@ -19,7 +19,7 @@ end local omarchy_path = read_dev_link_omarchy_path() or os.getenv("OMARCHY_PATH") - or (home .. "/.local/share/omarchy") + or "/usr/share/omarchy" return { home = home, diff --git a/install/config/xcompose.sh b/install/config/xcompose.sh index 9534abb6..17866bd1 100644 --- a/install/config/xcompose.sh +++ b/install/config/xcompose.sh @@ -3,7 +3,7 @@ tee ~/.XCompose >/dev/null < : "$OMARCHY_USER_NAME"