diff --git a/ui.nix b/ui.nix index 2bfacac..6213230 100644 --- a/ui.nix +++ b/ui.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, config, pkgs, variant, ... }: let defaultTerminal = "alacritty"; alacrittyLightTheme = "${pkgs.alacritty-theme}/night_owlish_light.toml"; @@ -108,12 +108,17 @@ in mimeApps.defaultApplications."TerminalEmulator" = "Alacritty.desktop"; }; - services.swayidle = { + services.swayidle = + let swaylock-bin = (if variant == "allegro" + then "/usr/bin/swaylock" + else "${config.programs.swaylock.package}/bin/swaylock"); + in + { enable = true; events = [ { event = "before-sleep"; - command = "${config.programs.swaylock.package}/bin/swaylock -defF"; + command = "${swaylock-bin} -defF"; } { event = "after-resume"; @@ -121,14 +126,14 @@ in } { event = "lock"; - command = "${config.programs.swaylock.package}/bin/swaylock -defF"; + command = "${swaylock-bin} -defF"; } ]; timeouts = [ { timeout = 900; - command = "${config.programs.swaylock.package}/bin/swaylock -defF"; + command = "${swaylock-bin} -defF"; } { timeout = 900; @@ -138,7 +143,7 @@ in }; programs.swaylock = { - enable = true; + enable = (variant != "allegro"); package = pkgs.swaylock-effects; settings = { screenshots = true;