From 450c8c6273cd71380c105e5892cde130ac965bf2 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Tue, 1 Apr 2025 01:37:47 +0200
Subject: [PATCH] Changed: ReGreet

---
 modules/regreet/regreet.nix  | 32 +++++++++++++++++++-------------
 modules/regreet/regreet.toml |  4 ++--
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/modules/regreet/regreet.nix b/modules/regreet/regreet.nix
index a4293d2..a0e15a3 100644
--- a/modules/regreet/regreet.nix
+++ b/modules/regreet/regreet.nix
@@ -1,25 +1,31 @@
 { pkgs, username, ... }: {
     services.greetd = {
-        enable = true;
+	enable = true;
+	settings = {
+		default_session = {
+			user = username;
+			command = "$HOME/.wayland-session";
+		};
+	};
+    };
+    services.displayManager = {
+	sessionPackages = [ pkgs.hyprland ];
     };
 
-    services.cage = {
-        enable = true;
-        user = username;
-    };
-    
-    environment.etc.greetd = {
-        "background.jpg".source = ./background.jpg;
-        "environments".text = ''
+    environment.etc= {
+        "greetd/background.jpg".source = ./background.jpg;
+        "greetd/environments".text = ''
         hyprland
         fish
         '';
     };
-    
-    programs.regreet = {
+
+
+	# Session File Hyprland ?
+    /*programs.regreet = {
         enable = true;
-        cageArgs = ["-s" "-m" "last" ];
+      #  cageArgs = ["-s" "-m" "last" ];
         
         settings = ./regreet.toml;
-    };
+    };*/
 }
diff --git a/modules/regreet/regreet.toml b/modules/regreet/regreet.toml
index 7898099..616339e 100644
--- a/modules/regreet/regreet.toml
+++ b/modules/regreet/regreet.toml
@@ -50,14 +50,14 @@ greeting_msg = "Hey there, Master."
 [widget.clock]
 # strftime format argument
 # See https://docs.rs/jiff/0.1.14/jiff/fmt/strtime/index.html#conversion-specifications
-format = "%A"
+format = "%A %T"
 
 # How often to update the text
 resolution = "500ms"
 
 # Override system timezone (IANA Time Zone Database name, aka /etc/zoneinfo path)
 # Remove to use the system time zone.
-timezone = "America/Chicago"
+timezone = "Europe/Berlin"
 
 # Ask GTK to make the label at least this wide. This helps keeps the parent element layout and width consistent.
 # Experiment with different widths, the interpretation of this value is entirely up to GTK.