vladan/workstation-ostree-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

f35 full tree

Browse source
This commit is contained in:
Vladan Popovic 2022-05-11 23:12:32 +02:00
parent 74d1b0827e
commit 7208e3cbac
29 changed files with 561 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -1,12 +1,3 @@
Vladan's X1 Carbon Gen 7 Sway Desktop config
============================================
This is an [rpm-ostree](https://coreos.github.io/rpm-ostree/) based minimal
[Fedora](https://getfedora.org/) developer desktop with the [sway window manager](https://swaywm.org/) and [podman](https://podman.io/)/[toolbox](https://docs.fedoraproject.org/en-US/fedora-silverblue/toolbox/) for doing development and running less common graphical applications.
Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config)
=============================================
For some background, see: For some background, see:
- https://fedoraproject.org/wiki/Workstation/AtomicWorkstation - https://fedoraproject.org/wiki/Workstation/AtomicWorkstation

10
better-fonts.repo Normal file
View file

@ -0,0 +1,10 @@
[copr:copr.fedorainfracloud.org:dawid:better_fonts]
name=Copr repo for better_fonts owned by dawid
baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-34-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1

4
compose.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
CACHE=/var/cache/ostree CACHE=/var/cache/x1-gen7-sway-ostree
REPO=/var/tmp/repo REPO=/srv/ostree/repo
mkdir -p $CACHE mkdir -p $CACHE

12
comps-sync-exclude-list.yml
View file

@ -94,6 +94,7 @@ exclude_list:
- evolution - evolution
- evolution-ews - evolution-ews
- evolution-help - evolution-help
- mediawriter
# This is ancient now, and IMO has been superceded by cgroups # This is ancient now, and IMO has been superceded by cgroups
# Also it breaks with --unified-core. # Also it breaks with --unified-core.
- psacct - psacct
@ -146,6 +147,7 @@ desktop_exclude_list:
- gnome-calendar - gnome-calendar
- gnome-characters - gnome-characters
- gnome-clocks - gnome-clocks
- gnome-connections
- gnome-contacts - gnome-contacts
- gnome-documents - gnome-documents
- gnome-font-viewer - gnome-font-viewer
@ -170,6 +172,7 @@ desktop_exclude_list:
- abrt-desktop - abrt-desktop
- cups-pk-helper - cups-pk-helper
- dnfdragora - dnfdragora
- plasma-pk-updates
# Non-critical apps -> Flatpak # Non-critical apps -> Flatpak
- akregator - akregator
- cagibi - cagibi
@ -180,7 +183,6 @@ desktop_exclude_list:
- kcalc - kcalc
- kcharselect - kcharselect
- kcolorchooser - kcolorchooser
- kde-partitionmanager
- kdnssd - kdnssd
- kf5-kipi-plugins - kf5-kipi-plugins
- kfind - kfind
@ -197,18 +199,14 @@ desktop_exclude_list:
- kwrite - kwrite
- libreoffice-kde - libreoffice-kde
- okular - okular
- spectacle
# Misc # Misc
- adwaita-gtk2-theme - adwaita-gtk2-theme
- colord-kde - colord-kde
- keditbookmarks - keditbookmarks
- kwebkitpart - kwebkitpart
- plasma-nm-l2tp - plasma-nm-l2tp
- plasma-nm-openconnect
- plasma-nm-openswan - plasma-nm-openswan
- plasma-nm-openvpn
- plasma-nm-pptp - plasma-nm-pptp
- plasma-nm-vpnc
xfce-desktop: xfce-desktop:
# Incompatible with ostree for various reasons # Incompatible with ostree for various reasons
- abrt-desktop - abrt-desktop
@ -265,5 +263,5 @@ desktop_exclude_list:
- NetworkManager-strongswan-gnome - NetworkManager-strongswan-gnome
- NetworkManager-team - NetworkManager-team
- NetworkManager-wifi - NetworkManager-wifi
# Use Silverblue release package for now # Already in the common set
- fedora-release-matecompiz - wireplumber

2
comps-sync.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
# Usage: ./comps-sync.py /path/to/comps-f34.xml.in # Usage: ./comps-sync.py /path/to/comps-f35.xml.in
# #
# Can both remove packages from the manifest # Can both remove packages from the manifest
# which are not mentioned in comps, and add packages from # which are not mentioned in comps, and add packages from

4
config/environment.d/wayland.conf Normal file
View file

@ -0,0 +1,4 @@
XDG_SESSION_TYPE=wayland
XDG_CURRENT_DESKTOP=sway
MOZ_ENABLE_WAYLAND=1
SDL_VIDEODRIVER=wayland

6
config/greetd/config.toml Normal file
View file

@ -0,0 +1,6 @@
[terminal]
vt = 1
[default_session]
command = "cage -s -- gtkgreet"
user = "greeter"

2
config/greetd/environments Normal file
View file

@ -0,0 +1,2 @@
sway
bash

13
fedora-34-updates.repo
View file

@ -1,13 +0,0 @@
[fedora-34-updates]
name=Fedora 34 $basearch Updates
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34&arch=$basearch
enabled=0
gpgcheck=1
metadata_expire=1d
[fedora-34-updates-testing]
name=Fedora 34 $basearch Updates
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f34&arch=$basearch
enabled=0
gpgcheck=1
metadata_expire=1d

6
fedora-35-updates.repo Normal file
View file

@ -0,0 +1,6 @@
[fedora-35-updates]
name=Fedora 35 $basearch Updates
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f35&arch=$basearch
enabled=0
gpgcheck=1
metadata_expire=1d

6
fedora-34.repo → fedora-35.repo
View file

@ -1,6 +1,6 @@
[fedora-34] [fedora-35]
name=Fedora 34 $basearch name=Fedora 35 $basearch
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
enabled=0 enabled=0
gpgcheck=1 gpgcheck=1
metadata_expire=1d metadata_expire=1d

9
fedora-base.yaml
View file

@ -1,10 +1,13 @@
include: fedora-common-ostree.yaml include: fedora-common-ostree.yaml
ref: fedora/34/${basearch}/base ref: fedora/35/${basearch}/base
rojig: rojig:
name: fedora-base name: fedora-base
summary: "Fedora base image for alternative DE" summary: "Fedora base image for alternative DE"
license: MIT license: MIT
packages: packages:
# Generic release package for desktop variants
- fedora-release
- fedora-release-ostree-desktop
# XWayland support # XWayland support
- xorg-x11-server-Xwayland - xorg-x11-server-Xwayland
# Portals for Flatpak # Portals for Flatpak
@ -12,5 +15,5 @@ packages:
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

15
fedora-common-ostree-pkgs.yaml
View file

@ -5,7 +5,6 @@ packages:
- NetworkManager-config-connectivity-fedora - NetworkManager-config-connectivity-fedora
- NetworkManager-wifi - NetworkManager-wifi
- NetworkManager-wwan - NetworkManager-wwan
- aajohan-comfortaa-fonts
- abattis-cantarell-fonts - abattis-cantarell-fonts
- acl - acl
- adwaita-qt5 - adwaita-qt5
@ -36,6 +35,7 @@ packages:
- cups-filters - cups-filters
- curl - curl
- cyrus-sasl-plain - cyrus-sasl-plain
- default-editor
- dejavu-sans-fonts - dejavu-sans-fonts
- dejavu-sans-mono-fonts - dejavu-sans-mono-fonts
- dejavu-serif-fonts - dejavu-serif-fonts
@ -52,8 +52,6 @@ packages:
- filesystem - filesystem
- firefox - firefox
- firewalld - firewalld
- foomatic
- foomatic-db-ppds
- fpaste - fpaste
- fros-gnome - fros-gnome
- gamemode - gamemode
@ -81,7 +79,7 @@ packages:
- ibus-m17n - ibus-m17n
- ibus-typing-booster - ibus-typing-booster
- iproute - iproute
- iptables - iptables-nft
- iptstate - iptstate
- iputils - iputils
- ipw2100-firmware - ipw2100-firmware
@ -102,8 +100,8 @@ packages:
- iwl6000g2b-firmware - iwl6000g2b-firmware
- iwl6050-firmware - iwl6050-firmware
- iwl7260-firmware - iwl7260-firmware
- iwlax2xx-firmware
- jomolhari-fonts - jomolhari-fonts
- julietaula-montserrat-fonts
- kbd - kbd
- kernel - kernel
- kernel-modules-extra - kernel-modules-extra
@ -136,8 +134,6 @@ packages:
- mlocate - mlocate
- mpage - mpage
- mtr - mtr
- nano
- nano-default-editor
- nfs-utils - nfs-utils
- nss-altfiles - nss-altfiles
- nss-mdns - nss-mdns
@ -163,7 +159,6 @@ packages:
- policycoreutils-python-utils - policycoreutils-python-utils
- procps-ng - procps-ng
- psmisc - psmisc
- pt-sans-fonts
- qemu-guest-agent - qemu-guest-agent
- qt5-qtbase - qt5-qtbase
- qt5-qtbase-gui - qt5-qtbase-gui
@ -193,6 +188,7 @@ packages:
- system-config-printer-udev - system-config-printer-udev
- systemd - systemd
- systemd-oomd-defaults - systemd-oomd-defaults
- systemd-resolved
- systemd-udev - systemd-udev
- tar - tar
- thai-scalable-waree-fonts - thai-scalable-waree-fonts
@ -206,7 +202,9 @@ packages:
- vim-minimal - vim-minimal
- wget - wget
- which - which
- wireplumber
- words - words
- wpa_supplicant
- xorg-x11-drv-amdgpu - xorg-x11-drv-amdgpu
- xorg-x11-drv-ati - xorg-x11-drv-ati
- xorg-x11-drv-evdev - xorg-x11-drv-evdev
@ -216,7 +214,6 @@ packages:
- xorg-x11-drv-qxl - xorg-x11-drv-qxl
- xorg-x11-drv-wacom - xorg-x11-drv-wacom
- xorg-x11-server-Xorg - xorg-x11-server-Xorg
- xorg-x11-utils
- xorg-x11-xauth - xorg-x11-xauth
- xorg-x11-xinit - xorg-x11-xinit
- zd1211-firmware - zd1211-firmware

49
fedora-common-ostree.yaml
View file

@ -1,11 +1,13 @@
ref: fedora/34/${basearch}/ostree-base ref: fedora/rawhide/${basearch}/ostree-base
automatic_version_prefix: "34" automatic_version_prefix: "35"
mutate-os-release: "34" mutate-os-release: "35"
include: fedora-common-ostree-pkgs.yaml
packages: packages:
- fedora-release-silverblue
- git-core - git-core
- lvm2
- rpm-ostree - rpm-ostree
# Container management # Container management
- buildah - buildah
@ -15,6 +17,21 @@ packages:
# Flatpak support # Flatpak support
- flatpak - flatpak
- xdg-desktop-portal - xdg-desktop-portal
# HFS filesystem tools for Apple hardware
# See https://github.com/projectatomic/rpm-ostree/issues/1380
- hfsplus-tools
# Bundle the minimal -devel packages needed to build a kernel.
# This is needed because we can't rely on layering to install these
# due to version conflicts with the base image.
- glibc-devel
- kernel-devel
- elfutils-libelf-devel
# Contains default ostree remote config to be used on client's
# system for fetching ostree update
- fedora-repos-ostree
# the archive repo for more reliable package layering
# https://github.com/coreos/fedora-coreos-tracker/issues/400
- fedora-repos-archive
selinux: true selinux: true
documentation: true documentation: true
@ -23,17 +40,18 @@ etc-group-members:
- wheel - wheel
tmp-is-dir: true tmp-is-dir: true
# We can drop this when it's the rpm-ostree default
rpmdb: sqlite
postprocess-script: post.sh postprocess-script: post.sh
ignore-removed-users: ignore-removed-users:
- root - root
ignore-removed-groups: ignore-removed-groups:
- root - root
check-passwd: { type: file, filename: passwd } check-passwd:
check-groups: { type: file, filename: group } type: file
filename: passwd
check-groups:
type: file
filename: group
default_target: graphical.target default_target: graphical.target
@ -53,14 +71,23 @@ packages-ppc64le:
- grub2 - grub2
- ostree-grub2 - ostree-grub2
packages-x86_64: packages-x86_64:
- grub2 - grub2-efi-ia32
- grub2-efi-x64 - grub2-efi-x64
- grub2-pc
- ostree-grub2 - ostree-grub2
- efibootmgr - efibootmgr
- shim - shim-ia32
- shim-x64
- microcode_ctl - microcode_ctl
- mcelog - mcelog
- thermald - thermald
- hyperv-daemons
- open-vm-tools-desktop
- virtualbox-guest-additions
- xorg-x11-drv-intel
- xorg-x11-drv-openchrome
- xorg-x11-drv-vesa
- xorg-x11-drv-vmware
# Make sure the following are not pulled in when Recommended by other packages # Make sure the following are not pulled in when Recommended by other packages
exclude-packages: exclude-packages:

9
fedora-deepin.yaml
View file

@ -1,13 +1,16 @@
include: deepin-desktop-pkgs.yaml include: deepin-desktop-pkgs.yaml
ref: fedora/34/${basearch}/deepin ref: fedora/35/${basearch}/deepin
rojig: rojig:
name: fedora-deepin name: fedora-deepin
summary: "Fedora Deepin base image" summary: "Fedora Deepin base image"
license: MIT license: MIT
packages: packages:
# Generic release package for desktop variants
- fedora-release
- fedora-release-ostree-desktop
# GUI to manage updates & Flatpaks # GUI to manage updates & Flatpaks
- gnome-software - gnome-software
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

16
fedora-kinoite.yaml
View file

@ -1,10 +1,11 @@
include: kde-desktop-pkgs.yaml include: kde-desktop-pkgs.yaml
ref: fedora/34/${basearch}/kinoite ref: fedora/35/${basearch}/kinoite
rojig: rojig:
name: fedora-kde name: fedora-kde
summary: "Fedora Kinoite (KDE) base image" summary: "Fedora Kinoite (KDE) base image"
license: MIT license: MIT
packages: packages:
- fedora-release-kinoite
# Wayland support # Wayland support
- kwayland-integration - kwayland-integration
- kwin-wayland - kwin-wayland
@ -14,12 +15,21 @@ packages:
- xdg-desktop-portal-kde - xdg-desktop-portal-kde
# Provide an archive manager by default # Provide an archive manager by default
- ark - ark
# Keep some basic apps installed until we have Flatpaks available
# See https://pagure.io/fedora-kde/SIG/issue/13
- gwenview
- kcalc
- kwrite
- okular
# Make sure the following are not pulled in when Recommended by other packages # Make sure the following are not pulled in when Recommended by other packages
exclude-packages: exclude-packages:
- plasma-discover-offline-updates - plasma-discover-offline-updates
- plasma-discover-packagekit - plasma-discover-packagekit
# Exclude currently broken support for rpm-ostree in Discover
- plasma-discover-rpm-ostree
- plasma-pk-updates
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

9
fedora-lxqt.yaml
View file

@ -1,14 +1,17 @@
include: lxqt-desktop-pkgs.yaml include: lxqt-desktop-pkgs.yaml
ref: fedora/34/${basearch}/lxqt ref: fedora/35/${basearch}/lxqt
rojig: rojig:
name: fedora-lxqt name: fedora-lxqt
summary: "Fedora LXQt base image" summary: "Fedora LXQt base image"
license: MIT license: MIT
packages: packages:
# Generic release package for desktop variants
- fedora-release
- fedora-release-ostree-desktop
- libqtxdg - libqtxdg
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal-kde - xdg-desktop-portal-kde
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

9
fedora-mate.yaml
View file

@ -1,11 +1,12 @@
include: mate-desktop-pkgs.yaml include: mate-desktop-pkgs.yaml
ref: fedora/34/${basearch}/mate ref: fedora/35/${basearch}/mate
rojig: rojig:
name: fedora-mate name: fedora-mate
summary: "Fedora Mate base image" summary: "Fedora Mate base image"
license: MIT license: MIT
packages: packages:
# Generic release sub package for desktop variants
- fedora-release-ostree-desktop
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
@ -13,5 +14,5 @@ exclude-packages:
- python3-unbound - python3-unbound
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

9
fedora-pantheon.yaml
View file

@ -1,11 +1,14 @@
include: pantheon-desktop-pkgs.yaml include: pantheon-desktop-pkgs.yaml
ref: fedora/34/${basearch}/pantheon ref: fedora/35/${basearch}/pantheon
rojig: rojig:
name: fedora-pantheon name: fedora-pantheon
summary: "Fedora Pantheon base image" summary: "Fedora Pantheon base image"
license: MIT license: MIT
packages: packages:
# Generic release package for desktop variants
- fedora-release
- fedora-release-ostree-desktop
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

10
fedora-silverblue.yaml
View file

@ -1,10 +1,11 @@
include: gnome-desktop-pkgs.yaml include: gnome-desktop-pkgs.yaml
ref: fedora/34/${basearch}/silverblue ref: fedora/35/${basearch}/silverblue
rojig: rojig:
name: fedora-silverblue name: fedora-silverblue
summary: "Fedora Silverblue base image" summary: "Fedora Silverblue base image"
license: MIT license: MIT
packages: packages:
- fedora-release-silverblue
- desktop-backgrounds-gnome - desktop-backgrounds-gnome
- gnome-shell-extension-background-logo - gnome-shell-extension-background-logo
- pinentry-gnome3 - pinentry-gnome3
@ -14,10 +15,13 @@ packages:
# Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus
# https://github.com/fedora-silverblue/issue-tracker/issues/98 # https://github.com/fedora-silverblue/issue-tracker/issues/98
- evince-thumbnailer - evince-thumbnailer
# Include evince-previewer otherwise print previews are broken in Evince
# https://github.com/fedora-silverblue/issue-tracker/issues/122
- evince-previewer
# Include totem-video-thumbnailer for video thumbnailing in Nautilus # Include totem-video-thumbnailer for video thumbnailing in Nautilus
# https://pagure.io/fedora-workstation/issue/168 # https://pagure.io/fedora-workstation/issue/168
- totem-video-thumbnailer - totem-video-thumbnailer
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

9
fedora-xfce.yaml
View file

@ -1,12 +1,15 @@
include: xfce-desktop-pkgs.yaml include: xfce-desktop-pkgs.yaml
ref: fedora/34/${basearch}/xfce ref: fedora/35/${basearch}/xfce
rojig: rojig:
name: fedora-xfce name: fedora-xfce
summary: "Fedora XFCE base image" summary: "Fedora XFCE base image"
license: MIT license: MIT
packages: packages:
- fedora-release-xfce
# Generic release sub package for desktop variants
- fedora-release-ostree-desktop
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates

1
gnome-desktop-pkgs.yaml
View file

@ -59,6 +59,7 @@ packages:
- tracker - tracker
- tracker-miners - tracker-miners
- xdg-desktop-portal - xdg-desktop-portal
- xdg-desktop-portal-gnome
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
- xdg-user-dirs-gtk - xdg-user-dirs-gtk
- yelp - yelp

11
greetd-35.repo Normal file
View file

@ -0,0 +1,11 @@
[copr:copr.fedorainfracloud.org:alebastr:sway-extras]
name=Copr repo for sway-extras owned by alebastr
baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-35-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1
module_hotfixes=1

8
kde-desktop-pkgs.yaml
View file

@ -10,6 +10,7 @@ packages:
- gnome-keyring-pam - gnome-keyring-pam
- initial-setup-gui - initial-setup-gui
- kde-gtk-config - kde-gtk-config
- kde-partitionmanager
- kde-print-manager - kde-print-manager
- kde-settings-pulseaudio - kde-settings-pulseaudio
- kdegraphics-thumbnailers - kdegraphics-thumbnailers
@ -37,11 +38,16 @@ packages:
- plasma-desktop-doc - plasma-desktop-doc
- plasma-discover - plasma-discover
- plasma-discover-notifier - plasma-discover-notifier
- plasma-disks
- plasma-drkonqi - plasma-drkonqi
- plasma-nm - plasma-nm
- plasma-nm-openconnect
- plasma-nm-openvpn
- plasma-nm-vpnc
- plasma-pa - plasma-pa
- plasma-systemmonitor - plasma-systemmonitor
- plasma-thunderbolt - plasma-thunderbolt
- plasma-vault
- plasma-workspace - plasma-workspace
- plasma-workspace-geolocation - plasma-workspace-geolocation
- plasma-workspace-xorg - plasma-workspace-xorg
@ -52,4 +58,6 @@ packages:
- sddm - sddm
- sddm-breeze - sddm-breeze
- sddm-kcm - sddm-kcm
- spectacle
- xdg-desktop-portal-gnome
- xorg-x11-drv-libinput - xorg-x11-drv-libinput

9
mate-desktop-pkgs.yaml
View file

@ -23,10 +23,11 @@ packages:
- dconf-editor - dconf-editor
- engrampa - engrampa
- eom - eom
- f34-backgrounds-base - f35-backgrounds-base
- f34-backgrounds-extras-base - f35-backgrounds-extras-base
- f34-backgrounds-extras-mate - f35-backgrounds-extras-mate
- f34-backgrounds-mate - f35-backgrounds-mate
- fedora-release-matecompiz
- firefox - firefox
- firewall-config - firewall-config
- gnome-epub-thumbnailer - gnome-epub-thumbnailer

10
post.sh
View file

@ -6,16 +6,13 @@
set -xeuo pipefail set -xeuo pipefail
# https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977 # https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
# for x in /etc/yum.repos.d/*modular.repo; do for x in /etc/yum.repos.d/*modular.repo; do
# sed -i -e 's,enabled=[01],enabled=0,' ${x} sed -i -e 's,enabled=[01],enabled=0,' ${x}
# done done
ls -al /etc/yum.repos.d/
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
# Also note the create-new-then-rename dance for rofiles-fuse compat # Also note the create-new-then-rename dance for rofiles-fuse compat
if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
echo "Journal missing Storage=persistent"
(cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
mv /etc/systemd.journald.conf{.new,} mv /etc/systemd.journald.conf{.new,}
fi fi
@ -25,7 +22,6 @@ fi
# mid-transaction, which never applies to rpm-ostree. This is structured as a # mid-transaction, which never applies to rpm-ostree. This is structured as a
# loop/glob to avoid hardcoding (or trying to match) the architecture. # loop/glob to avoid hardcoding (or trying to match) the architecture.
for x in /usr/sbin/glibc_post_upgrade.*; do for x in /usr/sbin/glibc_post_upgrade.*; do
echo "Disabling srcipt ${x}"
if test -f ${x}; then if test -f ${x}; then
ln -srf /usr/bin/true ${x} ln -srf /usr/bin/true ${x}
fi fi

33
rpmfusion-free-35.repo Normal file
View file

@ -0,0 +1,33 @@
[rpmfusion-free-35]
name=RPM Fusion for Fedora 35 - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-35&arch=$basearch
enabled=0
metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
[rpmfusion-free-debuginfo-35]
name=RPM Fusion for Fedora 35 - Free - Debug
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/debug/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-35&arch=$basearch
enabled=0
metadata_expire=7d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
[rpmfusion-free-source-35]
name=RPM Fusion for Fedora 35 - Free - Source
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/source/SRPMS/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-35&arch=$basearch
enabled=0
metadata_expire=7d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35

30
rpmfusion-free-updates-35.repo Normal file
View file

@ -0,0 +1,30 @@
[rpmfusion-free-updates-35]
name=RPM Fusion for Fedora 35 - Free - Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-35&arch=$basearch
enabled=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
[rpmfusion-free-updates-debuginfo-35]
name=RPM Fusion for Fedora 35 - Free - Updates Debug
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/debug/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-35&arch=$basearch
enabled=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
[rpmfusion-free-updates-source-35]
name=RPM Fusion for Fedora 35 - Free - Updates Source
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/SRPMS/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-35&arch=$basearch
enabled=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35

402
x1-gen7-sway-desktop.yaml
View file

@ -1,107 +1,147 @@
include: fedora-common-ostree.yaml ref: x1-gen7-sway-desktop-35
ref: x1-gen7-sway-desktop
rojig: rojig:
name: x1-gen7-sway-desktop name: x1-gen7-sway-desktop-35
summary: "Thinkpad X1 Gen 7 Sway Desktop" summary: "Thinkpad X1 Gen 7 Sway Desktop - Fedora 35"
license: MIT license: MIT
automatic_version_prefix: "35"
mutate-os-release: "35"
repos: repos:
- fedora-34 - fedora-35
- fedora-34-updates - fedora-35-updates
- fedora-34-updates-testing - rpmfusion-free-35
- rpmfusion-free - rpmfusion-free-updates-35
- rpmfusion-free-updates - copr:copr.fedorainfracloud.org:dawid:better_fonts
- copr:copr.fedorainfracloud.org:alebastr:sway-extras
selinux: true
documentation: true
boot-location: modules
etc-group-members:
- wheel
tmp-is-dir: true
postprocess-script: post.sh
ignore-removed-users:
- root
ignore-removed-groups:
- root
check-passwd:
type: file
filename: passwd
check-groups:
type: file
filename: group
default_target: graphical.target
packages: packages:
# hardware / drivers - lvm2
- alsa-sof-firmware - rpm-ostree
# Container management
- buildah
- podman
- skopeo
- toolbox
# Flatpak support
- flatpak
- xdg-desktop-portal
- glibc-devel
- kernel-devel
- elfutils-libelf-devel
- fedora-repos-ostree
- fedora-repos-archive
# boot / hardware / drivers
- efibootmgr
- fwupd - fwupd
- iwl6000g2a-firmware - grub2-efi-ia32
- iwl7260-firmware - grub2-efi-x64
- kernel - grub2-pc
- kernel-modules-extra
- libva-intel-driver - libva-intel-driver
- libva-intel-hybrid-driver - libva-intel-hybrid-driver
- opensc - mcelog
- udisks2-lvm2 - microcode_ctl
# basic system - ostree-grub2
- acl - shim-ia32
- attr - shim-x64
- basesystem - thermald
- coreutils - thinkfan
# base system
- biosdevname
- coreutils-common - coreutils-common
- cpio - dbus-daemon
- cryptsetup - device-mapper-multipath
- dnsmasq - nvme-cli
- filesystem - rng-tools
- glibc-langpack-en
- glibc-langpack-mk
- hostname
- kbd
- nss-altfiles
- passwd
- sddm
- selinux-policy-targeted
- sudo
- systemd
- usbutils
- util-linux
# diagnostic / utils # diagnostic / utils
- bind-utils
- htop - htop
- iotop - iotop
- iproute
- lm_sensors - lm_sensors
- lsof - lshw
- mtr
- net-tools - net-tools
- nmap-ncat - nmap-ncat
- pciutils
- powertop - powertop
- wireshark
# alternative modern rust apps # alternative modern rust apps
- bat - bat
- ripgrep - ripgrep
# wifi # networking
- bridge-utils
- dhcpcd
- iwd - iwd
- NetworkManager
- network-manager-applet - network-manager-applet
- wpa_supplicant
# shell tools and development # shell tools and development
- alacritty - alacritty
- bash-completion - autoconf
- bc - automake
- bzip2 - ctags
- emacs - emacs
- gettext-devel
- git - git
- gnupg2 - intltool
- ipython3
- libtool
- make - make
- man-db
- neovim - neovim
- openssh-server
- patchutils - patchutils
- squashfs-tools - squashfs-tools
- strace - strace
- systemd-container - systemd-container
- tree
- unzip
- vim-enhanced - vim-enhanced
- w3m - w3m
- wget
- zip
- zram-generator - zram-generator
# fonts # fonts
- dejavu-sans-fonts - adobe-source-sans-pro-fonts
- dejavu-serif-fonts - bitstream-vera-fonts-all
- dejavu-sans-mono-fonts
- fontawesome-fonts - fontawesome-fonts
- google-noto-emoji-color-fonts - fontawesome-fonts-web
- fontconfig
- fontconfig-font-replacements
- fontconfig-enhanced-defaults
- google-roboto-slab-fonts
- langpacks-core-font-en
- lato-fonts
- open-sans-fonts
- terminus-fonts
- ucs-miscfixed-opentype-fonts
- urw-base35-bookman-fonts
- urw-base35-c059-fonts
- urw-base35-d050000l-fonts
- urw-base35-fonts-common
- urw-base35-fonts
- urw-base35-gothic-fonts
- urw-base35-nimbus-mono-ps-fonts
- urw-base35-nimbus-roman-fonts
- urw-base35-nimbus-sans-fonts
- urw-base35-p052-fonts
- urw-base35-standard-symbols-ps-fonts
- urw-base35-z003-fonts
# audio / video # audio / video
- alsa-plugins-pulseaudio - alsa-plugins-pulseaudio
- ffmpeg - ffmpeg
- gstreamer1-libav - gstreamer1-libav
- gstreamer1-plugins-good
- gstreamer1-plugins-ugly
- gvfs-mtp - gvfs-mtp
- libavdevice - libavdevice
- libva - libva
@ -110,23 +150,28 @@ packages:
- pulseaudio-utils - pulseaudio-utils
- vlc - vlc
# misc # misc
- feh
- okular - okular
- redshift
- xdg-desktop-portal-gtk
# sway / wayland desktop # sway / wayland desktop
- brightnessctl - brightnessctl
- firefox-wayland - cage
- greetd
- greetd-gtkgreet
- grim - grim
- i3status-rs - i3status-rs
- kanshi - kanshi
- mako - mako
- pinentry-qt
- slurp - slurp
- sway - sway
- swayidle - swayidle
- swaylock - swaylock
- waybar - waybar
- wayland-devel
- wdisplays
- wl-clipboard - wl-clipboard
- wofi - wofi
- xdg-desktop-portal-wlr
# virtualization # virtualization
- libguestfs-tools - libguestfs-tools
- libvirt-daemon-config-network - libvirt-daemon-config-network
@ -140,17 +185,234 @@ packages:
- virt-manager - virt-manager
- virt-top - virt-top
- virt-viewer - virt-viewer
# comps-sync
- NetworkManager
- NetworkManager-bluetooth
- NetworkManager-config-connectivity-fedora
- NetworkManager-wifi
- NetworkManager-wwan
- abattis-cantarell-fonts
- acl
# - adwaita-qt5
- alsa-sof-firmware
- alsa-ucm
- alsa-utils
# - atmel-firmware
- attr
- audit
- b43-fwcutter
- b43-openfwwf
- basesystem
- bash
- bash-completion
- bc
- bind-utils
# - bluez-cups
# - btrfs-progs
- bzip2
# - chrony
# - cifs-utils
- colord
- compsize
- coreutils
- cpio
- cryptsetup
# - cups
# - cups-filters
- curl
- cyrus-sasl-plain
# - default-editor
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
- dhcp-client
- dnsmasq
- e2fsprogs
- ethtool
- exfatprogs
# - fedora-bookmarks
# - fedora-chromium-config
- fedora-repos-modular
# - fedora-workstation-backgrounds
- file
- filesystem
- firefox
- firewalld
# - fpaste
# - fros-gnome
# - gamemode
- glibc
- glibc-all-langpacks
- glx-utils
- gnupg2
- google-noto-emoji-color-fonts
# - google-noto-sans-cjk-ttc-fonts
- google-noto-sans-gurmukhi-fonts
- google-noto-sans-sinhala-vf-fonts
- gstreamer1-plugins-bad-free
- gstreamer1-plugins-good
- gstreamer1-plugins-ugly-free
# - gutenprint
# - gutenprint-cups
- hostname
# - hplip
- hunspell
- ibus-anthy
- ibus-gtk3
- ibus-hangul
- ibus-libpinyin
- ibus-libzhuyin
- ibus-m17n
- ibus-typing-booster
- iproute
- iptables-nft
- iptstate
- iputils
- ipw2100-firmware
- ipw2200-firmware
- iwl100-firmware
- iwl1000-firmware
- iwl105-firmware
- iwl135-firmware
- iwl2000-firmware
- iwl2030-firmware
- iwl3160-firmware
- iwl3945-firmware
- iwl4965-firmware
- iwl5000-firmware
- iwl5150-firmware
- iwl6000-firmware
- iwl6000g2a-firmware
- iwl6000g2b-firmware
- iwl6050-firmware
- iwl7260-firmware
- iwlax2xx-firmware
- jomolhari-fonts
- kbd
- kernel
- kernel-modules-extra
- khmer-os-system-fonts
- less
- liberation-mono-fonts
- liberation-sans-fonts
- liberation-serif-fonts
- libertas-sd8686-firmware
- libertas-sd8787-firmware
- libertas-usb8388-firmware
# - libglvnd-gles
- linux-firmware
- logrotate
- lohit-assamese-fonts
- lohit-bengali-fonts
- lohit-devanagari-fonts
- lohit-gujarati-fonts
- lohit-kannada-fonts
- lohit-odia-fonts
- lohit-tamil-fonts
- lohit-telugu-fonts
# - lrzsz
- lsof
- man-db
- man-pages
- mdadm
- mesa-dri-drivers
- mesa-vulkan-drivers
- mlocate
# - mpage
- mtr
- nfs-utils
- nss-altfiles
- nss-mdns
# - ntfs-3g
# - ntfsprogs
- opensc
- openssh-clients
- openssh-server
- paktype-naskh-basic-fonts
- pam_afs_session
# - paps
- passwd
- passwdqc
- pciutils
- pinfo
- pipewire-alsa
- pipewire-gstreamer
- pipewire-pulseaudio
- pipewire-utils
- plymouth
- plymouth-system-theme
- policycoreutils
- policycoreutils-python-utils
- procps-ng
- psmisc
- qemu-guest-agent
- qt5-qtbase
- qt5-qtbase-gui
- qt5-qtdeclarative
- qt5-qtxmlpatterns
- quota
# - realmd
- rootfiles
- rpm
- rsync
# - samba-client
- selinux-policy-targeted
- setup
- shadow-utils
- sil-abyssinica-fonts
- sil-mingzat-fonts
- sil-nuosu-fonts
- sil-padauk-fonts
- smc-meera-fonts
- sos
- spice-vdagent
- sssd
- sssd-common
- sssd-kcm
- stix-fonts
- sudo
# - system-config-printer-udev
- systemd
- systemd-oomd-defaults
- systemd-resolved
- systemd-udev
- tar
- thai-scalable-waree-fonts
- time
- tree
- unzip
- uresourced
- usb_modeswitch
- usbutils
- util-linux
# - vim-minimal
- wget
- which
- wireplumber
- words
- wpa_supplicant
# - zd1211-firmware
- zip
- zram-generator-defaults
# Make sure the following are not pulled in when Recommended by other packages
exclude-packages:
- PackageKit
# We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
- gstreamer1-plugin-openh264
- mozilla-openh264
- openh264
- xdg-desktop-portal-gtk
add-files: add-files:
- ["config/systemd/firefox.service", "/etc/systemd/user/firefox.service"]
- ["config/systemd/mako.service", "/etc/systemd/user/mako.service"] - ["config/systemd/mako.service", "/etc/systemd/user/mako.service"]
- ["config/systemd/nm-applet.service", "/etc/systemd/user/nm-applet.service"] - ["config/systemd/nm-applet.service", "/etc/systemd/user/nm-applet.service"]
- ["config/systemd/swayidle.service", "/etc/systemd/user/swayidle.service"] - ["config/systemd/swayidle.service", "/etc/systemd/user/swayidle.service"]
- ["config/systemd/swaylock.service", "/etc/systemd/user/swaylock.service"] - ["config/systemd/swaylock.service", "/etc/systemd/user/swaylock.service"]
- ["config/systemd/sway.service", "/etc/systemd/user/sway.service"]
- ["config/systemd/sway-session.target", "/etc/systemd/user/sway-session.target"] - ["config/systemd/sway-session.target", "/etc/systemd/user/sway-session.target"]
- ["config/systemd/wayland-session.target", "/etc/systemd/user/wayland-session.target"] - ["config/systemd/wayland-session.target", "/etc/systemd/user/wayland-session.target"]
- ["config/sway-service.desktop", "/usr/share/wayland-sessions/sway-service.desktop"] - ["config/sway-service.desktop", "/usr/share/wayland-sessions/sway-service.desktop"]
- ["config/sway-service.sh", "/usr/bin/sway-service.sh"]
- ["config/modprobe.d/i915.conf", "/etc/modprobe.d/i915.conf"]
- ["config/modprobe.d/i2c_i801-blacklist.conf", "/etc/modprobe.d/i2c_i801-blacklist.conf"] - ["config/modprobe.d/i2c_i801-blacklist.conf", "/etc/modprobe.d/i2c_i801-blacklist.conf"]
- ["config/environment.d/wayland.conf", "/etc/environment.d/wayland.conf"]
- ["config/greetd/config.toml", "/etc/greetd/config.toml"]
- ["config/greetd/environments", "/etc/greetd/environments"]