files/system/etc/xdg/autostart/discord.desktop

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Discord
+StartupWMClass=discord
+Comment=All-in-one voice and text chat for gamers that's free, secure, and works on both your desktop and phone.
+GenericName=Internet Messenger
+Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=com.discordapp.Discord --file-forwarding com.discordapp.Discord @@u %U @@
+Icon=com.discordapp.Discord
+Type=Application
+Categories=Network;InstantMessaging;
+Path=/usr/bin
+X-Desktop-File-Install-Version=0.28
+MimeType=x-scheme-handler/discord;
+X-Flatpak-Tags=proprietary;
+X-Flatpak=com.discordapp.Discord

files/system/etc/xdg/autostart/kitty.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=kitty
+GenericName=Terminal emulator
+Comment=Fast, feature-rich, GPU based terminal
+TryExec=kitty
+StartupNotify=true
+Exec=/usr/bin/hyprctl dispatch exec [workspace special:terminal silent] /usr/bin/kitty
+Icon=kitty
+Categories=System;TerminalEmulator;
+X-TerminalArgExec=--
+X-TerminalArgTitle=--title
+X-TerminalArgAppId=--class
+X-TerminalArgDir=--working-directory
+X-TerminalArgHold=--hold

files/systemd/user/discord.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=The VoIP program targeted towards gaming.
-# order startup after WM
-After=graphical-session.target
-
-[Service]
-Type=exec
-# Repurpose XDG Autostart filtering
-ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/bin/flatpak run com.discordapp.Discord
-Slice=app-graphical.slice
-
-[Install]
-WantedBy=graphical-session.target
-# Alternatively can be wanted by specific WMs' targets
-# Should also be duplicated in 'After=' to avoid ordering loop
-#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/steam.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=The pc gaming platform
-# order startup after WM
-After=graphical-session.target
-
-[Service]
-Type=exec
-# Repurpose XDG Autostart filtering
-ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/bin/steam %U
-Slice=app-graphical.slice
-
-[Install]
-WantedBy=graphical-session.target
-# Alternatively can be wanted by specific WMs' targets
-# Should also be duplicated in 'After=' to avoid ordering loop
-#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/terminal.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=The Kitty terminal emulator.
-# order startup after WM
-After=graphical-session.target
-
-[Service]
-Type=exec
-# Repurpose XDG Autostart filtering
-ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=hyprctl dispatch exec [workspace special:terminal silent] /usr/bin/kitty
-Slice=app-graphical.slice
-
-[Install]
-WantedBy=graphical-session.target
-# Alternatively can be wanted by specific WMs' targets
-# Should also be duplicated in 'After=' to avoid ordering loop
-#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/unlock-kwallet.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Unlocks kwallet for hyprland on login.
-# order startup after WM
-After=graphical-session.target
-
-[Service]
-Type=exec
-# Repurpose XDG Autostart filtering
-ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/libexec/pam_kwallet_init
-Slice=app-graphical.slice
-
-[Install]
-WantedBy=graphical-session.target
-# Alternatively can be wanted by specific WMs' targets
-# Should also be duplicated in 'After=' to avoid ordering loop
-#WantedBy=wayland-session@hyprland.desktop.target

recipes/components/autostart-module.yml

@@ -5,6 +5,3 @@ modules:
         - swww.service
         - hyprpanel.service
         - hyprpolkitagent.service
-        - discord.service
-        - steam.service
-        - terminal.service

recipes/components/base-applications-module.yml

@@ -13,3 +13,15 @@ modules:
         - nautilus
         - file-roller
         - file-roller-nautilus
+
+        # text editor
+        - neovim
+      
+        # software store
+        - gnome-software
+
+        # disk management
+        - gnome-disk-utility
+
+        # kdeconnect
+        - kde-connect

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

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

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