Remove hot link / unlink bits
This commit is contained in:
@@ -17,12 +17,11 @@ export OMARCHY_PATH
|
||||
|
||||
# Only prepend in dev-link mode. On a production install, the binaries are
|
||||
# already on PATH as /usr/bin/omarchy-* via the omarchy package — prepending
|
||||
# /usr/share/omarchy/bin would just be noise. omarchy-dev-unlink strips its
|
||||
# checkout bin/ from the active PATH explicitly, so we don't dedupe here.
|
||||
# /usr/share/omarchy/bin would just be noise.
|
||||
if [ "$OMARCHY_PATH" != /usr/share/omarchy ]; then
|
||||
case ":$PATH:" in
|
||||
*":${OMARCHY_PATH%/}/bin:"*) ;;
|
||||
*) PATH="${OMARCHY_PATH%/}/bin:$PATH" ;;
|
||||
*) PATH="${OMARCHY_PATH%/}/bin${PATH:+:$PATH}" ;;
|
||||
esac
|
||||
export PATH
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
-- Hyprland bootstrap for Omarchy's Lua module path.
|
||||
|
||||
-- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
|
||||
package.path = os.getenv("HOME")
|
||||
.. "/.config/?.lua;"
|
||||
.. (os.getenv("OMARCHY_PATH") or "/usr/share/omarchy")
|
||||
.. "/?.lua;"
|
||||
.. package.path
|
||||
+1
-18
@@ -4,26 +4,9 @@
|
||||
|
||||
local home = os.getenv("HOME")
|
||||
|
||||
-- /etc/omarchy.conf wins over process env so dev-link/unlink survives stale sessions.
|
||||
local function read_dev_link_omarchy_path()
|
||||
local f = io.open("/etc/omarchy.conf", "r")
|
||||
if not f then return nil end
|
||||
local value
|
||||
for line in f:lines() do
|
||||
local v = line:match('^%s*export%s+OMARCHY_PATH=%s*"?([^"\n]+)"?')
|
||||
if v and #v > 0 then value = v end
|
||||
end
|
||||
f:close()
|
||||
return value
|
||||
end
|
||||
|
||||
local omarchy_path = read_dev_link_omarchy_path()
|
||||
or os.getenv("OMARCHY_PATH")
|
||||
or "/usr/share/omarchy"
|
||||
|
||||
return {
|
||||
home = home,
|
||||
config_home = os.getenv("XDG_CONFIG_HOME") or (home .. "/.config"),
|
||||
state_home = os.getenv("XDG_STATE_HOME") or (home .. "/.local/state"),
|
||||
omarchy_path = omarchy_path,
|
||||
omarchy_path = os.getenv("OMARCHY_PATH") or "/usr/share/omarchy",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user