From e49a91b7c842a0d7b88f5e68c355952b21c40365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Jane=C5=BEi=C4=8D?= Date: Thu, 12 Mar 2026 23:09:14 +0100 Subject: [PATCH] feat: migrate to regreet from tuigreet --- modules/nixos/greeter.nix | 37 +++++++++++++++++++++++++++++++++++++ modules/nixos/tuigreet.nix | 33 --------------------------------- profiles/desktop.nix | 5 +---- 3 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 modules/nixos/greeter.nix delete mode 100644 modules/nixos/tuigreet.nix diff --git a/modules/nixos/greeter.nix b/modules/nixos/greeter.nix new file mode 100644 index 0000000..e371877 --- /dev/null +++ b/modules/nixos/greeter.nix @@ -0,0 +1,37 @@ +{ + lib, + config, + pkgs, + inputs, + ... +}: +{ + options = { + greeter.enable = lib.mkEnableOption "greetd with regreet"; + }; + + config = lib.mkIf config.greeter.enable { + programs.regreet = { + enable = true; + # single output to avoid stretching across monitors + cageArgs = [ + "-s" + "-m" + "last" + ]; + font = { + name = lib.mkForce "JetBrainsMono Nerd Font"; + size = lib.mkForce 14; + }; + settings = { + background = { + path = lib.mkForce "${inputs.assets}/wallpaper.png"; + fit = lib.mkForce "Cover"; + }; + GTK = { + application_prefer_dark_theme = lib.mkForce true; + }; + }; + }; + }; +} diff --git a/modules/nixos/tuigreet.nix b/modules/nixos/tuigreet.nix deleted file mode 100644 index 0ef454c..0000000 --- a/modules/nixos/tuigreet.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - options = { - tuigreet = { - enable = lib.mkEnableOption "greetd with tuigreet"; - - command = lib.mkOption { - type = lib.types.str; - }; - }; - }; - - config = lib.mkIf config.tuigreet.enable { - services.greetd = { - enable = true; - useTextGreeter = true; - settings = { - default_session = { - command = pkgs.writeShellScript "tuigreet-session" '' - ${pkgs.util-linux}/bin/setterm --blank 1 --powersave powerdown --powerdown 1 - exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${config.tuigreet.command} - ''; - user = "greeter"; - }; - }; - }; - }; -} diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 3795093..ec08304 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -12,10 +12,7 @@ profiles.base.enable = lib.mkDefault true; desktop.enable = lib.mkDefault true; sway.enable = lib.mkDefault true; - tuigreet = { - enable = lib.mkDefault true; - command = lib.mkDefault "sway"; - }; + greeter.enable = lib.mkDefault true; printing.enable = lib.mkDefault true; workstation.enable = lib.mkDefault true; yubikey.enable = lib.mkDefault true;