From 0e179c9a8340a70766a68c2e0129ba6f18f0b7e2 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Fri, 28 Mar 2025 19:43:06 +0100
Subject: [PATCH] Changed: ReGreet

---
 modules/regreet/regreet.nix  | 51 ++--------------------------
 modules/regreet/regreet.toml | 64 ++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/modules/regreet/regreet.nix b/modules/regreet/regreet.nix
index 10b8ddd..54463eb 100644
--- a/modules/regreet/regreet.nix
+++ b/modules/regreet/regreet.nix
@@ -11,56 +11,9 @@
     
     programs.regreet = {
         enable = true;
-        cageArgs = ["-s" "-m" "last" "--" "regreet"]
-        settings = {
-
-            appearance = "Hey there, Master";
-
-            background = {
-                path = "/etc/background.jpg";
-                fit = "Fill";
-            };
-            
-            GTK = {
-                application_prefer_dark_theme = true;
-                cursor_theme_name = "Adwaita";
-                font_name = "Cantarell 16";
-                icon_theme_name = "Adwaita";#pkgs.material-design-icons;
-                theme_name = "Adwaita";
-            };
-
-            commands = {
-                reboot = ["systemctl" "reboot"];
-                poweroff = ["systemctl" "poweroff"];
-                x11_prefix = ["startx" "/usr/bin/env"];
-            };
-
-            /*widget.clock = {
-                format = "%A %d.%m.%Y %T"; # Sunday 30.03.2025 11:25:17
-                resolution = "500ms";
-                timezone = "Europe/Berlin";
-                label_width = 150;
-            };*/
-            
-
-
-        };
-
-        theme = {
-            package = pkgs.gnome-themes-extra;
-            name = "Adwaita";
-        };
+        cageArgs = ["-s" "-m" "last" "--" "regreet"];
         
-        iconTheme.package = pkgs.vimix-icon-theme;
+        settings = builtins.fromTOML (builtins.readFile ./regreet.toml);
 
-        cursorTheme = {
-            package = pkgs.nordzy-cursor-theme;
-            name = "Nordzy-cursors";
-        };
-        
-        font = {
-            package = pkgs.nerdfonts.roboto-mono;
-            name = "RobotoMono";
-        };
     };
 }
diff --git a/modules/regreet/regreet.toml b/modules/regreet/regreet.toml
index e69de29..f24cf2d 100644
--- a/modules/regreet/regreet.toml
+++ b/modules/regreet/regreet.toml
@@ -0,0 +1,64 @@
+# SPDX-FileCopyrightText: 2022 Harish Rajagopal <harish.rajagopals@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[background]
+# Path to the background image
+path = "/etc/background.jpg"
+
+# How the background image covers the screen if the aspect ratio doesn't match
+# Available values: "Fill", "Contain", "Cover", "ScaleDown"
+# Refer to: https://docs.gtk.org/gtk4/enum.ContentFit.html
+# NOTE: This is ignored if ReGreet isn't compiled with GTK v4.8 support.
+fit = "Fill"
+
+# The entries defined in this section will be passed to the session as environment variables when it is started
+#[env]
+#ENV_VARIABLE = "value"
+
+[GTK]
+# Whether to use the dark theme
+application_prefer_dark_theme = true
+
+# Cursor theme name
+cursor_theme_name = "Adwaita"
+
+# Font name and size
+font_name = "Cantarell 16"
+
+# Icon theme name
+icon_theme_name = "Adwaita"
+
+# GTK theme name
+theme_name = "Adwaita"
+
+[commands]
+# The command used to reboot the system
+reboot = ["systemctl", "reboot"]
+
+# The command used to shut down the system
+poweroff = ["systemctl", "poweroff"]
+
+# The command prefix for X11 sessions to start the X server
+x11_prefix = [ "startx", "/usr/bin/env" ]
+
+[appearance]
+# The message that initially displays on startup
+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 %H:%M"
+
+# 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"
+
+# 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.
+label_width = 150