Replace ~/.local/share/omarchy runtime paths with $OMARCHY_PATH
The git-era flow installed Omarchy to ~/.local/share/omarchy. In the package-based flow it lives at /usr/share/omarchy (or, in dev mode, at the path /etc/omarchy.conf's OMARCHY_PATH points at). Files that hard- coded the old path broke on package installs: - default/bash/rc: sourced ~/.local/share/omarchy/default/bash/*, so a fresh user's terminal logged ENOENT for every line. Now sources from $OMARCHY_PATH with /usr/share/omarchy as the safe default if the var is unset. - config/systemd/user/omarchy-recover-internal-monitor.service: ExecStart pointed at %h/.local/share/omarchy/bin/. The script ships to /usr/bin via the omarchy-installer package; point straight there. - install/config/xcompose.sh: wrote an XCompose include line pointing at the user-home path; use /usr/share/omarchy/ directly. - default/hypr/paths.lua and config/hypr/hyprland.lua: fallback when OMARCHY_PATH is unset is /usr/share/omarchy, not the home path. Dev-only scripts (omarchy-dev-add-migration, omarchy-reinstall-git) and the SKILL.md docs still reference the old path; those are separate cleanups since they don't affect a fresh install's runtime.
This commit is contained in:
@@ -10,7 +10,7 @@ end
|
|||||||
-- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
|
-- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
|
||||||
package.path = os.getenv("HOME")
|
package.path = os.getenv("HOME")
|
||||||
.. "/.config/?.lua;"
|
.. "/.config/?.lua;"
|
||||||
.. (os.getenv("OMARCHY_PATH") or (os.getenv("HOME") .. "/.local/share/omarchy"))
|
.. (os.getenv("OMARCHY_PATH") or "/usr/share/omarchy")
|
||||||
.. "/?.lua;"
|
.. "/?.lua;"
|
||||||
.. package.path
|
.. package.path
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ ConditionPathExists=%h/.local/state/omarchy/toggles/hypr/internal-monitor-disabl
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStart=%h/.local/share/omarchy/bin/omarchy-hw-recover-internal-monitor
|
ExecStart=/usr/bin/omarchy-hw-recover-internal-monitor
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=graphical-session-pre.target
|
WantedBy=graphical-session-pre.target
|
||||||
|
|||||||
+7
-6
@@ -1,6 +1,7 @@
|
|||||||
source ~/.local/share/omarchy/default/bash/envs
|
: "${OMARCHY_PATH:=/usr/share/omarchy}"
|
||||||
source ~/.local/share/omarchy/default/bash/shell
|
source "$OMARCHY_PATH/default/bash/envs"
|
||||||
source ~/.local/share/omarchy/default/bash/aliases
|
source "$OMARCHY_PATH/default/bash/shell"
|
||||||
source ~/.local/share/omarchy/default/bash/functions
|
source "$OMARCHY_PATH/default/bash/aliases"
|
||||||
source ~/.local/share/omarchy/default/bash/init
|
source "$OMARCHY_PATH/default/bash/functions"
|
||||||
[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc
|
source "$OMARCHY_PATH/default/bash/init"
|
||||||
|
[[ $- == *i* ]] && bind -f "$OMARCHY_PATH/default/bash/inputrc"
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ end
|
|||||||
|
|
||||||
local omarchy_path = read_dev_link_omarchy_path()
|
local omarchy_path = read_dev_link_omarchy_path()
|
||||||
or os.getenv("OMARCHY_PATH")
|
or os.getenv("OMARCHY_PATH")
|
||||||
or (home .. "/.local/share/omarchy")
|
or "/usr/share/omarchy"
|
||||||
|
|
||||||
return {
|
return {
|
||||||
home = home,
|
home = home,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ tee ~/.XCompose >/dev/null <<EOF
|
|||||||
# Run omarchy-restart-xcompose to apply changes
|
# Run omarchy-restart-xcompose to apply changes
|
||||||
|
|
||||||
# Include fast emoji access
|
# Include fast emoji access
|
||||||
include "%H/.local/share/omarchy/default/xcompose"
|
include "/usr/share/omarchy/default/xcompose"
|
||||||
|
|
||||||
# Identification
|
# Identification
|
||||||
<Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
|
<Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
|
||||||
|
|||||||
Reference in New Issue
Block a user