From b471730686619c3aa13cb1bebe36c08042f6fca4 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Tue, 17 Jun 2025 22:36:36 -0400
Subject: [PATCH] Renamed base-module and additional-stuff-module to more
 appropriate names, and moved accordingly. Added kde connect

---
 ...uff-module.yml => base-applications-module.yml} | 14 +++++++++++++-
 .../{base-module.yml => core-module.yml}           |  9 ---------
 recipes/recipe.yml                                 |  4 ++--
 recipes/recipe_nvidia.yml                          |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename recipes/components/{additional-stuff-module.yml => base-applications-module.yml} (50%)
 rename recipes/components/{base-module.yml => core-module.yml} (90%)

diff --git a/recipes/components/additional-stuff-module.yml b/recipes/components/base-applications-module.yml
similarity index 50%
rename from recipes/components/additional-stuff-module.yml
rename to recipes/components/base-applications-module.yml
index e318f3f..023b21f 100644
--- a/recipes/components/additional-stuff-module.yml
+++ b/recipes/components/base-applications-module.yml
@@ -12,4 +12,16 @@ modules:
         # file manager
         - nautilus
         - file-roller
-        - file-roller-nautilus
\ No newline at end of file
+        - file-roller-nautilus
+
+        # text editor
+        - neovim
+      
+        # software store
+        - gnome-software
+
+        # disk management
+        - gnome-disk-utility
+
+        # kdeconnect
+        - kde-connect
\ No newline at end of file
diff --git a/recipes/components/base-module.yml b/recipes/components/core-module.yml
similarity index 90%
rename from recipes/components/base-module.yml
rename to recipes/components/core-module.yml
index 13cb741..d9aa59a 100644
--- a/recipes/components/base-module.yml
+++ b/recipes/components/core-module.yml
@@ -19,7 +19,6 @@ modules:
         - flatpak-system-update.timer
     user:
       enabled:
-        - unlock-kwallet.service
         - flatpak-user-update.timer
 
   - type: dnf
@@ -36,8 +35,6 @@ modules:
         - mediainfo
         - playerctl
         - alsa-firmware
-        # text editor
-        - neovim
         # tools for evocation
         - just
         # zip utilities
@@ -65,12 +62,6 @@ modules:
       
       # power
         - powerstat
-      
-      # software
-        - gnome-software
-
-      # disk management
-        - gnome-disk-utility
 
     remove:
       packages:
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index bb39b8f..8c529e0 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -13,8 +13,8 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   - from-file: components/sddm-module.yml
-  - from-file: components/base-module.yml
-  - from-file: components/additional-stuff-module.yml
+  - from-file: components/core-module.yml
+  - from-file: components/base-applications-module.yml
   - from-file: components/appearance-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/hyprland-module.yml
diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml
index eeecf16..5a6882d 100644
--- a/recipes/recipe_nvidia.yml
+++ b/recipes/recipe_nvidia.yml
@@ -13,8 +13,8 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   - from-file: components/sddm-module.yml
-  - from-file: components/base-module.yml
-  - from-file: components/additional-stuff-module.yml
+  - from-file: components/core-module.yml
+  - from-file: components/base-applications-module.yml
   - from-file: components/appearance-module.yml
   - from-file: components/nvidia-module.yml
   - from-file: components/sys-files-module.yml