diff --git a/modules/services/greetd/module.nix b/modules/services/greetd/module.nix index 633e644..a772bee 100644 --- a/modules/services/greetd/module.nix +++ b/modules/services/greetd/module.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - inherit (lib.meta) getExe; + inherit (lib.meta) getExe getExe'; inherit (lib.modules) mkIf; inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) str listOf; @@ -36,14 +36,15 @@ in { config = mkIf cfg.enable { services.greetd = let session = { - command = '' - ${pkgs.greetd.tuigreet}/bin/tuigreet \ - -c \"${cfg.session}\" \ - -r - -t --time-format "DD.MM.YYYY" - --asteriks''; - # command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; - # user = username; + # command = '' + # ${pkgs.greetd.tuigreet}/bin/tuigreet \ + # -c \"${cfg.session}\" \ + # -r + # -t --time-format "DD.MM.YYYY" + # --asteriks''; + + command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; + user = username; }; in { enable = true; diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix index 66d206c..52d0298 100644 --- a/modules/wms/wayland/hyprland/exec.nix +++ b/modules/wms/wayland/hyprland/exec.nix @@ -5,6 +5,7 @@ ... }: let # inherit (config.modules.style) cursor; + inherit (lib.meta) getExe; in { programs.hyprland.settings = { # Hyprland settings @@ -13,6 +14,7 @@ in { "uwsm finalize" "hyprctl setcursor BreezeX-RosePine-Linux 32" + "hyprctl seterror disable" "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc" "[workspace special:audio; silent;tile] ${pkgs.pwvucontrol}/bin/pwvucontrol" @@ -25,6 +27,7 @@ in { "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent" "hyprctl dispatch split-workspace 1" + "${getExe pkgs.hyprlock}" ]; }; }