diff options
Diffstat (limited to 'common/modules/mango')
| -rw-r--r-- | common/modules/mango/default.nix | 17 | ||||
| -rw-r--r-- | common/modules/mango/swayidleNdLock.nix | 53 | ||||
| -rw-r--r-- | common/modules/mango/waybar.nix | 9 |
3 files changed, 73 insertions, 6 deletions
diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix index 7849a03..4939824 100644 --- a/common/modules/mango/default.nix +++ b/common/modules/mango/default.nix @@ -44,6 +44,7 @@ in inputs.mango.hmModules.mango ./waybar.nix ./scripts.nix + ./swayidleNdLock.nix ] else [ @@ -258,7 +259,7 @@ in # bind=SUPER,v,spawn,clipvault list | rofi -dmenu -display-columns 2 | clipvault get | wl-copy bind=SUPER,a,spawn,rofi -show drun bind=SUPER,period,spawn,rofi -show emoji -modi emoji - bind=ALT,F4,spawn,wlogout -C ~/.config/wlogout/style.css -l ~/.config/wlogout/layout -b 6 --protocol layer-shell + bind=ALT,F4,spawn,rofi -show power-menu -modi power-menu:rofi-power-menu bind=SUPER,y,spawn,wall-picker bind=SUPER,F12,spawn,gnome-calculator @@ -394,11 +395,19 @@ in autostart_sh = '' wl-clip-persist --clipboard regular & ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 & - ${lib.optionalString (config.services.picom.enable) '' - systemctl --user stop picom.service - ''} gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 & swww-daemon -q & + + ${lib.optionalString (config.beeMods.dwm.enable) '' + systemctl --user stop xidlehook.service + systemctl --user stop xautolock-session.service + systemctl --user stop xss-lock.service + systemctl --user stop clipcat.service + ''} + + ${lib.optionalString (config.beeMods.dwm.picom.enable) '' + systemctl --user stop picom.service + ''} ''; }; home.packages = with pkgs; [ diff --git a/common/modules/mango/swayidleNdLock.nix b/common/modules/mango/swayidleNdLock.nix new file mode 100644 index 0000000..959ea45 --- /dev/null +++ b/common/modules/mango/swayidleNdLock.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.beeMods.mango; + swaylock_cmd = "${pkgs.swaylock}/bin/swaylock -f -C ~/.config/swaylock/swaylock-colors"; +in +{ + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + wlopm + swaylock + ]; + + services.swayidle = { + enable = true; + systemdTarget = "mango-session.target"; + + events = { + "before-sleep" = swaylock_cmd; + "lock" = swaylock_cmd; + }; + + timeouts = [ + # dim screen at 4:30 + { + timeout = 270; + command = "${pkgs.brightnessctl}/bin/brightnessctl g > /tmp/brightness_prev && ${pkgs.brightnessctl}/bin/brightnessctl set 10%"; + resumeCommand = "${pkgs.brightnessctl}/bin/brightnessctl set $(cat /tmp/brightness_prev || echo 100%)"; + } + # Lock at 5:00 + { + timeout = 300; + command = swaylock_cmd; + } + # Screen off at 10:00 + { + timeout = 600; + command = "${pkgs.wlopm}/bin/wlopm --off '*'"; + resumeCommand = "${pkgs.wlopm}/bin/wlopm --on '*'"; + } + # suspend at 15:00 + { + timeout = 900; + command = "systemctl suspend"; + } + ]; + }; + }; +} diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix index 8ff9996..83f9d9c 100644 --- a/common/modules/mango/waybar.nix +++ b/common/modules/mango/waybar.nix @@ -1,4 +1,9 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + lib, + ... +}: let screenshot = pkgs.writeShellScript "screenshot" '' GEOM=$(${pkgs.slurp}/bin/slurp -b '#2E2A1E55' -c '#fb751bff') || exit @@ -184,7 +189,7 @@ in "custom/power" = { format = ""; tooltip = false; - on-click = "wlogout -C ~/.config/wlogout/style.css -l ~/.config/wlogout/layout -b 6 --protocol layer-shell"; + on-click = "rofi -show power-menu -modi power-menu:rofi-power-menu"; }; power-profiles-daemon = { |