From b978030c51b25af6872206cb1ee8db3cff322060 Mon Sep 17 00:00:00 2001 From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com> Date: Fri, 26 Apr 2024 21:55:45 -0400 Subject: [PATCH] Major refactoring of files and add pipewire tweaks --- config/README.md | 5 + .../etc/modprobe.d/hda-jack-retaks.conf | 0 .../lib/firmware/hda-jack-retask.fw | 0 .../distrobox/etc/distrobox/distrobox.ini | 0 .../etc/security/limits.d/95-pipewire.conf | 4 + .../files/pipewire-tweaks/etc/sysconfig/rtkit | 13 ++ .../services/steam-local-transfer.xml | 0 .../firstboot/launcher/autostart.desktop | 0 .../ublue-os/firstboot/launcher/autostart.sh | 0 .../firstboot/launcher/launcher-flowchart.png | Bin .../firstboot/launcher/login-profile.sh | 0 .../yafti}/share/ublue-os/firstboot/yafti.yml | 0 {files => config}/scripts/README.md | 0 {files => config}/scripts/enable-crond.sh | 0 {files => config}/scripts/install-codelldb.sh | 0 {files => config}/scripts/install-earthly.sh | 0 {files => config}/scripts/install-intellij.sh | 0 {files => config}/scripts/install-mkcert.sh | 0 {files => config}/scripts/install-pgadmin.sh | 0 {files => config}/scripts/install-rubymine.sh | 0 .../scripts/install-syncthing.sh | 0 {files => config}/scripts/setup-kubectl.sh | 0 .../scripts/setup-openrgb-udev.sh | 0 .../scripts/setup-selinux-dockersock.sh | 0 {files => config}/scripts/setup-vscode.sh | 0 .../rules.d/99-8bitdo-ultimate-xinput.rules | 4 - .../system/8bitdo-ultimate-xinput@.service | 6 - .../etc/systemd/system/frpintd.service | 48 ------- .../framework-13/etc/tlp.d/50-framework.conf | 134 ------------------ .../pipewire/pipewire.conf.d/max-quantum.conf | 3 - .../files/usr/share/ublue-os/just/custom.just | 17 --- recipes/common/common.yml | 2 + recipes/{modules => common}/dev-packages.yml | 2 +- recipes/{modules => common}/docker-engine.yml | 0 recipes/common/gaming.yml | 6 + recipes/common/jp-common.yml | 12 ++ recipes/common/jp-desktop.yml | 5 + recipes/common/jp-laptop.yml | 6 + recipes/{modules => common}/jp-packages.yml | 3 +- recipes/common/pipewire-tweaks.yml | 3 + .../{modules => common}/remove-firefox.yml | 0 recipes/cp-laptop.yml | 1 - recipes/jp-desktop-40.yml | 9 +- recipes/jp-desktop.yml | 9 +- recipes/jp-laptop-40.yml | 9 +- recipes/jp-laptop.yml | 9 +- recipes/modules/framework.yml | 10 -- recipes/modules/gaming.yml | 3 - recipes/modules/jp-apps.yml | 9 -- 49 files changed, 62 insertions(+), 270 deletions(-) create mode 100644 config/README.md rename {files => config}/files/desktop-audio/etc/modprobe.d/hda-jack-retaks.conf (100%) rename {files => config}/files/desktop-audio/lib/firmware/hda-jack-retask.fw (100%) rename {files => config}/files/distrobox/etc/distrobox/distrobox.ini (100%) create mode 100644 config/files/pipewire-tweaks/etc/security/limits.d/95-pipewire.conf create mode 100644 config/files/pipewire-tweaks/etc/sysconfig/rtkit rename {files => config}/files/steam-firewall/etc/firewalld/services/steam-local-transfer.xml (100%) rename {files/files/usr => config/files/yafti}/share/ublue-os/firstboot/launcher/autostart.desktop (100%) rename {files/files/usr => config/files/yafti}/share/ublue-os/firstboot/launcher/autostart.sh (100%) rename {files/files/usr => config/files/yafti}/share/ublue-os/firstboot/launcher/launcher-flowchart.png (100%) rename {files/files/usr => config/files/yafti}/share/ublue-os/firstboot/launcher/login-profile.sh (100%) rename {files/files/usr => config/files/yafti}/share/ublue-os/firstboot/yafti.yml (100%) rename {files => config}/scripts/README.md (100%) rename {files => config}/scripts/enable-crond.sh (100%) rename {files => config}/scripts/install-codelldb.sh (100%) rename {files => config}/scripts/install-earthly.sh (100%) rename {files => config}/scripts/install-intellij.sh (100%) rename {files => config}/scripts/install-mkcert.sh (100%) rename {files => config}/scripts/install-pgadmin.sh (100%) rename {files => config}/scripts/install-rubymine.sh (100%) rename {files => config}/scripts/install-syncthing.sh (100%) rename {files => config}/scripts/setup-kubectl.sh (100%) rename {files => config}/scripts/setup-openrgb-udev.sh (100%) rename {files => config}/scripts/setup-selinux-dockersock.sh (100%) rename {files => config}/scripts/setup-vscode.sh (100%) delete mode 100644 files/files/8bitdo-ultimate/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules delete mode 100644 files/files/8bitdo-ultimate/lib/systemd/system/8bitdo-ultimate-xinput@.service delete mode 100644 files/files/framework-13/etc/systemd/system/frpintd.service delete mode 100644 files/files/framework-13/etc/tlp.d/50-framework.conf delete mode 100644 files/files/usr/share/pipewire/pipewire.conf.d/max-quantum.conf delete mode 100644 files/files/usr/share/ublue-os/just/custom.just create mode 100644 recipes/common/common.yml rename recipes/{modules => common}/dev-packages.yml (93%) rename recipes/{modules => common}/docker-engine.yml (100%) create mode 100644 recipes/common/gaming.yml create mode 100644 recipes/common/jp-common.yml create mode 100644 recipes/common/jp-desktop.yml create mode 100644 recipes/common/jp-laptop.yml rename recipes/{modules => common}/jp-packages.yml (79%) create mode 100644 recipes/common/pipewire-tweaks.yml rename recipes/{modules => common}/remove-firefox.yml (100%) delete mode 100644 recipes/modules/framework.yml delete mode 100644 recipes/modules/gaming.yml delete mode 100644 recipes/modules/jp-apps.yml diff --git a/config/README.md b/config/README.md new file mode 100644 index 0000000..e0ca447 --- /dev/null +++ b/config/README.md @@ -0,0 +1,5 @@ +- `desktop-audio` - Contains JACK fixes to allow using headphones and speakers at the same time +- `distrobox` - Declaritive files for distrobox images +- `pipewire-tweaks` - Tweaks to pipewire to increase performance ([docs](https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Performance-tuning)) +- `steam-firewall` - Firewall settings for steam to open the port for P2P downloads +- `yafti` - Yafti launcher configurations diff --git a/files/files/desktop-audio/etc/modprobe.d/hda-jack-retaks.conf b/config/files/desktop-audio/etc/modprobe.d/hda-jack-retaks.conf similarity index 100% rename from files/files/desktop-audio/etc/modprobe.d/hda-jack-retaks.conf rename to config/files/desktop-audio/etc/modprobe.d/hda-jack-retaks.conf diff --git a/files/files/desktop-audio/lib/firmware/hda-jack-retask.fw b/config/files/desktop-audio/lib/firmware/hda-jack-retask.fw similarity index 100% rename from files/files/desktop-audio/lib/firmware/hda-jack-retask.fw rename to config/files/desktop-audio/lib/firmware/hda-jack-retask.fw diff --git a/files/files/distrobox/etc/distrobox/distrobox.ini b/config/files/distrobox/etc/distrobox/distrobox.ini similarity index 100% rename from files/files/distrobox/etc/distrobox/distrobox.ini rename to config/files/distrobox/etc/distrobox/distrobox.ini diff --git a/config/files/pipewire-tweaks/etc/security/limits.d/95-pipewire.conf b/config/files/pipewire-tweaks/etc/security/limits.d/95-pipewire.conf new file mode 100644 index 0000000..47f9ab4 --- /dev/null +++ b/config/files/pipewire-tweaks/etc/security/limits.d/95-pipewire.conf @@ -0,0 +1,4 @@ +# Default limits for users of pipewire +@pipewire - rtprio 95 +@pipewire - nice -19 +@pipewire - memlock 4194304 diff --git a/config/files/pipewire-tweaks/etc/sysconfig/rtkit b/config/files/pipewire-tweaks/etc/sysconfig/rtkit new file mode 100644 index 0000000..e8a9bf7 --- /dev/null +++ b/config/files/pipewire-tweaks/etc/sysconfig/rtkit @@ -0,0 +1,13 @@ +RTKIT_ARGS="--scheduling-policy=FIFO +--our-realtime-priority=89 +--max-realtime-priority=88 +--min-nice-level=-19 +--rttime-usec-max=2000000 +--users-max=100 +--processes-per-user-max=1000 +--threads-per-user-max=10000 +--actions-burst-sec=10 +--actions-per-burst-max=1000 +--canary-cheep-msec=30000 +--canary-watchdog-msec=60000 +" diff --git a/files/files/steam-firewall/etc/firewalld/services/steam-local-transfer.xml b/config/files/steam-firewall/etc/firewalld/services/steam-local-transfer.xml similarity index 100% rename from files/files/steam-firewall/etc/firewalld/services/steam-local-transfer.xml rename to config/files/steam-firewall/etc/firewalld/services/steam-local-transfer.xml diff --git a/files/files/usr/share/ublue-os/firstboot/launcher/autostart.desktop b/config/files/yafti/share/ublue-os/firstboot/launcher/autostart.desktop similarity index 100% rename from files/files/usr/share/ublue-os/firstboot/launcher/autostart.desktop rename to config/files/yafti/share/ublue-os/firstboot/launcher/autostart.desktop diff --git a/files/files/usr/share/ublue-os/firstboot/launcher/autostart.sh b/config/files/yafti/share/ublue-os/firstboot/launcher/autostart.sh similarity index 100% rename from files/files/usr/share/ublue-os/firstboot/launcher/autostart.sh rename to config/files/yafti/share/ublue-os/firstboot/launcher/autostart.sh diff --git a/files/files/usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png b/config/files/yafti/share/ublue-os/firstboot/launcher/launcher-flowchart.png similarity index 100% rename from files/files/usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png rename to config/files/yafti/share/ublue-os/firstboot/launcher/launcher-flowchart.png diff --git a/files/files/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/config/files/yafti/share/ublue-os/firstboot/launcher/login-profile.sh similarity index 100% rename from files/files/usr/share/ublue-os/firstboot/launcher/login-profile.sh rename to config/files/yafti/share/ublue-os/firstboot/launcher/login-profile.sh diff --git a/files/files/usr/share/ublue-os/firstboot/yafti.yml b/config/files/yafti/share/ublue-os/firstboot/yafti.yml similarity index 100% rename from files/files/usr/share/ublue-os/firstboot/yafti.yml rename to config/files/yafti/share/ublue-os/firstboot/yafti.yml diff --git a/files/scripts/README.md b/config/scripts/README.md similarity index 100% rename from files/scripts/README.md rename to config/scripts/README.md diff --git a/files/scripts/enable-crond.sh b/config/scripts/enable-crond.sh similarity index 100% rename from files/scripts/enable-crond.sh rename to config/scripts/enable-crond.sh diff --git a/files/scripts/install-codelldb.sh b/config/scripts/install-codelldb.sh similarity index 100% rename from files/scripts/install-codelldb.sh rename to config/scripts/install-codelldb.sh diff --git a/files/scripts/install-earthly.sh b/config/scripts/install-earthly.sh similarity index 100% rename from files/scripts/install-earthly.sh rename to config/scripts/install-earthly.sh diff --git a/files/scripts/install-intellij.sh b/config/scripts/install-intellij.sh similarity index 100% rename from files/scripts/install-intellij.sh rename to config/scripts/install-intellij.sh diff --git a/files/scripts/install-mkcert.sh b/config/scripts/install-mkcert.sh similarity index 100% rename from files/scripts/install-mkcert.sh rename to config/scripts/install-mkcert.sh diff --git a/files/scripts/install-pgadmin.sh b/config/scripts/install-pgadmin.sh similarity index 100% rename from files/scripts/install-pgadmin.sh rename to config/scripts/install-pgadmin.sh diff --git a/files/scripts/install-rubymine.sh b/config/scripts/install-rubymine.sh similarity index 100% rename from files/scripts/install-rubymine.sh rename to config/scripts/install-rubymine.sh diff --git a/files/scripts/install-syncthing.sh b/config/scripts/install-syncthing.sh similarity index 100% rename from files/scripts/install-syncthing.sh rename to config/scripts/install-syncthing.sh diff --git a/files/scripts/setup-kubectl.sh b/config/scripts/setup-kubectl.sh similarity index 100% rename from files/scripts/setup-kubectl.sh rename to config/scripts/setup-kubectl.sh diff --git a/files/scripts/setup-openrgb-udev.sh b/config/scripts/setup-openrgb-udev.sh similarity index 100% rename from files/scripts/setup-openrgb-udev.sh rename to config/scripts/setup-openrgb-udev.sh diff --git a/files/scripts/setup-selinux-dockersock.sh b/config/scripts/setup-selinux-dockersock.sh similarity index 100% rename from files/scripts/setup-selinux-dockersock.sh rename to config/scripts/setup-selinux-dockersock.sh diff --git a/files/scripts/setup-vscode.sh b/config/scripts/setup-vscode.sh similarity index 100% rename from files/scripts/setup-vscode.sh rename to config/scripts/setup-vscode.sh diff --git a/files/files/8bitdo-ultimate/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules b/files/files/8bitdo-ultimate/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules deleted file mode 100644 index a4d7607..0000000 --- a/files/files/8bitdo-ultimate/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules +++ /dev/null @@ -1,4 +0,0 @@ -SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="/usr/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106" - -# This device is connected when the above device disconnects -SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3109", ATTR{manufacturer}=="8BitDo", RUN+="/usr/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106" \ No newline at end of file diff --git a/files/files/8bitdo-ultimate/lib/systemd/system/8bitdo-ultimate-xinput@.service b/files/files/8bitdo-ultimate/lib/systemd/system/8bitdo-ultimate-xinput@.service deleted file mode 100644 index c176ee0..0000000 --- a/files/files/8bitdo-ultimate/lib/systemd/system/8bitdo-ultimate-xinput@.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=8BitDo Ultimate Controller XInput Mode Xbobxdrv Daemon - -[Service] -Type=simple -ExecStart=/usr/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback \ No newline at end of file diff --git a/files/files/framework-13/etc/systemd/system/frpintd.service b/files/files/framework-13/etc/systemd/system/frpintd.service deleted file mode 100644 index ebeff18..0000000 --- a/files/files/framework-13/etc/systemd/system/frpintd.service +++ /dev/null @@ -1,48 +0,0 @@ -[Unit] -Description=Fingerprint Authentication Daemon -Documentation=man:fprintd(1) - -[Service] -Type=dbus -BusName=net.reactivated.Fprint -ExecStart=/usr/libexec/fprintd - -# Filesystem lockdown -ProtectSystem=strict -ProtectKernelTunables=true -ProtectKernelLogs=true -ProtectControlGroups=true -# This always corresponds to /var/lib/fprint -StateDirectory=fprint -StateDirectoryMode=0700 -ProtectHome=true -PrivateTmp=true - -SystemCallFilter=@system-service - -# Network -RestrictAddressFamilies=AF_UNIX AF_LOCAL AF_NETLINK - -# Execute Mappings -MemoryDenyWriteExecute=true - -# Modules -ProtectKernelModules=true - -# Real-time -RestrictRealtime=true - -# Privilege escalation -NoNewPrivileges=true - -# Protect clock, allow USB and SPI device access -ProtectClock=yes -DeviceAllow=char-usb_device rw -DeviceAllow=char-spi rw -DeviceAllow=char-hidraw rw - -# Allow tuning USB parameters (wakeup and persist) -ReadWritePaths=/sys/devices - -[Install] -WantedBy=multi-user.target diff --git a/files/files/framework-13/etc/tlp.d/50-framework.conf b/files/files/framework-13/etc/tlp.d/50-framework.conf deleted file mode 100644 index 5cf11c3..0000000 --- a/files/files/framework-13/etc/tlp.d/50-framework.conf +++ /dev/null @@ -1,134 +0,0 @@ -# ------------------------------------------------------------------------------ -# /etc/tlp.conf - TLP user configuration (version 1.4) -# See full explanation: https://linrunner.de/tlp/settings -# -# Settings are read in the following order: -# -# 1. Intrinsic defaults -# 2. /etc/tlp.d/*.conf - Drop-in customization snippets -# 3. /etc/tlp.conf - User configuration (this file) -# -# Notes: -# - In case of identical parameters, the last occurence has precedence -# - This also means, parameters enabled here will override anything else -# - However you may append values to a parameter already defined as intrinsic -# default or in a previously read file: use PARAMETER+="add values" -# - IMPORTANT: all parameters here are disabled; remove the leading '#' if you -# like to enable a feature without default or have a value different from the -# default -# - Default *: intrinsic default that is effective when the parameter is missing -# or disabled by a leading '#'; use PARAM="" to disable an intrinsic default -# - Default : do nothing or use kernel/hardware defaults -# - -# ------------------------------------------------------------------------------ -# tlp - Parameters for power saving -# -# Settings based on Framework's guidance: https://knowledgebase.frame.work/en_us/optimizing-fedora-battery-life-r1baXZh - -# Select a CPU frequency scaling governor. -# Intel processor with intel_pstate driver: -# performance, powersave(*). -# Intel processor with intel_cpufreq driver (aka intel_pstate passive mode): -# conservative, ondemand, userspace, powersave, performance, schedutil(*). -# Intel and other processor brands with acpi-cpufreq driver: -# conservative, ondemand(*), userspace, powersave, performance, schedutil(*). -# Use tlp-stat -p to show the active driver and available governors. -# Important: -# Governors marked (*) above are power efficient for *almost all* workloads -# and therefore kernel and most distributions have chosen them as defaults. -# You should have done your research about advantages/disadvantages *before* -# changing the governor. -# Default: - -CPU_SCALING_GOVERNOR_ON_AC=performance -CPU_SCALING_GOVERNOR_ON_BAT=powersave - -# Set Intel CPU energy/performance policies HWP.EPP and EPB: -# performance, balance_performance, default, balance_power, power. -# Values are given in order of increasing power saving. -# Notes: -# - HWP.EPP: requires kernel 4.10, intel_pstate scaling driver and Intel Core i -# 6th gen. or newer CPU -# - EPB: requires kernel 5.2 or module msr and x86_energy_perf_policy from -# linux-tools, intel_pstate or intel_cpufreq scaling driver and Intel Core i -# 2nd gen. or newer CPU -# - When HWP.EPP is available, EPB is not set -# Default: balance_performance (AC), balance_power (BAT) - -CPU_ENERGY_PERF_POLICY_ON_AC=performance -CPU_ENERGY_PERF_POLICY_ON_BAT=power - -# Set Intel CPU P-state performance: 0..100 (%). -# Limit the max/min P-state to control the power dissipation of the CPU. -# Values are stated as a percentage of the available performance. -# Requires intel_pstate or intel_cpufreq driver and Intel Core i 2nd gen. or -# newer CPU. -# Default: - -CPU_MIN_PERF_ON_AC=0 -CPU_MAX_PERF_ON_AC=100 -CPU_MIN_PERF_ON_BAT=0 -CPU_MAX_PERF_ON_BAT=30 - -# Set the CPU "turbo boost" (Intel) or "turbo core" (AMD) feature: -# 0=disable, 1=allow. -# Note: a value of 1 does *not* activate boosting, it just allows it. -# Default: - -CPU_BOOST_ON_AC=1 -CPU_BOOST_ON_BAT=0 - -# Set the Intel CPU HWP dynamic boost feature: -# 0=disable, 1=enable. -# Requires intel_pstate scaling driver in 'active' mode and Intel Core i -# 6th gen. or newer CPU. -# Default: - -CPU_HWP_DYN_BOOST_ON_AC=1 -CPU_HWP_DYN_BOOST_ON_BAT=0 - -# Select platform profile: -# performance, balanced, low-power. -# Controls system operating characteristics around power/performance levels, -# thermal and fan speed. Values are given in order of increasing power saving. -# Note: check the output of tlp-stat -p to determine availability on your -# hardware and additional profiles such as: balanced-performance, quiet, cool. -# Default: - -PLATFORM_PROFILE_ON_AC=performance -PLATFORM_PROFILE_ON_BAT=low-power - -# Set the min/max/turbo frequency for the Intel GPU. -# Possible values depend on your hardware. For available frequencies see -# the output of tlp-stat -g. -# Default: - -INTEL_GPU_MIN_FREQ_ON_AC=100 -INTEL_GPU_MIN_FREQ_ON_BAT=100 -INTEL_GPU_MAX_FREQ_ON_AC=1300 -INTEL_GPU_MAX_FREQ_ON_BAT=800 -INTEL_GPU_BOOST_FREQ_ON_AC=1300 -INTEL_GPU_BOOST_FREQ_ON_BAT=1100 - -# Wi-Fi power saving mode: on=enable, off=disable. -# Default: off (AC), on (BAT) - -#WIFI_PWR_ON_AC=off -WIFI_PWR_ON_BAT=off - -# PCIe Active State Power Management (ASPM): -# default(*), performance, powersave, powersupersave. -# (*) keeps BIOS ASPM defaults (recommended) -# Default: - -#PCIE_ASPM_ON_AC=default -PCIE_ASPM_ON_BAT=powersupersave - -# Exclude PCIe devices assigned to the listed drivers from Runtime PM. -# Note: this preserves the kernel driver default, to force a certain state -# use RUNTIME_PM_ENABLE/DISABLE instead. -# Separate multiple drivers with spaces. -# Default: "mei_me nouveau radeon", use "" to disable completely. - -RUNTIME_PM_DRIVER_DENYLIST="" - diff --git a/files/files/usr/share/pipewire/pipewire.conf.d/max-quantum.conf b/files/files/usr/share/pipewire/pipewire.conf.d/max-quantum.conf deleted file mode 100644 index 7ffdda5..0000000 --- a/files/files/usr/share/pipewire/pipewire.conf.d/max-quantum.conf +++ /dev/null @@ -1,3 +0,0 @@ -context.properties = { - default.clock.max-quantum = 1024 -} diff --git a/files/files/usr/share/ublue-os/just/custom.just b/files/files/usr/share/ublue-os/just/custom.just deleted file mode 100644 index 416528d..0000000 --- a/files/files/usr/share/ublue-os/just/custom.just +++ /dev/null @@ -1,17 +0,0 @@ -!include /usr/share/ublue-os/just/bling.just - -# Install all flatpaks defined in recipe.yml -setup-flatpaks: - #!/usr/bin/env bash - echo 'Installing flatpaks from the ublue recipe ...' - flatpaks=$(yq -- '.firstboot.flatpaks[]' "/usr/share/ublue-os/recipe.yml") - for pkg in $flatpaks; do \ - echo "Installing: ${pkg}" && \ - flatpak install --user --noninteractive flathub $pkg; \ - done - -# Include some of your custom scripts here! - -# Add boot parameters needed for a Framework 13 laptop -framework-13: - rpm-ostree kargs --append="module_blacklist=hid_sensor_hub" --append="nvme.noacpi=1" --append="tpm_tis.interrupts=0" \ No newline at end of file diff --git a/recipes/common/common.yml b/recipes/common/common.yml new file mode 100644 index 0000000..000a31d --- /dev/null +++ b/recipes/common/common.yml @@ -0,0 +1,2 @@ +modules: + - type: signing diff --git a/recipes/modules/dev-packages.yml b/recipes/common/dev-packages.yml similarity index 93% rename from recipes/modules/dev-packages.yml rename to recipes/common/dev-packages.yml index 5c61670..e832b6b 100644 --- a/recipes/modules/dev-packages.yml +++ b/recipes/common/dev-packages.yml @@ -1,5 +1,5 @@ modules: - - from-file: modules/docker-engine.yml + - from-file: common/docker-engine.yml - type: script scripts: - setup-kubectl.sh diff --git a/recipes/modules/docker-engine.yml b/recipes/common/docker-engine.yml similarity index 100% rename from recipes/modules/docker-engine.yml rename to recipes/common/docker-engine.yml diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml new file mode 100644 index 0000000..b9fdc4f --- /dev/null +++ b/recipes/common/gaming.yml @@ -0,0 +1,6 @@ +modules: + - type: files + files: + - steam-firewall: /usr + - type: r2modman + version: 3.1.48 diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml new file mode 100644 index 0000000..d620686 --- /dev/null +++ b/recipes/common/jp-common.yml @@ -0,0 +1,12 @@ +modules: + - from-file: common/common.yml + - from-file: common/pipewire-tweaks.yml + - from-file: common/jp-packages.yml + - from-file: common/gaming.yml + - from-file: common/dev-packages.yml + - type: files + files: + - distrobox: /usr + - type: fonts + nerdfont: + - JetBrainsMono diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml new file mode 100644 index 0000000..53fe508 --- /dev/null +++ b/recipes/common/jp-desktop.yml @@ -0,0 +1,5 @@ +modules: + - type: files + files: + - desktop-audio: /usr + - from-file: common/jp-common.yml diff --git a/recipes/common/jp-laptop.yml b/recipes/common/jp-laptop.yml new file mode 100644 index 0000000..2f2f875 --- /dev/null +++ b/recipes/common/jp-laptop.yml @@ -0,0 +1,6 @@ +modules: + - type: rpm-ostree + install: + - fprintd + - fprintd-pam + - from-file: common/jp-common.yml diff --git a/recipes/modules/jp-packages.yml b/recipes/common/jp-packages.yml similarity index 79% rename from recipes/modules/jp-packages.yml rename to recipes/common/jp-packages.yml index c512fe7..5bf9fec 100644 --- a/recipes/modules/jp-packages.yml +++ b/recipes/common/jp-packages.yml @@ -4,7 +4,7 @@ modules: - install-syncthing.sh - type: rpm-ostree repos: - - https://pkgs.tailscale.com/stable/fedora/%OS_VERSION%/tailscale.repo + - https://pkgs.tailscale.com/stable/fedora/tailscale.repo install: - libadwaita - cronie @@ -17,4 +17,3 @@ modules: - strawberry - xclip - bat - diff --git a/recipes/common/pipewire-tweaks.yml b/recipes/common/pipewire-tweaks.yml new file mode 100644 index 0000000..d2b2063 --- /dev/null +++ b/recipes/common/pipewire-tweaks.yml @@ -0,0 +1,3 @@ +type: files +files: +- pipewire-tweaks: /usr diff --git a/recipes/modules/remove-firefox.yml b/recipes/common/remove-firefox.yml similarity index 100% rename from recipes/modules/remove-firefox.yml rename to recipes/common/remove-firefox.yml diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml index 5564671..bb1baf7 100644 --- a/recipes/cp-laptop.yml +++ b/recipes/cp-laptop.yml @@ -6,7 +6,6 @@ modules: - type: files files: - usr: /usr - - from-file: modules/framework.yml - type: rpm-ostree install: - libadwaita diff --git a/recipes/jp-desktop-40.yml b/recipes/jp-desktop-40.yml index a5eeec3..8ad7323 100644 --- a/recipes/jp-desktop-40.yml +++ b/recipes/jp-desktop-40.yml @@ -3,11 +3,4 @@ base-image: ghcr.io/ublue-os/bazzite-nvidia image-version: latest description: The image of Wunker OS for JP's desktop gaming. modules: - - type: signing - - type: files - files: - - steam-firewall: /usr - - desktop-audio: /usr - - from-file: modules/jp-apps.yml - - from-file: modules/gaming.yml - - from-file: modules/dev-packages.yml + - from-file: common/jp-desktop.yml diff --git a/recipes/jp-desktop.yml b/recipes/jp-desktop.yml index 26b287b..b81dbff 100644 --- a/recipes/jp-desktop.yml +++ b/recipes/jp-desktop.yml @@ -3,11 +3,4 @@ base-image: ghcr.io/ublue-os/bazzite-nvidia image-version: 39 description: The image of Wunker OS for JP's desktop gaming. modules: - - type: signing - - type: files - files: - - steam-firewall: /usr - - desktop-audio: /usr - - from-file: modules/jp-apps.yml - - from-file: modules/gaming.yml - - from-file: modules/dev-packages.yml + - from-file: common/jp-desktop.yml diff --git a/recipes/jp-laptop-40.yml b/recipes/jp-laptop-40.yml index 9a7b052..2d309cb 100644 --- a/recipes/jp-laptop-40.yml +++ b/recipes/jp-laptop-40.yml @@ -3,11 +3,4 @@ base-image: ghcr.io/ublue-os/bazzite image-version: latest description: The image of Wunker OS for JP's Laptop. modules: - - type: signing - - from-file: modules/jp-apps.yml - - type: rpm-ostree - install: - - fprintd - - fprintd-pam - - from-file: modules/gaming.yml - - from-file: modules/dev-packages.yml + - from-file: common/jp-laptop.yml diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml index a9180cd..07fb162 100644 --- a/recipes/jp-laptop.yml +++ b/recipes/jp-laptop.yml @@ -3,11 +3,4 @@ base-image: ghcr.io/ublue-os/bazzite image-version: 39 description: The image of Wunker OS for JP's Laptop. modules: - - type: signing - - from-file: modules/jp-apps.yml - - type: rpm-ostree - install: - - fprintd - - fprintd-pam - - from-file: modules/gaming.yml - - from-file: modules/dev-packages.yml + - from-file: common/jp-laptop.yml diff --git a/recipes/modules/framework.yml b/recipes/modules/framework.yml deleted file mode 100644 index 68eed8a..0000000 --- a/recipes/modules/framework.yml +++ /dev/null @@ -1,10 +0,0 @@ -modules: - - type: files - files: - - framework-13: /usr - - type: rpm-ostree - install: - - fprintd - - fprintd-pam - - tlp - - powertop diff --git a/recipes/modules/gaming.yml b/recipes/modules/gaming.yml deleted file mode 100644 index f1d05bc..0000000 --- a/recipes/modules/gaming.yml +++ /dev/null @@ -1,3 +0,0 @@ -modules: - - type: r2modman - version: 3.1.48 diff --git a/recipes/modules/jp-apps.yml b/recipes/modules/jp-apps.yml deleted file mode 100644 index 86e5086..0000000 --- a/recipes/modules/jp-apps.yml +++ /dev/null @@ -1,9 +0,0 @@ -modules: - - type: files - files: - - usr: /usr - - distrobox: /usr - - from-file: modules/jp-packages.yml - - type: fonts - nerdfont: - - JetBrainsMono