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
49 lines
1.2 KiB
Lua
49 lines
1.2 KiB
Lua
-- Was: theme/colors.conf (Catppuccin Macchiato)
|
|
--
|
|
-- hyprlang needed a paired "$nameAlpha" bare-hex variable for every colour so
|
|
-- it could string-splice alpha on. In Lua we keep only the hex and build
|
|
-- colour strings with the helpers below.
|
|
|
|
local hex = {
|
|
rosewater = "f4dbd6",
|
|
flamingo = "f0c6c6",
|
|
pink = "f5bde6",
|
|
mauve = "c6a0f6",
|
|
red = "ed8796",
|
|
maroon = "ee99a0",
|
|
peach = "f5a97f",
|
|
yellow = "eed49f",
|
|
green = "a6da95",
|
|
teal = "8bd5ca",
|
|
sky = "91d7e3",
|
|
sapphire = "7dc4e4",
|
|
blue = "8aadf4",
|
|
lavender = "b7bdf8",
|
|
text = "cad3f5",
|
|
subtext1 = "b8c0e0",
|
|
subtext0 = "a5adcb",
|
|
overlay2 = "939ab7",
|
|
overlay1 = "8087a2",
|
|
overlay0 = "6e738d",
|
|
surface2 = "5b6078",
|
|
surface1 = "494d64",
|
|
surface0 = "363a4f",
|
|
base = "24273a",
|
|
mantle = "1e2030",
|
|
crust = "181926",
|
|
}
|
|
|
|
local M = { hex = hex }
|
|
|
|
-- Opaque colour, e.g. M.rgb("lavender") -> "rgb(b7bdf8)"
|
|
function M.rgb(name)
|
|
return "rgb(" .. hex[name] .. ")"
|
|
end
|
|
|
|
-- Colour with an alpha suffix, e.g. M.rgba("lavender", "69") -> "rgba(b7bdf869)"
|
|
function M.rgba(name, alpha)
|
|
return "rgba(" .. hex[name] .. alpha .. ")"
|
|
end
|
|
|
|
return M
|