Regenerated

Droidnix/README.org

@@ -642,50 +642,41 @@ This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aimin
 { lib, config, pkgs, flakeRoot, ... }:
 
 let
+  username = config.defaultUser or "henrov";
   greeterConfSrc = "${flakeRoot}/assets/traveldroid/conf/greeter.toml";
+  hyprlandPath = "${pkgs.hyprland}/bin/Hyprland";
 in
 {
+  ##############################
+  # Install tuigreet system-wide
+  ##############################
   environment.systemPackages = [ pkgs.tuigreet ];
 
-  # System-wide greeter config
+  #################################
+  # System-wide greeter configuration
+  #################################
   environment.etc."greeter/greeter.toml".source = greeterConfSrc;
 
+  #################################
+  # Greetd service
+  #################################
   services.greetd = {
     enable = true;
 
-    # Sessions and default
     settings = {
+      # Declare available sessions
       sessions = {
         hyprland = {
-          path = "${pkgs.hyprland}/bin/Hyprland";
+          path = hyprlandPath;
         };
       };
 
+      # Default session
       default_session = "hyprland";
 
-      # Command for the greeter (tuigreet)
-      greeter = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
-      };
-    };
-  };
-}
-let
-  hyprlandSession = "${pkgs.hyprland}/bin/Hyprland";
-  greeterConfSrc = "${flakeRoot}/assets/traveldroid/conf/greeter.toml";
-in
-{
-  environment.systemPackages = [ pkgs.tuigreet ];
-
-  # Copy greeter.toml system-wide
-  environment.etc."greeter/greeter.toml".source = greeterConfSrc;
-
-  services.greetd = {
-    enable = true;
-
-    settings.default_session = {
-      # Use system-wide config
-      command = "${pkgs.tuigreet}/bin/tuigreet --config /etc/greeter/greeter.toml --remember --time --time-format '%I:%M %p | %a • %h | %F' --session ${hyprlandSession}";
+      # Greeter command
+      greeter.command = "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
+      greeter.user = username;  # run greeter as the default user
     };
   };
 }