Compare commits
4
Commits
9d15eb0e9f
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
babec6336f | ||
|
|
5ec6f7d636 | ||
|
|
acebeaf180 | ||
|
|
548507d60b |
Generated
+12
-12
@@ -43,11 +43,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786464219,
|
||||
"narHash": "sha256-WKqWL8r7CyTDYueTr2ffJ9ya50dellv6IR1JX5PghDY=",
|
||||
"lastModified": 1787400831,
|
||||
"narHash": "sha256-H3MEkFDZf+UH+QrVgW8TdKrssPFltF8fBg/rh0J1zIc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "f3d1804205e8158c15595cdda1b566f93349ffae",
|
||||
"rev": "7ce889cb78b97979b83a4648509fc3ef405c3286",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -341,11 +341,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786998364,
|
||||
"narHash": "sha256-egMnyO7618cG4qcvsTwUkYHoxPFNSe1IThXfDrl43l4=",
|
||||
"lastModified": 1787612295,
|
||||
"narHash": "sha256-K7sUeS1tKTSDu+aQK0ZwCxJCls+JzDj1qeTJRGk+CV8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "af0d014cb26f536d8cb7cab2b9d5784f69767c8a",
|
||||
"rev": "0bd11c7a04a63d2785abd53363f09d552175d67d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -538,11 +538,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786464080,
|
||||
"narHash": "sha256-W1hxvumEM57yV+QwsZ4QdAHEqOkr7e4S8VAkLX60qDE=",
|
||||
"lastModified": 1786903207,
|
||||
"narHash": "sha256-QTwMqLLONRhv9iz6CVeuX6BqQNQCIqI8hL/cPYlR/24=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "c157fe1e3092b980cc69315a6631f89aff09dcce",
|
||||
"rev": "6cf50415e06dc6bd9f1252f1b745eac6b4a1cc39",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1134,11 +1134,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786464334,
|
||||
"narHash": "sha256-/TBQT5rhBB2Dm4HoZzhGDaCwYmRTs3W3DPhMXFWc/BU=",
|
||||
"lastModified": 1786988229,
|
||||
"narHash": "sha256-frEFLVRj8xXvBBDs44IRiqHo6R2PxsRpluygL7abjjI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "9f0e9ff02739cd538d39bd706422dc50e9ca60dd",
|
||||
"rev": "59d429bf45aed4e2209043c0c36565ad8e2859a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -28,7 +28,14 @@ in
|
||||
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [ "$mod, SPACE, exec, ${bmr}" ];
|
||||
bind = [
|
||||
{
|
||||
_args = [
|
||||
"SUPER + SPACE"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${bmr}")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -33,7 +33,12 @@ in
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [
|
||||
"$mod, RETURN, exec, ${pkgs.foot}/bin/foot"
|
||||
{
|
||||
_args = [
|
||||
"SUPER + RETURN"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pkgs.foot}/bin/foot")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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,59 +99,11 @@ 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";
|
||||
|
||||
animations.enabled = false;
|
||||
|
||||
xwayland = {
|
||||
force_zero_scaling = true;
|
||||
};
|
||||
config = {
|
||||
xwayland.force_zero_scaling = true;
|
||||
|
||||
input = {
|
||||
kb_layout = "se";
|
||||
@@ -161,7 +115,7 @@ in
|
||||
accel_profile = "flat";
|
||||
touchpad = {
|
||||
natural_scroll = false;
|
||||
tap-and-drag = false;
|
||||
tap_and_drag = false;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -176,12 +130,149 @@ in
|
||||
gaps_in = 0; # gaps between windows
|
||||
gaps_out = 0; # gaps between windows and monitor edges
|
||||
|
||||
"col.active_border" = "rgba(${config.lib.colors.foreground}ff)";
|
||||
"col.inactive_border" = "rgba(${config.lib.colors.background}ff)";
|
||||
col = {
|
||||
active_border = "rgba(${config.lib.colors.foreground}ff)";
|
||||
inactive_border = "rgba(${config.lib.colors.background}ff)";
|
||||
};
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
force_split = 2;
|
||||
dwindle.force_split = 2;
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
};
|
||||
|
||||
animations.enabled = false;
|
||||
};
|
||||
|
||||
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";
|
||||
}
|
||||
];
|
||||
|
||||
# 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";
|
||||
}
|
||||
|
||||
{
|
||||
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]";
|
||||
gaps_out = 0;
|
||||
gaps_in = 0;
|
||||
}
|
||||
{
|
||||
workspace = "f[1]";
|
||||
gaps_out = 0;
|
||||
gaps_in = 0;
|
||||
}
|
||||
];
|
||||
|
||||
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,87 @@ in
|
||||
select
|
||||
++ move
|
||||
++ [
|
||||
"$mod, ESCAPE, killactive"
|
||||
|
||||
"$mod, f, fullscreen, 1"
|
||||
"$mod SHIFT, f, togglefloating, active"
|
||||
|
||||
"$mod, h, movefocus, l"
|
||||
"$mod, j, movefocus, d"
|
||||
"$mod, k, movefocus, u"
|
||||
"$mod, l, movefocus, r"
|
||||
|
||||
"$mod CONTROL, 1, exec, ${magnifier} --increase"
|
||||
"$mod CONTROL, 2, exec, ${magnifier} --decrease"
|
||||
"$mod CONTROL, 3, exec, ${magnifier} --reset"
|
||||
{
|
||||
_args = [
|
||||
"${mod} + ESCAPE"
|
||||
(lib.generators.mkLuaInline "hl.dsp.window.close()")
|
||||
];
|
||||
}
|
||||
|
||||
bindm = [
|
||||
# mouse movements
|
||||
"$mod, mouse:272, movewindow" # left click
|
||||
"$mod, mouse:273, resizewindow" # right click
|
||||
{
|
||||
_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" })'')
|
||||
];
|
||||
}
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
};
|
||||
{
|
||||
_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" })'')
|
||||
];
|
||||
}
|
||||
|
||||
{
|
||||
_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")'')
|
||||
];
|
||||
}
|
||||
|
||||
# mouse movements: hyprland's lua API has no separate `bindm`,
|
||||
# mouse binds are plain `hl.bind` with `{ mouse = true }`.
|
||||
{
|
||||
_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; }
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -59,17 +59,37 @@ in
|
||||
pause-music = "${pkgs.playerctl}/bin/playerctl -a pause";
|
||||
|
||||
dpmsTimeout = config.mod.hyprlock.dpmsTimeout;
|
||||
|
||||
dpmsOff = pkgs.writeShellScript "dpms-off" ''
|
||||
${pkgs.hyprland}/bin/hyprctl dispatch 'hl.dsp.dpms({ action = "off" })'
|
||||
'';
|
||||
dpmsOn = pkgs.writeShellScript "dpms-on" ''
|
||||
${pkgs.hyprland}/bin/hyprctl dispatch 'hl.dsp.dpms({ action = "on" })'
|
||||
'';
|
||||
|
||||
dpms-lock = pkgs.writeShellScript "dpms-lock" ''
|
||||
${pkgs.swayidle}/bin/swayidle \
|
||||
timeout ${dpmsTimeout} "${pkgs.hyprland}/bin/hyprctl dispatch dpms off" \
|
||||
resume "${pkgs.hyprland}/bin/hyprctl dispatch dpms on" &
|
||||
timeout ${dpmsTimeout} ${dpmsOff} \
|
||||
resume ${dpmsOn} &
|
||||
|
||||
${pkgs.hyprlock}/bin/hyprlock; ${pkgs.procps}/bin/pkill swayidle
|
||||
'';
|
||||
in
|
||||
[
|
||||
"$mod, x, exec, ${pause-music}; ${dpms-lock}"
|
||||
"$mod SHIFT, x, exec, ${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend"
|
||||
{
|
||||
_args = [
|
||||
"SUPER + x"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pause-music}; ${dpms-lock}")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"SUPER + SHIFT + x"
|
||||
(lib.generators.mkLuaInline
|
||||
''hl.dsp.exec_cmd("${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend")''
|
||||
)
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,8 +14,18 @@ in
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [
|
||||
", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +5%"
|
||||
", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
|
||||
{
|
||||
_args = [
|
||||
"XF86MonBrightnessUp"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pkgs.brightnessctl}/bin/brightnessctl set +5%")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"XF86MonBrightnessDown"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pkgs.brightnessctl}/bin/brightnessctl set 5%-")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,16 +16,23 @@ in
|
||||
let
|
||||
prev = "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify previous";
|
||||
next = "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify next";
|
||||
|
||||
mkExec = key: cmd: {
|
||||
_args = [
|
||||
key
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${cmd}")'')
|
||||
];
|
||||
};
|
||||
in
|
||||
[
|
||||
", XF86AudioPrev, exec, ${prev}"
|
||||
", XF86AudioNext, exec, ${next}"
|
||||
", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause"
|
||||
", XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spoitfy play-pause"
|
||||
(mkExec "XF86AudioPrev" prev)
|
||||
(mkExec "XF86AudioNext" next)
|
||||
(mkExec "XF86AudioPlay" "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause")
|
||||
(mkExec "XF86AudioPause" "${pkgs.playerctl}/bin/playerctl -p naviterm,spoitfy play-pause")
|
||||
|
||||
"$mod ALT, LEFT, exec, ${prev}"
|
||||
"$mod ALT, RIGHT, exec, ${next}"
|
||||
"$mod ALT, DOWN, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause"
|
||||
(mkExec "SUPER + ALT + LEFT" prev)
|
||||
(mkExec "SUPER + ALT + RIGHT" next)
|
||||
(mkExec "SUPER + ALT + DOWN" "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause")
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -38,8 +38,20 @@ in
|
||||
in
|
||||
[
|
||||
# will lock the screen with `physlock`, see `lockOn.suspend
|
||||
"$mod SHIFT, x, exec, ${pause-music}; systemctl suspend"
|
||||
"$mod, x, exec, ${pause-music}; ${config.security.wrapperDir}/physlock -d -s -m"
|
||||
{
|
||||
_args = [
|
||||
"SUPER + SHIFT + x"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pause-music}; systemctl suspend")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"SUPER + x"
|
||||
(lib.generators.mkLuaInline
|
||||
''hl.dsp.exec_cmd("${pause-music}; ${config.security.wrapperDir}/physlock -d -s -m")''
|
||||
)
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -19,8 +19,18 @@ in
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [
|
||||
"$mod, Print, exec, ${area}"
|
||||
"$mod CTRL, Print, exec, ${screen}"
|
||||
{
|
||||
_args = [
|
||||
"SUPER + Print"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${area}")'')
|
||||
];
|
||||
}
|
||||
{
|
||||
_args = [
|
||||
"SUPER + CTRL + Print"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${screen}")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -38,12 +38,19 @@ in
|
||||
MUTED=$(${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_AUDIO_SOURCE@ | grep MUTED | wc -l)
|
||||
echo $MUTED > /sys/class/leds/platform::micmute/brightness
|
||||
'';
|
||||
|
||||
mkExec = key: cmd: {
|
||||
_args = [
|
||||
key
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${cmd}")'')
|
||||
];
|
||||
};
|
||||
in
|
||||
[
|
||||
", XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 2%+"
|
||||
", XF86AudioLowerVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
|
||||
", XF86AudioMute, exec, ${toggle-output-mute}"
|
||||
", XF86AudioMicMute, exec, ${toggle-input-mute}"
|
||||
(mkExec "XF86AudioRaiseVolume" "${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 2%+")
|
||||
(mkExec "XF86AudioLowerVolume" "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-")
|
||||
(mkExec "XF86AudioMute" "${toggle-output-mute}")
|
||||
(mkExec "XF86AudioMicMute" "${toggle-input-mute}")
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -208,6 +208,7 @@ in
|
||||
};
|
||||
|
||||
battery = {
|
||||
"bat" = "BAT0";
|
||||
"interval" = 60;
|
||||
"format" = "<span font='10' rise='1000'>{icon}</span> {capacity}%";
|
||||
"format-time" = "{H}h {M}min";
|
||||
|
||||
@@ -78,7 +78,12 @@ in
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [
|
||||
"$mod, RETURN, exec, ${pkgs.wezterm}/bin/wezterm"
|
||||
{
|
||||
_args = [
|
||||
"SUPER + RETURN"
|
||||
(lib.generators.mkLuaInline ''hl.dsp.exec_cmd("${pkgs.wezterm}/bin/wezterm")'')
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user