those are core packages

This commit is contained in:
Reid 2026-04-25 00:23:31 -07:00
parent 1dcb422dbb
commit d637bb5dc3
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
4 changed files with 10 additions and 13 deletions

View file

@ -21,10 +21,10 @@ in {
settings = {
general = {
lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
unlock_cmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
lock_cmd = "pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
unlock_cmd = "pkill -USR1 hyprlock";
before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
before_sleep_cmd = "loginctl lock-session";
};
listener = [
@ -32,7 +32,7 @@ in {
timeout = if config.modules.core.laptop
then 60 * 2 # 2 min
else 60 * 35; # 35 min
on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer
on-timeout = "loginctl lock-session"; # lock computer
}
] ++ optionals (config.modules.core.laptop) [
{
@ -47,7 +47,7 @@ in {
}
{
timeout = 60 * 15; # 15 min
on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend
on-timeout = "systemctl suspend"; # sleep/suspend
}
] ++ optional config.modules.desktop.niri.enable {
timeout = if config.modules.core.laptop

View file

@ -437,12 +437,12 @@ in {
"XF86LaunchA".action.screenshot = { show-pointer = false; };
"XF86LaunchB".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
"XF86ScreenSaver".action = sh "${pkgs.systemd}/bin/loginctl lock-session";
"XF86ScreenSaver".action = sh "loginctl lock-session";
# substitutions for when not on laptop
"Mod+Shift+S".action.screenshot = { show-pointer = false; };
"Mod+Shift+P".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
"Mod+L".action = sh "${pkgs.systemd}/bin/loginctl lock-session";
"Mod+L".action = sh "loginctl lock-session";
"Mod+T".action = spawn "wezterm";
"Mod+E".action = spawn "nautilus";

View file

@ -12,7 +12,7 @@ window#waybar {
color: @base05;
background: alpha(@base00, 0.9999999);
border-radius: @roundingpx;
font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK";
font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK"; /* TODO: make this use proper font */
font-size: 13px; /* TODO: make this use proper font size */
font-style: normal;

View file

@ -107,10 +107,10 @@ in {
systemctl hibernate
;;
" lock")
${pkgs.systemd}/bin/loginctl lock-session
loginctl lock-session
;;
" exit desktop environment")
${pkgs.systemd}/bin/loginctl terminate-session $XDG_SESSION_ID
loginctl terminate-session $XDG_SESSION_ID
;;
esac
'';
@ -180,9 +180,6 @@ in {
format = " {usage}%";
on-click = "${lib.getExe pkgs.mission-center}";
};
# bluetooth = {
#
# };
memory = {
interval = 4;
format = " {percentage}%";