Regenerated

Droidnix/README.org

@@ -639,27 +639,60 @@ in
 ** =generated/modules/traveldroid/system/login-tuigreet.nix=
 This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/login-tuigreet.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
 let
-  # Default username fallback
   username = config.defaultUser or "henrov";
+
+  # Path to greeter TOML
+  greeterConfSrc = "${flakeRoot}/assets/traveldroid/conf/greeter.toml";
+
+  # Hyprland session binary
+  hyprlandPath = "${pkgs.hyprland}/bin/Hyprland";
 in
 {
-  #################################
-  # System-wide package installation
-  #################################
+  ##############################
+  # Install tuigreet system-wide
+  ##############################
   environment.systemPackages = [ pkgs.tuigreet ];
 
   #################################
-  # Enable greetd login manager
+  # System-wide greeter configuration
+  #################################
+  environment.etc."greeter/greeter.toml".source = greeterConfSrc;
+
+  #################################
+  # Greetd service
   #################################
   services.greetd = {
     enable = true;
+
     settings = {
-      default_session = {
-        # Force the command to use tuigreet for the default user
-        command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
+      # Declare available sessions
+      sessions = {
+        hyprland = { path = hyprlandPath; };
+      };
+
+      # Default session (must match a session above)
+      default_session = { session = "hyprland"; };
+
+      # Greeter command (tuigreet)
+      greeter = {
+        command = "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
+        user = username;
+      };
+    };
+  };
+
+  #################################
+  # Optional: Home Manager integration
+  # Ensure user can see session in their environment
+  #################################
+  _module.args.hmUsers = {
+    ${username} = {
+      # Expose the Hyprland session to the user
+      home.sessionCommands = {
+        hyprland = hyprlandPath;
       };
     };
   };