hyprland: Migrate config to Lua, bump back to current
Hyprland 0.56.x dropped the hyprlang (.conf) config backend in favor of Lua-only config. Switch configType to "lua" and rewrite monitors, workspace/window rules, binds, env vars, and autostart using the new hl.* dispatcher API. Un-pin the hyprland flake input (back to current, following root nixpkgs) now that the config no longer depends on the old hyprlang backend. Every module that injects Hyprland keybinds (foot, wezterm, bemenu, music, light, sound, screenshot, physlock, hyprlock) is converted to the same Lua bind syntax, since the config is all-or-nothing per configType. hyprlock's swayidle dpms toggle and the hyprland-monitors hotplug script's hyprctl dispatch calls are updated to the new hl.dsp.* expression syntax the same way. One behavior change: hl.workspace_rule keeps only the last monitor set per workspace (unlike hyprlang's rule list), so workspaces that used to declare two candidate monitors now declare one static default; the hyprland-monitors service still re-dispatches the correct monitor on startup and hotplug.
This commit is contained in:
Alexander Heldt
@@ -8,6 +8,8 @@
|
||||
let
|
||||
enabled = config.mod.hyprland.enable;
|
||||
|
||||
mod = "SUPER";
|
||||
|
||||
monitorScript = pkgs.writeShellScript "hyprland-monitor-handler" ''
|
||||
INTERNAL="eDP-1"
|
||||
EXTERNAL_MONITORS="HDMI-A-1 DP-3"
|
||||
@@ -31,15 +33,15 @@ let
|
||||
if external=$(get_active_external); then
|
||||
# External monitor connected: move workspaces 1-5 to external, 6-10 to internal
|
||||
for ws in 1 2 3 4 5; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $external;"
|
||||
batch="$batch dispatch hl.dsp.workspace.move({ monitor = \"$external\", workspace = $ws });"
|
||||
done
|
||||
for ws in 6 7 8 9 10; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
|
||||
batch="$batch dispatch hl.dsp.workspace.move({ monitor = \"$INTERNAL\", workspace = $ws });"
|
||||
done
|
||||
else
|
||||
# No external monitor: move all workspaces to internal
|
||||
for ws in 1 2 3 4 5 6 7 8 9 10; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
|
||||
batch="$batch dispatch hl.dsp.workspace.move({ monitor = \"$INTERNAL\", workspace = $ws });"
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -97,91 +99,180 @@ in
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = false;
|
||||
configType = "hyprlang";
|
||||
|
||||
extraConfig = ''
|
||||
exec-once = uwsm app -- waybar
|
||||
exec-once = uwsm app -- hyprctl setcursor Adwaita 24
|
||||
|
||||
env = GDK_DPI_SCALE,1.5
|
||||
env = HYPRCURSOR_THEME,Adwaita
|
||||
env = HYPRCURSOR_SIZE,24
|
||||
|
||||
monitor=eDP-1, 1920x1200, auto-center-down, 1
|
||||
monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1
|
||||
monitor=DP-3, 2560x1440@60, auto-center-up, 1
|
||||
|
||||
# Workspaces 1-5 on external monitors (HDMI-A-1 or DP-3)
|
||||
workspace = 1, monitor:HDMI-A-1, default:true
|
||||
workspace = 2, monitor:HDMI-A-1
|
||||
workspace = 3, monitor:HDMI-A-1
|
||||
workspace = 4, monitor:HDMI-A-1
|
||||
workspace = 5, monitor:HDMI-A-1
|
||||
workspace = 1, monitor:DP-3, default:true
|
||||
workspace = 2, monitor:DP-3
|
||||
workspace = 3, monitor:DP-3
|
||||
workspace = 4, monitor:DP-3
|
||||
workspace = 5, monitor:DP-3
|
||||
|
||||
# Workspaces 6-10 on internal monitor
|
||||
workspace = 6, monitor:eDP-1, default:true
|
||||
workspace = 7, monitor:eDP-1
|
||||
workspace = 8, monitor:eDP-1
|
||||
workspace = 9, monitor:eDP-1
|
||||
workspace = 10, monitor:eDP-1
|
||||
|
||||
workspace = w[tv1], gapsout:0, gapsin:0
|
||||
workspace = f[1], gapsout:0, gapsin:0
|
||||
windowrule = border_size 0, match:float 0, match:workspace w[tv1]
|
||||
windowrule = rounding 0, match:float 0, match:workspace w[tv1]
|
||||
windowrule = border_size 0, match:float 0, match:workspace f[1]
|
||||
windowrule = rounding 0, match:float 0, match:workspace f[1]
|
||||
|
||||
# https://wiki.archlinux.org/title/Hyprland#Jetbrains_apps_focus_issues
|
||||
windowrule = match:xwayland true, no_initial_focus on
|
||||
|
||||
'';
|
||||
configType = "lua";
|
||||
|
||||
settings = {
|
||||
"$mod" = "SUPER";
|
||||
config = {
|
||||
xwayland.force_zero_scaling = true;
|
||||
|
||||
animations.enabled = false;
|
||||
input = {
|
||||
kb_layout = "se";
|
||||
|
||||
xwayland = {
|
||||
force_zero_scaling = true;
|
||||
};
|
||||
# 2 - Cursor focus will be detached from keyboard focus. Clicking on a window will move keyboard focus to that window.
|
||||
follow_mouse = 2;
|
||||
|
||||
input = {
|
||||
kb_layout = "se";
|
||||
|
||||
# 2 - Cursor focus will be detached from keyboard focus. Clicking on a window will move keyboard focus to that window.
|
||||
follow_mouse = 2;
|
||||
|
||||
sensitivity = 0.3;
|
||||
accel_profile = "flat";
|
||||
touchpad = {
|
||||
natural_scroll = false;
|
||||
tap-and-drag = false;
|
||||
sensitivity = 0.3;
|
||||
accel_profile = "flat";
|
||||
touchpad = {
|
||||
natural_scroll = false;
|
||||
tap_and_drag = false;
|
||||
};
|
||||
};
|
||||
|
||||
cursor = {
|
||||
zoom_factor = 1;
|
||||
zoom_rigid = true;
|
||||
};
|
||||
|
||||
general = {
|
||||
layout = "dwindle";
|
||||
|
||||
gaps_in = 0; # gaps between windows
|
||||
gaps_out = 0; # gaps between windows and monitor edges
|
||||
|
||||
col = {
|
||||
active_border = "rgba(${config.lib.colors.foreground}ff)";
|
||||
inactive_border = "rgba(${config.lib.colors.background}ff)";
|
||||
};
|
||||
};
|
||||
|
||||
dwindle.force_split = 2;
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
};
|
||||
|
||||
animations.enabled = false;
|
||||
};
|
||||
|
||||
cursor = {
|
||||
zoom_factor = 1;
|
||||
zoom_rigid = true;
|
||||
};
|
||||
monitor = [
|
||||
{
|
||||
output = "eDP-1";
|
||||
mode = "1920x1200";
|
||||
position = "auto-center-down";
|
||||
scale = "1";
|
||||
}
|
||||
{
|
||||
output = "HDMI-A-1";
|
||||
mode = "2560x1440@100";
|
||||
position = "auto-center-up";
|
||||
scale = "1";
|
||||
}
|
||||
{
|
||||
output = "DP-3";
|
||||
mode = "2560x1440@60";
|
||||
position = "auto-center-up";
|
||||
scale = "1";
|
||||
}
|
||||
];
|
||||
|
||||
general = {
|
||||
layout = "dwindle";
|
||||
# Static defaults only: a workspace can only have one `monitor` in
|
||||
# hl.workspace_rule (later calls overwrite it, unlike hyprlang's
|
||||
# rule list). The hyprland-monitors service re-dispatches these to
|
||||
# whichever external monitor is actually connected at startup and
|
||||
# on hotplug, so this only matters for the brief window before it
|
||||
# runs.
|
||||
workspace_rule = [
|
||||
{
|
||||
workspace = "1";
|
||||
monitor = "HDMI-A-1";
|
||||
default = true;
|
||||
}
|
||||
{
|
||||
workspace = "2";
|
||||
monitor = "HDMI-A-1";
|
||||
}
|
||||
{
|
||||
workspace = "3";
|
||||
monitor = "HDMI-A-1";
|
||||
}
|
||||
{
|
||||
workspace = "4";
|
||||
monitor = "HDMI-A-1";
|
||||
}
|
||||
{
|
||||
workspace = "5";
|
||||
monitor = "HDMI-A-1";
|
||||
}
|
||||
|
||||
gaps_in = 0; # gaps between windows
|
||||
gaps_out = 0; # gaps between windows and monitor edges
|
||||
{
|
||||
workspace = "6";
|
||||
monitor = "eDP-1";
|
||||
default = true;
|
||||
}
|
||||
{
|
||||
workspace = "7";
|
||||
monitor = "eDP-1";
|
||||
}
|
||||
{
|
||||
workspace = "8";
|
||||
monitor = "eDP-1";
|
||||
}
|
||||
{
|
||||
workspace = "9";
|
||||
monitor = "eDP-1";
|
||||
}
|
||||
{
|
||||
workspace = "10";
|
||||
monitor = "eDP-1";
|
||||
}
|
||||
|
||||
"col.active_border" = "rgba(${config.lib.colors.foreground}ff)";
|
||||
"col.inactive_border" = "rgba(${config.lib.colors.background}ff)";
|
||||
};
|
||||
{
|
||||
workspace = "w[tv1]";
|
||||
gaps_out = 0;
|
||||
gaps_in = 0;
|
||||
}
|
||||
{
|
||||
workspace = "f[1]";
|
||||
gaps_out = 0;
|
||||
gaps_in = 0;
|
||||
}
|
||||
];
|
||||
|
||||
dwindle = {
|
||||
force_split = 2;
|
||||
window_rule = [
|
||||
{
|
||||
name = "no-gaps-wtv1";
|
||||
match = {
|
||||
float = false;
|
||||
workspace = "w[tv1]";
|
||||
};
|
||||
border_size = 0;
|
||||
rounding = 0;
|
||||
}
|
||||
{
|
||||
name = "no-gaps-f1";
|
||||
match = {
|
||||
float = false;
|
||||
workspace = "f[1]";
|
||||
};
|
||||
border_size = 0;
|
||||
rounding = 0;
|
||||
}
|
||||
{
|
||||
# https://wiki.archlinux.org/title/Hyprland#Jetbrains_apps_focus_issues
|
||||
name = "xwayland-no-initial-focus";
|
||||
match.xwayland = true;
|
||||
no_initial_focus = true;
|
||||
}
|
||||
];
|
||||
|
||||
env = [
|
||||
{ _args = [ "GDK_DPI_SCALE" "1.5" ]; }
|
||||
{ _args = [ "HYPRCURSOR_THEME" "Adwaita" ]; }
|
||||
{ _args = [ "HYPRCURSOR_SIZE" "24" ]; }
|
||||
];
|
||||
|
||||
on = {
|
||||
_args = [
|
||||
"hyprland.start"
|
||||
(lib.generators.mkLuaInline ''
|
||||
function()
|
||||
hl.exec_cmd("uwsm app -- waybar")
|
||||
hl.exec_cmd("uwsm app -- hyprctl setcursor Adwaita 24")
|
||||
end
|
||||
'')
|
||||
];
|
||||
};
|
||||
|
||||
bind =
|
||||
@@ -193,10 +284,23 @@ in
|
||||
in
|
||||
builtins.toString n;
|
||||
|
||||
select = builtins.genList (x: "$mod, ${ws x}, workspace, ${builtins.toString (x + 1)}") 10;
|
||||
move = builtins.genList (
|
||||
x: "$mod SHIFT, ${ws x}, movetoworkspacesilent, ${builtins.toString (x + 1)}"
|
||||
) 10;
|
||||
focusWs = x: {
|
||||
_args = [
|
||||
"${mod} + ${ws x}"
|
||||
(lib.generators.mkLuaInline "hl.dsp.focus({ workspace = ${builtins.toString (x + 1)} })")
|
||||
];
|
||||
};
|
||||
moveToWs = x: {
|
||||
_args = [
|
||||
"${mod} + SHIFT + ${ws x}"
|
||||
(lib.generators.mkLuaInline
|
||||
"hl.dsp.window.move({ workspace = ${builtins.toString (x + 1)}, follow = false })"
|
||||
)
|
||||
];
|
||||
};
|
||||
|
||||
select = builtins.genList focusWs 10;
|
||||
move = builtins.genList moveToWs 10;
|
||||
|
||||
magnifier = pkgs.writeShellScript "magnifier" ''
|
||||
CURRENT=$(${pkgs.hyprland}/bin/hyprctl getoption cursor:zoom_factor -j | ${pkgs.jq}/bin/jq .float)
|
||||
@@ -219,31 +323,88 @@ in
|
||||
select
|
||||
++ move
|
||||
++ [
|
||||
"$mod, ESCAPE, killactive"
|
||||
{
|
||||
_args = [
|
||||
"${mod} + ESCAPE"
|
||||
(lib.generators.mkLuaInline "hl.dsp.window.close()")
|
||||
];
|
||||
}
|
||||
|
||||
"$mod, f, fullscreen, 1"
|
||||
"$mod SHIFT, f, togglefloating, active"
|
||||
{
|
||||
_args = [
|
||||
"${mod} + f"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.window.fullscreen({ mode = "maximized" })'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + SHIFT + f"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.window.float({ action = "toggle" })'')
|
||||
];
|
||||
}
|
||||
|
||||
"$mod, h, movefocus, l"
|
||||
"$mod, j, movefocus, d"
|
||||
"$mod, k, movefocus, u"
|
||||
"$mod, l, movefocus, r"
|
||||
{
|
||||
_args = [
|
||||
"${mod} + h"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.focus({ direction = "left" })'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + j"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.focus({ direction = "down" })'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + k"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.focus({ direction = "up" })'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + l"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.focus({ direction = "right" })'')
|
||||
];
|
||||
}
|
||||
|
||||
"$mod CONTROL, 1, exec, ${magnifier} --increase"
|
||||
"$mod CONTROL, 2, exec, ${magnifier} --decrease"
|
||||
"$mod CONTROL, 3, exec, ${magnifier} --reset"
|
||||
{
|
||||
_args = [
|
||||
"${mod} + CONTROL + 1"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${magnifier} --increase")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + CONTROL + 2"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${magnifier} --decrease")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + CONTROL + 3"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${magnifier} --reset")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
bindm = [
|
||||
# mouse movements
|
||||
"$mod, mouse:272, movewindow" # left click
|
||||
"$mod, mouse:273, resizewindow" # right click
|
||||
{
|
||||
_args = [
|
||||
"${mod} + mouse:272" # left click
|
||||
(lib.generators.mkLuaInline "hl.dsp.window.drag()")
|
||||
{ mouse = true; }
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"${mod} + mouse:273" # right click
|
||||
(lib.generators.mkLuaInline "hl.dsp.window.resize()")
|
||||
{ mouse = true; }
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user