Merge remote-tracking branch 'origin/nixos' into nixos

This commit is contained in:
Moritz Böhme 2023-05-27 12:03:51 +02:00
commit a66a17984e
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
10 changed files with 50 additions and 26 deletions

View file

@ -171,8 +171,6 @@ in
bind = , XF86AudioNext , exec , playerctl -p "spotifyd,firefox" next
bind = , XF86AudioPlay , exec , playerctl -p "spotifyd,firefox" play-pause
bind = , XF86AudioPrev , exec , playerctl -p "spotifyd,firefox" previous
binde = , XF86MonBrightnessDown , exec , brightnessctl s 10%-
binde = , XF86MonBrightnessUp , exec , brightnessctl s 10%+
# Move focus with mainMod + hjkl
binde = $mainMod, H, movefocus, l

View file

@ -91,11 +91,11 @@ in
events = [
{
event = "before-sleep";
command = "${pkgs.swaylock}/bin/swaylock -fF";
command = "${getExe pkgs.swaylock} -fF";
}
{
event = "lock";
command = "${pkgs.swaylock}/bin/swaylock -fF";
command = "${getExe pkgs.swaylock} -fF";
}
];
timeouts =
@ -118,12 +118,10 @@ in
}
] ++ optional
(!cfg.nvidiaSupport) # TODO https://github.com/hyprwm/Hyprland/issues/1728
[
{
timeout = 30 * 60;
command = "${pkgs.systemd}/bin/systemctl suspend-then-hibernate";
}
];
{
timeout = 30 * 60;
command = "${pkgs.systemd}/bin/systemctl suspend-and-hibernate";
};
systemdTarget = "hyprland-session.target";
};
};
@ -148,7 +146,7 @@ in
wantedBy = [ "graphical-session.target" ];
serviceConfig = {
ExecStartPre = "${pkgs.coreutils}/bin/sleep 0.5";
ExecStart = "${pkgs.hyprpaper}/bin/hyprpaper -c ${config}";
ExecStart = "${getExe pkgs.hyprpaper} -c ${config}";
RestartSec = "500ms";
Restart = "on-failure";
};

View file

@ -94,3 +94,4 @@ in
};
};
}