From fb2cd62410f8a3a07a2a420f54d0e48292071395 Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 24 Jun 2023 00:57:51 +1000 Subject: [PATCH] use gtkgreet --- system/configuration.nix | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index c636298..d8abcdb 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -92,7 +92,7 @@ }; environment.etc = { - "hyprland_login" = { + "hyprland_login" = with pkgs.rice; { enable = true; text = '' misc { @@ -100,11 +100,17 @@ disable_splash_rendering=true } monitor=,highrr,auto,1 - windowrule=fullscreen,^(regreet)$ - windowrule=dimaround,^(regreet)$ - bind=SUPER,Return,exec,${lib.getExe pkgs.greetd.regreet} + windowrule=fullscreen,^(gtkgreet)$ + windowrule=dimaround,^(gtkgreet)$ + bind=SUPER,Return,exec,${lib.getExe pkgs.greetd.gtkgreet} + bind=,Escape,exec,wlogout + bind=SUPER_SHIFT,e,exec,wlogout + env = GTK_THEME,nix-rice exec = ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - exec = ${lib.getExe pkgs.greetd.regreet} + exec = gsettings set org.gnome.desktop.interface gtk-theme '${gtk-theme.name}' + exec = gsettings set org.gnome.desktop.interface font-name '${fonts.sans.name}' + exec = gsettings set org.gnome.desktop.interface icon-theme '${icons.name}' + exec = ${lib.getExe pkgs.greetd.gtkgreet} -l -c "dbus-run-session Hyprland" -s "${gtk-theme.package}/share/themes/nix-rice/gtk-3.0/gtk.css" ''; }; }; @@ -113,29 +119,13 @@ enable = true; settings = { default_session = { - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions"; + # command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions"; command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.hyprland} -c /etc/hyprland_login"; user = "greeter"; }; }; }; - programs.regreet = with pkgs.rice; { - enable = true; - settings = with lib.strings; { - background = { - path = "${bg.image}"; - fit = "Fill"; - }; - - GTK = { - application_prefer_dark_theme = true; - font_name = concatStrings [fonts.sans.name " " (builtins.toString fonts.sans.size)]; - icon_theme_name = icons.name; - theme_name = gtk-theme.name; - }; - }; - }; security.polkit.enable = true;