clean up icon/cursor issues, improve greeter

This commit is contained in:
notgne2 2022-12-26 22:53:27 -07:00
parent 6c6556b8d6
commit 905764eb88
Signed by: notgne2
SSH Key Fingerprint: SHA256:qlFCAimT/PvNIG3u+aYT9pIqFCWgu6sNsWjpV1vHLIE
2 changed files with 21 additions and 22 deletions

View File

@ -45,25 +45,6 @@ in {
};
};
favIcons = mkOption {
description = "Your favourite icons pack";
default = {};
type = types.submodule {
options = {
name = mkOption {
type = types.str;
default = "Papirus-Dark";
description = "Name of your icon pack";
};
package = mkOption {
type = types.package;
default = pkgs.papirus-icon-theme;
description = "Package for your icon pack";
};
};
};
};
bluetooth = mkOption {
type = types.bool;
default = false;
@ -537,11 +518,19 @@ in {
gtk = {
enable = lib.mkDefault true;
iconTheme = {
package = lib.mkDefault cfg.favIcons.package;
name = lib.mkDefault cfg.favIcons.name;
package = lib.mkDefault pkgs.papirus-icon-theme;
name = lib.mkDefault "Papirus-Dark";
};
};
home.pointerCursor = {
package = lib.mkDefault pkgs.gnome.adwaita-icon-theme;
name = lib.mkDefault "Adwaita";
size = lib.mkDefault 24;
x11.enable = lib.mkDefault true;
gtk.enable = lib.mkDefault true;
};
qt = {
enable = lib.mkDefault true;
platformTheme = lib.mkDefault "gtk";

View File

@ -44,7 +44,17 @@ in {
vt = 1;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
# command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
command = let
swayGreeterConfig = pkgs.writeText "sway-greeter-config" ''
exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway; swaymsg exit"
bindsym Mod4+shift+e exec swaynag \
-t warning \
-m 'What do you want to do?' \
-b 'Poweroff' 'systemctl poweroff' \
-b 'Reboot' 'systemctl reboot'
'';
in "${pkgs.sway}/bin/sway --config ${swayGreeterConfig}";
};
};
};