From fe3cd057cdc375b727583816799e3615a8194b87 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sat, 6 Dec 2025 11:23:41 +0100 Subject: [PATCH] fix regreet with hyprland --- hosts/aspi/default.nix | 1 + hosts/common/optional/greetd.nix | 38 +++++++++++++------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/hosts/aspi/default.nix b/hosts/aspi/default.nix index 2567c55..3201b11 100644 --- a/hosts/aspi/default.nix +++ b/hosts/aspi/default.nix @@ -42,6 +42,7 @@ }; }; + programs.hyprland.enable = true; services.desktopManager.plasma6.enable = true; services.blueman.enable = true; diff --git a/hosts/common/optional/greetd.nix b/hosts/common/optional/greetd.nix index bf85a87..0d55e74 100644 --- a/hosts/common/optional/greetd.nix +++ b/hosts/common/optional/greetd.nix @@ -1,26 +1,9 @@ -{ - pkgs, - lib, - config, - ... -}: let +{config, ...}: let homeCfgs = config.home-manager.users; - homeSharePaths = lib.mapAttrsToList (_: v: "${v.home.path}/share") homeCfgs; - vars = ''XDG_DATA_DIRS="$XDG_DATA_DIRS:${lib.concatStringsSep ":" homeSharePaths}" GTK_USE_PORTAL=0''; - julianCfg = homeCfgs.julian; - - sway-kiosk = command: "${lib.getExe pkgs.sway} --unsupported-gpu --config ${pkgs.writeText "kiosk.config" '' - output * bg #000000 solid_color - xwayland disable - input "type:touchpad" { - tap enabled - } - exec '${vars} ${command}; ${pkgs.sway}/bin/swaymsg exit' - ''}"; in { users.extraUsers.greeter = { - # For caching and such + # For caching home = "/tmp/greeter-home"; createHome = true; }; @@ -33,13 +16,22 @@ in { cursorTheme = { inherit (julianCfg.gtk.cursorTheme) name package; }; + cageArgs = [ + "-s" + "-m" + "last" + ]; # multimonitor use last monitor # settings.background = { # path = julianCfg.wallpaper; # fit = "Cover"; # }; # TODO: fix - }; - services.greetd = { - enable = true; - settings.default_session.command = sway-kiosk (lib.getExe config.programs.regreet.package); + + # TODO: setting keyboard language does not work + # settings = { + # env = { + # XKB_DEFAULT_LAYOUT = "de"; + # # XKB_DEFAULT_VARIANT = "altgr-intl"; + # }; + # }; }; }