greetd: unwrap command, fix issue

hosts/nullbox/configuration.nix

@@ -51,6 +51,10 @@
     nixfiles = {
       profile.pc.enable = true;
       programs.adb.enable = true;
+      programs.greetd = {
+        enable = true;
+        preset = "tuigreet";
+      };
       programs.unbound.enable = true;
       common.remoteAccess.enable = true;
       sessions.plasma.enable = lib.mkDefault false;
@@ -61,7 +65,6 @@
     };
 
     services.xserver.displayManager.sddm.enable = false;
-    services.xserver.displayManager.startx.enable = true;
 
     # bootloader setup
     boot.loader = {

hosts/slab/configuration.nix

@@ -44,14 +44,6 @@
 
   # who needs a display manager?
   services.xserver.displayManager.sddm.enable = false;
-  services.xserver.displayManager.startx.enable = true;
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks";
-    };
-  };
 
   nixfiles = {
     profile.pc.enable = true;
@@ -67,6 +59,10 @@
     programs = {
       adb.enable = true;
       unbound.enable = true;
+      greetd = {
+        enable = true;
+        preset = "tuigreet";
+      };
     };
   };
 

system/programs/default.nix

@@ -4,5 +4,6 @@
     ./syncthing.nix
     ./android.nix
     ./unbound.nix
+    ./greetd.nix
   ];
 }

system/programs/greetd.nix

@@ -0,0 +1,78 @@
+{ pkgs, config, lib, options, ... }:
+let
+  cfg = config.nixfiles.programs.greetd;
+  inherit (lib.types) bool enum nullOr str path;
+  inherit (builtins) isNull;
+  inherit (lib) optional optionals;
+  optionalsSet = val: optionals (!(isNull val));
+  sessions = config.services.xserver.displayManager.sessionData.desktops;
+  xsessions = "${sessions}/share/xsessions";
+  wayland-sessions = "${sessions}/share/wayland-sessions";
+in
+{
+  config = lib.mkIf cfg.enable {
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = lib.mkMerge [
+
+          # tuigreet configuration
+          (lib.mkIf cfg.presets.tuigreet.enable {
+            command = let
+              st = cfg.settings;
+              args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
+              "--sessions" "${xsessions}:${wayland-sessions}" ]
+                ++ optionalsSet st.greeting [ "--greeting" st.greeting ]
+                ++ optional st.time "--time" 
+                ++ optionalsSet st.command [ "--cmd" (lib.escapeShellArg st.command) ];
+            in lib.escapeShellArgs args; 
+          })
+
+        ];
+      };
+    };
+    nixfiles.programs.greetd.presets.${cfg.preset}.enable = true;
+  };
+
+  options.nixfiles.programs.greetd = {
+    enable = lib.mkEnableOption "greetd configuration";
+
+    preset = lib.mkOption {
+      description = "greetd configuration to enable (shorthand for presets.<preset>.enable)";
+      type = enum (lib.mapAttrsToList (name: value: name) options.nixfiles.programs.greetd.presets);
+      default = "tuigreet";
+    };
+
+    settings = {
+      greeting = lib.mkOption {
+        description = "Greeting to show on the chosen greeter (if configurable)";
+        type = nullOr str;
+        default = "log in pwease!! uwu";
+        example = "something boring";
+      };
+      command = lib.mkOption {
+        description = "Command to run following successful authentication";
+        type = nullOr str;
+        default = null;
+        example = "Hyprland";
+      };
+      time = lib.mkOption {
+        description = "Whether to show the current time (if configurable)";
+        type = bool;
+        default = true;
+        example = false;
+      };
+      wallpaper = lib.mkOption {
+        description = "Path to custom wallpaper (if configurable)";
+        type = nullOr path;
+        default = "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png";
+        example = "femboy-bee.png";
+      };
+    };
+    presets.tuigreet.enable = lib.mkOption {
+      description = "tuigreet greetd configuration";
+      type = bool;
+      default = false;
+    };
+  };
+}

system/sessions/hyprland.nix

@@ -23,9 +23,12 @@ in
     };
     nixfiles.meta.wayland = true;
 
-    services.xserver.displayManager.sddm = {
-      enable = lib.mkDefault true;
-      wayland.enable = true;
+    # greeter
+    nixfiles.programs.greetd = {
+      enable = true;
+      settings = {
+        command = "${pkgs.hyprland}/bin/Hyprland";
+      };
     };
 
     programs.hyprland = {