Timo
900cea0188
hyprlang has been deprecated since Hyprland 0.55 and is dropped after 1-2 releases; this box runs 0.56.2. Migrate Hyprland's own config to Lua and split the machine-specific parts into profiles. Config: - hyprland.lua entry point; the .conf tree is left in place as a rollback path (Hyprland prefers hyprland.lua and only decides at startup). - Each require() is its own Lua scope, so hyprlang's global "$VAR" no longer crosses files: vars.lua / apps.lua / theme/colors.lua return tables. - hypridle, hyprlock, plugins/* and pyprland.toml stay hyprlang -- the other hypr* tools keep it. Profiles (configs/profiles/): - pc -> DP-1 / HDMI-A-1 / DP-2, all 1920x1080 - laptop -> eDP-1 3072x1920@120 scale 2.0, DP-1, HDMI-A-1 mirroring eDP-1 - Each owns its monitors and workspace-to-monitor mapping; common.lua generates the 30 workspace rules from the three outputs. - Selected by $HYPR_PROFILE, else hostname (mainPC -> pc), else laptop. Fixes: - pyprland.toml called swww, which is not installed; the wallpaper backend here is awww. The rotation timer failed silently and both outputs stayed at color: 000000. - XF86InputRaiseVolume / XF86InputLowerVolume are not real keysyms (no XF86Input* family in xkbcommon). They were dead in .conf too; hyprlang ignored them silently, hl.bind rejects them. Commented out. - SUPER+SHIFT+R was bound twice (notification reload + bar reload). hyprlang ran both; in Lua the second would shadow the first, so they are merged. - The waybar layer rule set no effects and was a no-op; dropped. - Polkit autostart now picks hyprpolkitagent or polkit-gnome by what is installed, so one file works on both machines. Verified with `Hyprland --verify-config` on both profiles (config ok). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01StGBghPW9Dm7z7uj2VNWHr
36 lines
1014 B
Lua
36 lines
1014 B
Lua
-- Machine profile selection.
|
|
--
|
|
-- Each profile owns the two things that genuinely differ between machines:
|
|
-- the monitor layout and the workspace-to-monitor assignment.
|
|
--
|
|
-- Selection order:
|
|
-- 1. $HYPR_PROFILE, if set (e.g. `HYPR_PROFILE=laptop Hyprland`)
|
|
-- 2. hostname match
|
|
-- 3. fallback: "laptop"
|
|
--
|
|
-- To add a machine: create configs/profiles/<name>.lua and add it to `byHost`.
|
|
|
|
local byHost = {
|
|
mainPC = "pc",
|
|
}
|
|
|
|
local fallback = "laptop"
|
|
|
|
local function hostname()
|
|
-- Cheap file read at config-load time (not in a bind callback, so it is
|
|
-- safe to block on). os.getenv("HOSTNAME") is not reliably exported.
|
|
local f = io.open("/etc/hostname")
|
|
if not f then return nil end
|
|
local h = f:read("l")
|
|
f:close()
|
|
-- strip stray whitespace
|
|
return h and h:match("^%s*(.-)%s*$") or nil
|
|
end
|
|
|
|
local host = hostname()
|
|
local profile = os.getenv("HYPR_PROFILE") or byHost[host] or fallback
|
|
|
|
require("configs.profiles." .. profile)
|
|
|
|
return { name = profile, host = host }
|