diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/installxpadneo.sh similarity index 100% rename from files/scripts/install-xpadneo.sh rename to files/scripts/installxpadneo.sh diff --git a/files/scripts/setupcodiumrepo.sh b/files/scripts/setupcodiumrepo.sh new file mode 100644 index 0000000..7457b24 --- /dev/null +++ b/files/scripts/setupcodiumrepo.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Tell build process to exit if there are any errors. +set -oue pipefail + +# import keys +sudo rpmkeys --import https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg + +# create file called vscodium.repo and setup file to possess +printf "[gitlab.com_paulcarroty_vscodium_repo]\nname=download.vscodium.com\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h\n" | sudo tee -a /etc/yum.repos.d/vscodium.repo \ No newline at end of file diff --git a/files/system/etc/xdg/autostart/kitty.desktop b/files/system/etc/xdg/autostart/kitty.desktop deleted file mode 100644 index 3885177..0000000 --- a/files/system/etc/xdg/autostart/kitty.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[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/system/bootc-fetch-updates.service b/files/systemd/system/bootc-fetch-updates.service deleted file mode 100644 index c316cde..0000000 --- a/files/systemd/system/bootc-fetch-updates.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Download bootc updates -Documentation=man:bootc(8) -ConditionPathExists=/run/ostree-booted - -[Service] -Type=oneshot -ExecStart=/usr/bin/bootc update --quiet \ No newline at end of file diff --git a/files/systemd/system/bootc-fetch-updates.timer b/files/systemd/system/bootc-fetch-updates.timer deleted file mode 100644 index 482831f..0000000 --- a/files/systemd/system/bootc-fetch-updates.timer +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Download bootc updates -Documentation=man:bootc(8) -ConditionPathExists=/run/ostree-booted - -[Timer] -OnBootSec=15min -OnUnitInactiveSec=8h -RandomizedDelaySec=2h - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml index bf8adff..e519332 100644 --- a/recipes/components/dnf-module.yml +++ b/recipes/components/dnf-module.yml @@ -1,122 +1,18 @@ modules: - type: dnf repos: - copr: - - ublue-os/packages - - solopasha/hyprland - - peterwu/rendezvous nonfree: negativo17 install: packages: - # sddm - - sddm - - sddm-themes - - qt5-qtgraphicaleffects - - qt5-qtquickcontrols2 - - qt5-qtsvg - - # password keeper - - kf6-kwallet - - kwalletmanager - - pam-kwallet - - # hyprland - - hyprland-git - - hyprpanel - - hyprpolkitagent - - hyprshot - - # ublue udev rules and signing - - ublue-os-udev-rules - - ublue-os-signing - - # environment - # xwayland - - xorg-x11-server-Xwayland - # headset control - - headsetcontrol - # media related - - mediainfo - - playerctl - - alsa-firmware - # zip utilities - - p7zip - # qt libraries - - qt5-qtwayland - - qt6-qtwayland - # vulkan - - vulkan-tools - - vulkan-validation-layers - - # polkit - - polkit - - # sound - - wireplumber - - pipewire - - headsetcontrol - - # networking - - bluez - - bluez-tools - - firewall-config - - # applications - # fuzzy finder - - fzf - - # dmenu runner - - fuzzel - - # file manager - - nautilus - - file-roller - - file-roller-nautilus - - # text editor - - neovim - - # software store - - gnome-software - - # disk management - - gnome-disk-utility - - # kdeconnect - - kde-connect - - # settings apps - # qt - - qt5ct - - qt6ct - - # gtk - - nwg-look - - # Themes and fonts - # emoji fonts - - google-noto-emoji-fonts - - # theme and GUI - - fontawesome-fonts-all - - gnome-themes-extra - - papirus-icon-theme - - bibata-cursor-themes - - # zsh - - zsh - # zoxide for z stuff - - zoxide - - # steam - steam - # for game mode and big picture mode - gamescope - # for performance view - mangohud + # xpadneo - dkms-xpadneo + - libheif + remove: packages: # remove firefox @@ -126,7 +22,6 @@ modules: replace: - from-repo: fedora-multimedia packages: - - libheif - libva - libva-intel-media-driver - mesa-dri-drivers @@ -137,7 +32,7 @@ modules: - mesa-va-drivers - mesa-vulkan-drivers - gstreamer1-plugin-libav - + - type: script scripts: - - install-xpadneo.sh \ No newline at end of file + - installxpadneo.sh \ No newline at end of file diff --git a/recipes/components/rpm-ostree-module.yml b/recipes/components/rpm-ostree-module.yml new file mode 100644 index 0000000..aae07f5 --- /dev/null +++ b/recipes/components/rpm-ostree-module.yml @@ -0,0 +1,6 @@ +modules: + - from-file: components/rpm-ostree/core.yml + - from-file: components/rpm-ostree/hyprland.yml + - from-file: components/rpm-ostree/ublue.yml + - from-file: components/rpm-ostree/applications.yml + - from-file: components/rpm-ostree/themes.yml diff --git a/recipes/components/rpm-ostree/applications.yml b/recipes/components/rpm-ostree/applications.yml new file mode 100644 index 0000000..121977e --- /dev/null +++ b/recipes/components/rpm-ostree/applications.yml @@ -0,0 +1,48 @@ +modules: + - type: script + scripts: + - setupcodiumrepo.sh + + - type: rpm-ostree + install: + # applications + # fuzzy finder + - fzf + + # dmenu runner + - fuzzel + + # file manager + - nautilus + - file-roller + - file-roller-nautilus + + # text editors + - neovim + - codium + + # software store + - gnome-software + + # disk management + - gnome-disk-utility + + # kdeconnect + - kde-connect + + # settings apps + # qt + - qt5ct + - qt6ct + + # gtk + - nwg-look + + # zsh + - zsh + # zoxide for z stuff + - zoxide + + - type: script + snippets: + - "sudo rm /etc/yum.repos.d/vscodium.repo" diff --git a/recipes/components/rpm-ostree/core.yml b/recipes/components/rpm-ostree/core.yml new file mode 100644 index 0000000..af55b43 --- /dev/null +++ b/recipes/components/rpm-ostree/core.yml @@ -0,0 +1,43 @@ +modules: + - type: rpm-ostree + install: + # sddm + - sddm + - sddm-themes + - qt5-qtgraphicaleffects + - qt5-qtquickcontrols2 + - qt5-qtsvg + + # password keeper + - kf6-kwallet + - kwalletmanager5 + - pam-kwallet + + # environment + # headset control + - headsetcontrol + # media related + - mediainfo + - playerctl + - alsa-firmware + # zip utilities + - p7zip + # qt libraries + - qt5-qtwayland + - qt6-qtwayland + # vulkan + - vulkan-tools + - vulkan-validation-layers + + # polkit + - polkit + + # sound + - wireplumber + - pipewire + - headsetcontrol + + # networking + - bluez + - bluez-tools + - firewall-config \ No newline at end of file diff --git a/recipes/components/rpm-ostree/hyprland.yml b/recipes/components/rpm-ostree/hyprland.yml new file mode 100644 index 0000000..7dd0bcf --- /dev/null +++ b/recipes/components/rpm-ostree/hyprland.yml @@ -0,0 +1,9 @@ +modules: + - type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo + install: + - hyprland-git + - hyprpanel + - hyprpolkitagent + - hyprshot \ No newline at end of file diff --git a/recipes/components/rpm-ostree/themes.yml b/recipes/components/rpm-ostree/themes.yml new file mode 100644 index 0000000..d74b077 --- /dev/null +++ b/recipes/components/rpm-ostree/themes.yml @@ -0,0 +1,14 @@ +modules: + - type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/peterwu/rendezvous/repo/fedora-%OS_VERSION%/peterwu-rendezvous-fedora-%OS_VERSION%.repo + install: + # Themes and fonts + # emoji fonts + - google-noto-emoji-fonts + + # theme and GUI + - fontawesome-fonts-all + - gnome-themes-extra + - papirus-icon-theme + - bibata-cursor-themes diff --git a/recipes/components/rpm-ostree/ublue.yml b/recipes/components/rpm-ostree/ublue.yml new file mode 100644 index 0000000..655e49c --- /dev/null +++ b/recipes/components/rpm-ostree/ublue.yml @@ -0,0 +1,7 @@ +modules: + - type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/ublue-os/packages/repo/fedora-%OS_VERSION%/ublue-os-packages-fedora-%OS_VERSION%.repo + install: + - ublue-os-udev-rules + - ublue-os-signing diff --git a/recipes/components/systemd-module.yml b/recipes/components/systemd-module.yml index 46c2e3e..fe6bdcb 100644 --- a/recipes/components/systemd-module.yml +++ b/recipes/components/systemd-module.yml @@ -2,7 +2,7 @@ modules: - type: systemd system: enabled: - - bootc-fetch-updates.timer + - rpm-ostreed-automatic.timer - flatpak-system-update.timer user: enabled: diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 7042d1c..b290671 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -13,6 +13,7 @@ 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/dnf-module.yml + - from-file: components/rpm-ostree-module.yml - from-file: components/script-module.yml - from-file: components/sys-files-module.yml - from-file: components/systemd-module.yml diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml index bb4008e..bba1fca 100644 --- a/recipes/recipe_nvidia.yml +++ b/recipes/recipe_nvidia.yml @@ -13,6 +13,7 @@ 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/dnf-module.yml + - from-file: components/rpm-ostree.yml - from-file: components/script-module.yml - from-file: components/sys-files-module.yml - from-file: components/systemd-module.yml