From 68045125e4ad2153c67927a2886af80e678cb5c3 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 16 Jun 2025 00:58:11 -0400 Subject: [PATCH 1/4] Separate some components into smaller components and added bibata-cursor-themes --- .../components/additional-stuff-module.yml | 15 ++++++++++++++ recipes/components/appearance-module.yml | 19 ++++++++++++++++++ recipes/components/base-module.yml | 20 ------------------- recipes/recipe.yml | 2 ++ recipes/recipe_nvidia.yml | 2 ++ 5 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 recipes/components/additional-stuff-module.yml create mode 100644 recipes/components/appearance-module.yml diff --git a/recipes/components/additional-stuff-module.yml b/recipes/components/additional-stuff-module.yml new file mode 100644 index 0000000..e318f3f --- /dev/null +++ b/recipes/components/additional-stuff-module.yml @@ -0,0 +1,15 @@ +modules: + - type: dnf + install: + skip-unavailable: true + packages: + # fuzzy finder + - fzf + + # dmenu runner + - fuzzel + + # file manager + - nautilus + - file-roller + - file-roller-nautilus \ No newline at end of file diff --git a/recipes/components/appearance-module.yml b/recipes/components/appearance-module.yml new file mode 100644 index 0000000..bd30b14 --- /dev/null +++ b/recipes/components/appearance-module.yml @@ -0,0 +1,19 @@ +modules: + - type: dnf + repos: + copr: + - peterwu/rendezvous + install: + skip-unavailable: true + packages: + # emoji fonts + - google-noto-emoji-fonts + + # theme and GUI + - fontawesome-fonts-all + - gnome-themes-extra + - gnome-icon-theme + - paper-icon-theme + - breeze-icon-theme + - papirus-icon-theme + - bibata-cursor-themes \ No newline at end of file diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml index fecaddb..3d1db74 100644 --- a/recipes/components/base-module.yml +++ b/recipes/components/base-module.yml @@ -26,8 +26,6 @@ modules: install: packages: # environment - # fuzzy finder - - fzf # power profiles like - tuned-ppd # xwayland @@ -50,14 +48,9 @@ modules: # qt ct packages - qt5ct - qt6ct - # emoji fonts - - google-noto-emoji-fonts # vulkan - vulkan-tools - vulkan-validation-layers - - # dmenu runner - - fuzzel # polkit - polkit @@ -73,19 +66,6 @@ modules: - bluez-tools - firewall-config - # file manager - - nautilus - - file-roller - - file-roller-nautilus - - # theme and GUI - - fontawesome-fonts-all - - gnome-themes-extra - - gnome-icon-theme - - paper-icon-theme - - breeze-icon-theme - - papirus-icon-theme - # power - powerstat diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 51a9eb4..c84974e 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -14,6 +14,8 @@ image-version: 42 # latest is also supported if you want new updates ASAP modules: - from-file: components/sddm-module.yml - from-file: components/base-module.yml + - from-file: components/additional-stuff-module.yml + - from-file: components/appearance-module.yml - from-file: components/sys-files-module.yml - from-file: components/hyprland-module.yml - from-file: components/zsh-module.yml diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml index 4cb1270..6373f64 100644 --- a/recipes/recipe_nvidia.yml +++ b/recipes/recipe_nvidia.yml @@ -14,6 +14,8 @@ image-version: 42 # latest is also supported if you want new updates ASAP modules: - from-file: components/sddm-module.yml - from-file: components/base-module.yml + - from-file: components/additional-stuff-module.yml + - from-file: components/appearance-module.yml - from-file: components/nvidia-module.yml - from-file: components/sys-files-module.yml - from-file: components/hyprland-module.yml -- 2.39.5 From f30442534fd4597c0c16dfbf59bf0741ad59c492 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 16 Jun 2025 01:02:51 -0400 Subject: [PATCH 2/4] Added theme environment variables to systemd user space --- files/system/etc/environment.d/theme.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 files/system/etc/environment.d/theme.conf diff --git a/files/system/etc/environment.d/theme.conf b/files/system/etc/environment.d/theme.conf new file mode 100644 index 0000000..4891bfb --- /dev/null +++ b/files/system/etc/environment.d/theme.conf @@ -0,0 +1,2 @@ +QT_QPA_PLATFORMTHEME=qt6ct +QT_QUICK_CONTROLS_STYLE,org.hyprland.style \ No newline at end of file -- 2.39.5 From 0a0a3c820cb5a177c6245cf3dd37bf06fe890e9a Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 16 Jun 2025 01:03:48 -0400 Subject: [PATCH 3/4] Corrected typos from coping from another config --- files/system/etc/environment.d/theme.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/system/etc/environment.d/theme.conf b/files/system/etc/environment.d/theme.conf index 4891bfb..6b1013e 100644 --- a/files/system/etc/environment.d/theme.conf +++ b/files/system/etc/environment.d/theme.conf @@ -1,2 +1,2 @@ QT_QPA_PLATFORMTHEME=qt6ct -QT_QUICK_CONTROLS_STYLE,org.hyprland.style \ No newline at end of file +QT_QUICK_CONTROLS_STYLE=org.hyprland.style \ No newline at end of file -- 2.39.5 From 27bbd783df064605f3ab759454639626c651ec51 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 16 Jun 2025 12:53:23 -0400 Subject: [PATCH 4/4] Moved qt ct to appearnace and added nwg-look --- recipes/components/appearance-module.yml | 10 ++++++++++ recipes/components/base-module.yml | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/recipes/components/appearance-module.yml b/recipes/components/appearance-module.yml index bd30b14..53dbe6b 100644 --- a/recipes/components/appearance-module.yml +++ b/recipes/components/appearance-module.yml @@ -3,9 +3,19 @@ modules: repos: copr: - peterwu/rendezvous + - solopasha/hyprland install: skip-unavailable: true packages: + # settings apps + # qt + - qt5ct + - qt6ct + + # gtk + - nwg-look + + # Themes and fonts # emoji fonts - google-noto-emoji-fonts diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml index 3d1db74..3a4b330 100644 --- a/recipes/components/base-module.yml +++ b/recipes/components/base-module.yml @@ -45,9 +45,6 @@ modules: # qt libraries - qt5-qtwayland - qt6-qtwayland - # qt ct packages - - qt5ct - - qt6ct # vulkan - vulkan-tools - vulkan-validation-layers -- 2.39.5