From b0422f1bc1ffdfc32f621c26ff8091d6817e4e67 Mon Sep 17 00:00:00 2001 From: tzlil Date: Sun, 5 Feb 2023 22:29:24 +0200 Subject: remove password age, add disko config, add vps, trying to get hyprland working --- mixins/greet.nix | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'mixins/greet.nix') diff --git a/mixins/greet.nix b/mixins/greet.nix index 5c46792..755b7f8 100644 --- a/mixins/greet.nix +++ b/mixins/greet.nix @@ -1,4 +1,5 @@ { + config, pkgs, lib, ... @@ -6,28 +7,34 @@ user = "tzlil"; users.users.greeter.packages = [pkgs.sway]; - greetd = "${pkgs.greetd.greetd}/bin/greetd"; - gtkgreet = "${pkgs.greetd.gtkgreet}/bin/gtkgreet"; + greet = "${pkgs.greetd.wlgreet}/bin/wlgreet"; sway-kiosk = command: "${pkgs.sway}/bin/sway --unsupported-gpu --config ${pkgs.writeText "kiosk.config" '' output * bg #000000 solid_color exec "${command}; ${pkgs.sway}/bin/swaymsg exit" ''}"; in { - environment.etc."greetd/environments".text = - "sway\n" - + "$SHELL -l\n"; + options.greeter.initialSession = lib.mkOption { + type = lib.types.str; + default = "sh -c sway"; + }; - services.greetd = { - enable = true; - settings = { - default_session = { - inherit user; - command = sway-kiosk "${gtkgreet} -l &>/dev/null"; - }; - initial_session = { - inherit user; - command = "sh -c sway"; + config = { + environment.etc."greetd/environments".text = + "sway\n" + + "$SHELL -l\n"; + + services.greetd = { + enable = true; + settings = { + default_session = { + inherit user; + command = sway-kiosk "${greet} -l &>/dev/null"; + }; + initial_session = { + inherit user; + command = config.greeter.initialSession; + }; }; }; }; -- cgit 1.4.1