From 307959ba76eecb8ad23b802461666da823da5c8d Mon Sep 17 00:00:00 2001
From: lunstia <136163666+lunstia@users.noreply.github.com>
Date: Mon, 11 Aug 2025 00:31:22 -0400
Subject: [PATCH] Edit matugen and hyprlock to separate the two

---
 .config/hypr/hyprlock-colors.conf                      | 10 ++++++++++
 .config/hypr/hyprlock.conf                             |  8 +-------
 .config/matugen/config.toml                            |  4 ++--
 .config/matugen/templates/hyprlock-colors.conf         | 10 ++++++++++
 .../quickshell/ii/modules/settings/ServicesConfig.qml  |  9 +++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 .config/hypr/hyprlock-colors.conf
 create mode 100644 .config/matugen/templates/hyprlock-colors.conf

diff --git a/.config/hypr/hyprlock-colors.conf b/.config/hypr/hyprlock-colors.conf
new file mode 100644
index 000000000..f282e7edc
--- /dev/null
+++ b/.config/hypr/hyprlock-colors.conf
@@ -0,0 +1,10 @@
+# This configuration is generated by matugen
+# Changing these variables with matugen still enabled will overwrite them.
+
+$text_color = rgba(FFDAD6FF)
+$entry_background_color = rgba(41000311)
+$entry_border_color = rgba(896E6C55)
+$entry_color = rgba(FFDAD6FF)
+$font_family = Rubik Light
+$font_family_clock = Rubik Light
+$font_material_symbols = Material Symbols Rounded
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 2526054be..49b7f31d8 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,10 +1,4 @@
-$text_color = rgba(FFDAD6FF)
-$entry_background_color = rgba(41000311)
-$entry_border_color = rgba(896E6C55)
-$entry_color = rgba(FFDAD6FF)
-$font_family = Rubik Light
-$font_family_clock = Rubik Light
-$font_material_symbols = Material Symbols Rounded
+source=~/.config/hypr/hyprlock-colors.conf
 
 background {
     color = rgba(181818FF)
diff --git a/.config/matugen/config.toml b/.config/matugen/config.toml
index a7330d496..6ce680bac 100644
--- a/.config/matugen/config.toml
+++ b/.config/matugen/config.toml
@@ -10,8 +10,8 @@ input_path = '~/.config/matugen/templates/hyprland/colors.conf'
 output_path = '~/.config/hypr/hyprland/colors.conf'
 
 [templates.hyprlock]
-input_path = '~/.config/matugen/templates/hyprland/hyprlock.conf'
-output_path = '~/.config/hypr/hyprlock.conf'
+input_path = '~/.config/matugen/templates/hyprland/hyprlock-colors.conf'
+output_path = '~/.config/hypr/hyprlock-colors.conf'
 
 [templates.fuzzel]
 input_path = '~/.config/matugen/templates/fuzzel/fuzzel_theme.ini'
diff --git a/.config/matugen/templates/hyprlock-colors.conf b/.config/matugen/templates/hyprlock-colors.conf
new file mode 100644
index 000000000..1b7479d7d
--- /dev/null
+++ b/.config/matugen/templates/hyprlock-colors.conf
@@ -0,0 +1,10 @@
+# This configuration is generated by matugen
+# Changing these variables with matugen still enabled will overwrite them.
+
+$text_color = rgba({{colors.primary_fixed.default.hex_stripped}}FF)
+$entry_background_color = rgba({{colors.on_primary_fixed.default.hex_stripped}}11)
+$entry_border_color = rgba({{colors.outline.default.hex_stripped}}55)
+$entry_color = rgba({{colors.primary_fixed.default.hex_stripped}}FF)
+$font_family = Rubik
+$font_family_clock = Space Grotesk DemiBold
+$font_material_symbols = Material Symbols Rounded
\ No newline at end of file
diff --git a/.config/quickshell/ii/modules/settings/ServicesConfig.qml b/.config/quickshell/ii/modules/settings/ServicesConfig.qml
index 02b3a3d23..666d83bf4 100644
--- a/.config/quickshell/ii/modules/settings/ServicesConfig.qml
+++ b/.config/quickshell/ii/modules/settings/ServicesConfig.qml
@@ -3,7 +3,9 @@ import QtQuick.Layouts
 import qs
 import qs.services
 import qs.modules.common
+import qs.modules.common.functions
 import qs.modules.common.widgets
+import Quickshell
 
 ContentPage {
     forceWidth: true
@@ -211,7 +213,14 @@ ContentPage {
                 currentValue: Config.options.time.format
                 configOptionName: "time.format"
                 onSelected: newValue => {
+                    if (newValue === "hh:mm") {
+                        Quickshell.execDetached(["bash", "-c", `sed -i 's/\\TIME12\\b/TIME/' '${FileUtils.trimFileProtocol(Directories.config)}/hypr/hyprlock.conf'`]);
+                    } else {
+                        Quickshell.execDetached(["bash", "-c", `sed -i 's/\\TIME\\b/TIME12/' '${FileUtils.trimFileProtocol(Directories.config)}/hypr/hyprlock.conf'`]);
+                    }
+
                     Config.options.time.format = newValue;
+                    
                 }
                 options: [
                     {