diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 0a0e47c..3586d81 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -47,7 +47,7 @@ in { }; }; - logind.lidSwitch = "suspend"; + logind.lidSwitch = "ignore"; printing = { enable = true; diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 8440bc9..4d7c2b0 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -31,9 +31,9 @@ in { (pkgs) ansel chromium # some websites only work there :( + hyprlock nwg-displays shikane # output autoconfig - swaybg zotero ; @@ -45,7 +45,6 @@ in { wayland.windowManager.sway = let logoutMode = "[L]ogout, [S]uspend, [P]oweroff, [R]eboot"; - lock = "swaylock --daemonize --image ~/.wallpaper --scaling fill"; in { enable = true; swaynag.enable = true; @@ -76,21 +75,18 @@ in { bars = []; keybindings = mkOptionDefault { - "Mod4+Shift+a" = "exec shikanectl reload"; "Mod4+Shift+e" = ''mode "${logoutMode}"''; "Mod4+i" = "exec emacsclient --create-frame"; - "Mod4+Control+l" = "exec ${lock}"; + "Mod4+Control+l" = "exec hyprlock"; "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1.2"; "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.2"; - "XF86MonBrightnessUp" = "exec light -A 5"; - "XF86MonBrightnessDown" = "exec light -U 5"; }; modes = mkOptionDefault { "${logoutMode}" = { "l" = "exec --no-startup-id swaymsg exit, mode default"; - "s" = "exec --no-startup-id systemctl suspend, mode default"; + #"s" = "exec --no-startup-id betterlockscreen --suspend, mode default"; "p" = "exec --no-startup-id systemctl poweroff, mode default"; "r" = "exec --no-startup-id systemctl reboot, mode default"; "Escape" = "mode default"; @@ -103,15 +99,8 @@ in { startup = [ {command = "shikane";} {command = "waybar";} - {command = "swaybg --image ~/.wallpaper --mode fill"; always = true; } - {command = "swayidle -w idlehint 1 before-sleep \"${lock}\"";} ]; }; - - extraConfig = '' - bindswitch --reload --locked lid:off output eDP-1 enable; - bindswitch --reload --locked lid:on output eDP-1 disable; - ''; }; programs = { fuzzel.enable = true; @@ -121,17 +110,4 @@ in { }; }; }; - - # FIXME: belongs elsewhere - services = { - logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "ignore"; - extraConfig = '' - IdleAction=suspend - IdleActionSec=10min - ''; - }; - upower.enable = true; - }; }