From ac8f7cca4ef2c3754fbea5de291a70465a61363a Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Sun, 21 Sep 2025 23:02:59 -0400 Subject: [PATCH] fix-quickshell (#68) Used quickshell-git to fix qt different version issues. Uninstalled some programs to opt for flatpaks. Installed qdirstat. Reviewed-on: https://git.hydrosaber.com/eriq12/hydro-os/pulls/68 Co-authored-by: Eriq Taing Co-committed-by: Eriq Taing --- .../hypr/hyprland.conf.d/monitors.conf | 4 --- .../usr/share/applications/codium.desktop | 27 ------------------- files/systemd/user/swww.service | 15 ----------- recipes/components/chezmoi-module.yml | 6 +---- recipes/components/systemd-module.yml | 1 - recipes/dnf/applications.yml | 10 ++----- recipes/dnf/hyprland.yml | 2 +- 7 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf delete mode 100644 files/system/usr/share/applications/codium.desktop delete mode 100644 files/systemd/user/swww.service diff --git a/files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf b/files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf deleted file mode 100644 index 17890f6..0000000 --- a/files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf +++ /dev/null @@ -1,4 +0,0 @@ -# monitors.conf - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto \ No newline at end of file diff --git a/files/system/usr/share/applications/codium.desktop b/files/system/usr/share/applications/codium.desktop deleted file mode 100644 index 12f332b..0000000 --- a/files/system/usr/share/applications/codium.desktop +++ /dev/null @@ -1,27 +0,0 @@ -[Desktop Entry] -Name=VSCodium -Comment=Code Editing. Redefined. -GenericName=Text Editor -Exec=/usr/share/codium/codium --ozone-platform=wayland %F -Icon=vscodium -Type=Application -StartupNotify=false -StartupWMClass=VSCodium -Categories=TextEditor;Development;IDE; -MimeType=text/plain;inode/directory;application/x-codium-workspace; -Actions=new-empty-window; -Keywords=vscodium;codium;vscode; - -[Desktop Action new-empty-window] -Name=New Empty Window -Name[de]=Neues leeres Fenster -Name[es]=Nueva ventana vacía -Name[fr]=Nouvelle fenêtre vide -Name[it]=Nuova finestra vuota -Name[ja]=新しい空のウィンドウ -Name[ko]=새 빈 창 -Name[ru]=Новое пустое окно -Name[zh_CN]=新建空窗口 -Name[zh_TW]=開新空視窗 -Exec=/usr/share/codium/codium --new-window %F -Icon=vscodium diff --git a/files/systemd/user/swww.service b/files/systemd/user/swww.service deleted file mode 100644 index 1993560..0000000 --- a/files/systemd/user/swww.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Background service -# 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/swww-daemon -Restart=on-failure -Slice=app-graphical.slice - -[Install] -WantedBy=graphical-session.target \ No newline at end of file diff --git a/recipes/components/chezmoi-module.yml b/recipes/components/chezmoi-module.yml index 818b374..f5a8d3e 100644 --- a/recipes/components/chezmoi-module.yml +++ b/recipes/components/chezmoi-module.yml @@ -1,7 +1,3 @@ modules: - type: chezmoi - repository: "https://git.hydrosaber.com/eriq12/dotfiles" - - - type: script - scripts: - - setupchezmoiskel.sh \ No newline at end of file + repository: "https://git.hydrosaber.com/eriq12/dotfiles" \ No newline at end of file diff --git a/recipes/components/systemd-module.yml b/recipes/components/systemd-module.yml index 501ca3c..7df2973 100644 --- a/recipes/components/systemd-module.yml +++ b/recipes/components/systemd-module.yml @@ -7,6 +7,5 @@ modules: user: enabled: - flatpak-user-update.timer - - swww.service - quickshell.service - hyprpolkitagent.service \ No newline at end of file diff --git a/recipes/dnf/applications.yml b/recipes/dnf/applications.yml index f7154aa..e811113 100644 --- a/recipes/dnf/applications.yml +++ b/recipes/dnf/applications.yml @@ -2,10 +2,6 @@ modules: - type: dnf repos: nonfree: rpmfusion - files: - - https://repo.vscodium.dev/vscodium.repo - copr: - - mavit/discover-overlay install: packages: # applications @@ -27,7 +23,6 @@ modules: # text editor - neovim - - codium # software store - gnome-software @@ -35,11 +30,10 @@ modules: # disk management - gnome-disk-utility + - qdirstat + # kdeconnect - kde-connect - - # discord overlay - - discover-overlay # settings apps # qt diff --git a/recipes/dnf/hyprland.yml b/recipes/dnf/hyprland.yml index 51d60a6..14b8038 100644 --- a/recipes/dnf/hyprland.yml +++ b/recipes/dnf/hyprland.yml @@ -16,4 +16,4 @@ modules: - matugen # quickshell - - quickshell \ No newline at end of file + - quickshell-git \ No newline at end of file