From a4ccb540c886470f33adabb0d214e0a250af29bd Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 16 Jun 2025 23:13:09 -0400 Subject: [PATCH 1/4] Added back gnome-software for better flatpak installation and added gnome-disk-utility to manage drives --- recipes/components/base-module.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml index 3a4b330..13cb741 100644 --- a/recipes/components/base-module.yml +++ b/recipes/components/base-module.yml @@ -65,6 +65,12 @@ modules: # power - powerstat + + # software + - gnome-software + + # disk management + - gnome-disk-utility remove: packages: -- 2.39.5 From b471730686619c3aa13cb1bebe36c08042f6fca4 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Tue, 17 Jun 2025 22:36:36 -0400 Subject: [PATCH 2/4] 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 -- 2.39.5 From 537dc3835f10ee6d68f53fca453854c3b4fed0c9 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Tue, 17 Jun 2025 22:40:23 -0400 Subject: [PATCH 3/4] Removed kwallet service as it was already in xdg autostart --- files/systemd/user/unlock-kwallet.service | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 files/systemd/user/unlock-kwallet.service diff --git a/files/systemd/user/unlock-kwallet.service b/files/systemd/user/unlock-kwallet.service deleted file mode 100644 index 3215bd8..0000000 --- a/files/systemd/user/unlock-kwallet.service +++ /dev/null @@ -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 \ No newline at end of file -- 2.39.5 From d75fdb060888acf6161b03dec1d0c22928ad5d6b Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Tue, 17 Jun 2025 23:50:50 -0400 Subject: [PATCH 4/4] Moved some regular application launches into using xdg autostart or removing --- files/system/etc/xdg/autostart/discord.desktop | 14 ++++++++++++++ files/system/etc/xdg/autostart/kitty.desktop | 16 ++++++++++++++++ files/systemd/user/discord.service | 17 ----------------- files/systemd/user/steam.service | 17 ----------------- files/systemd/user/terminal.service | 17 ----------------- recipes/components/autostart-module.yml | 5 +---- 6 files changed, 31 insertions(+), 55 deletions(-) create mode 100644 files/system/etc/xdg/autostart/discord.desktop create mode 100644 files/system/etc/xdg/autostart/kitty.desktop delete mode 100644 files/systemd/user/discord.service delete mode 100644 files/systemd/user/steam.service delete mode 100644 files/systemd/user/terminal.service diff --git a/files/system/etc/xdg/autostart/discord.desktop b/files/system/etc/xdg/autostart/discord.desktop new file mode 100644 index 0000000..eb2e443 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/files/system/etc/xdg/autostart/kitty.desktop b/files/system/etc/xdg/autostart/kitty.desktop new file mode 100644 index 0000000..3885177 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/files/systemd/user/discord.service b/files/systemd/user/discord.service deleted file mode 100644 index 55a382c..0000000 --- a/files/systemd/user/discord.service +++ /dev/null @@ -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 \ No newline at end of file diff --git a/files/systemd/user/steam.service b/files/systemd/user/steam.service deleted file mode 100644 index 84ea60e..0000000 --- a/files/systemd/user/steam.service +++ /dev/null @@ -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 \ No newline at end of file diff --git a/files/systemd/user/terminal.service b/files/systemd/user/terminal.service deleted file mode 100644 index 11a25e3..0000000 --- a/files/systemd/user/terminal.service +++ /dev/null @@ -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 \ No newline at end of file diff --git a/recipes/components/autostart-module.yml b/recipes/components/autostart-module.yml index 88d87dd..a0e847a 100644 --- a/recipes/components/autostart-module.yml +++ b/recipes/components/autostart-module.yml @@ -4,7 +4,4 @@ modules: enabled: - swww.service - hyprpanel.service - - hyprpolkitagent.service - - discord.service - - steam.service - - terminal.service \ No newline at end of file + - hyprpolkitagent.service \ No newline at end of file -- 2.39.5