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 1/3] 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: [ { From 1623b456ec2ca7ae1c632c6023f2d75bd5175ba0 Mon Sep 17 00:00:00 2001 From: lunstia <136163666+lunstia@users.noreply.github.com> Date: Mon, 11 Aug 2025 02:15:41 -0400 Subject: [PATCH 2/3] Add variable and moved directory to correct one --- .config/matugen/templates/{ => hyprland}/hyprlock-colors.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename .config/matugen/templates/{ => hyprland}/hyprlock-colors.conf (85%) diff --git a/.config/matugen/templates/hyprlock-colors.conf b/.config/matugen/templates/hyprland/hyprlock-colors.conf similarity index 85% rename from .config/matugen/templates/hyprlock-colors.conf rename to .config/matugen/templates/hyprland/hyprlock-colors.conf index 1b7479d7d..c103472bd 100644 --- a/.config/matugen/templates/hyprlock-colors.conf +++ b/.config/matugen/templates/hyprland/hyprlock-colors.conf @@ -7,4 +7,6 @@ $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 +$font_material_symbols = Material Symbols Rounded + +$background_image = {{image}} \ No newline at end of file From d8e09e80ffae20018975100174df1485c9bf35ad Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Tue, 12 Aug 2025 09:44:12 +0700 Subject: [PATCH 3/3] move hyprlock colors file, remove redundant hyprlock matugen template --- .config/hypr/hyprlock.conf | 2 +- .../colors.conf} | 0 .config/matugen/config.toml | 2 +- .../matugen/templates/hyprland/hyprlock.conf | 104 ------------------ 4 files changed, 2 insertions(+), 106 deletions(-) rename .config/hypr/{hyprlock-colors.conf => hyprlock/colors.conf} (100%) delete mode 100644 .config/matugen/templates/hyprland/hyprlock.conf diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 49b7f31d8..208f7cfeb 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -1,4 +1,4 @@ -source=~/.config/hypr/hyprlock-colors.conf +source=~/.config/hypr/hyprlock/colors.conf background { color = rgba(181818FF) diff --git a/.config/hypr/hyprlock-colors.conf b/.config/hypr/hyprlock/colors.conf similarity index 100% rename from .config/hypr/hyprlock-colors.conf rename to .config/hypr/hyprlock/colors.conf diff --git a/.config/matugen/config.toml b/.config/matugen/config.toml index 6ce680bac..d2b2a9a1c 100644 --- a/.config/matugen/config.toml +++ b/.config/matugen/config.toml @@ -11,7 +11,7 @@ output_path = '~/.config/hypr/hyprland/colors.conf' [templates.hyprlock] input_path = '~/.config/matugen/templates/hyprland/hyprlock-colors.conf' -output_path = '~/.config/hypr/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/hyprland/hyprlock.conf b/.config/matugen/templates/hyprland/hyprlock.conf deleted file mode 100644 index 13f7dd8f0..000000000 --- a/.config/matugen/templates/hyprland/hyprlock.conf +++ /dev/null @@ -1,104 +0,0 @@ -$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 - -background { - color = rgba(181818FF) - - path = {{image}} - blur_size = 15 - blur_passes = 4 - brightness = 0.33 -} -input-field { - monitor = - size = 250, 50 - outline_thickness = 2 - dots_size = 0.1 - dots_spacing = 0.3 - outer_color = $entry_border_color - inner_color = $entry_background_color - font_color = $entry_color - fade_on_empty = true - - position = 0, 20 - halign = center - valign = center -} - -label { - monitor = - text = $LAYOUT - color = $text_color - font_size = 14 - font_family = $font_family - position = -30, 30 - halign = right - valign = bottom -} - -label { # Caps Lock Warning - monitor = - text = cmd[update:250] ${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprlock/check-capslock.sh - color = $text_color - font_size = 13 - font_family = $font_family - position = 0, -25 - halign = center - valign = center -} - - -label { # Clock - monitor = - text = $TIME - color = $text_color - font_size = 65 - font_family = $font_family_clock - - position = 0, 300 - halign = center - valign = center -} -label { # Date - monitor = - text = cmd[update:5000] date +"%A, %B %d" - color = $text_color - font_size = 17 - font_family = $font_family_clock - - position = 0, 240 - halign = center - valign = center -} - -label { # User - monitor = - text =  $USER - color = $text_color - outline_thickness = 2 - dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true - font_size = 20 - font_family = $font_family - position = 0, 50 - halign = center - valign = bottom -} - -label { # Status - monitor = - text = cmd[update:5000] ${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprlock/status.sh - color = $text_color - font_size = 14 - font_family = $font_family - - position = 30, -30 - halign = left - valign = top -} \ No newline at end of file