f35 full tree
This commit is contained in:
parent
74d1b0827e
commit
7208e3cbac
29 changed files with 561 additions and 161 deletions
|
|
@ -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:
|
||||
|
||||
- https://fedoraproject.org/wiki/Workstation/AtomicWorkstation
|
||||
|
|
|
|||
10
better-fonts.repo
Normal file
10
better-fonts.repo
Normal 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
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
CACHE=/var/cache/ostree
|
||||
REPO=/var/tmp/repo
|
||||
CACHE=/var/cache/x1-gen7-sway-ostree
|
||||
REPO=/srv/ostree/repo
|
||||
|
||||
mkdir -p $CACHE
|
||||
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ exclude_list:
|
|||
- evolution
|
||||
- evolution-ews
|
||||
- evolution-help
|
||||
- mediawriter
|
||||
# This is ancient now, and IMO has been superceded by cgroups
|
||||
# Also it breaks with --unified-core.
|
||||
- psacct
|
||||
|
|
@ -146,6 +147,7 @@ desktop_exclude_list:
|
|||
- gnome-calendar
|
||||
- gnome-characters
|
||||
- gnome-clocks
|
||||
- gnome-connections
|
||||
- gnome-contacts
|
||||
- gnome-documents
|
||||
- gnome-font-viewer
|
||||
|
|
@ -170,6 +172,7 @@ desktop_exclude_list:
|
|||
- abrt-desktop
|
||||
- cups-pk-helper
|
||||
- dnfdragora
|
||||
- plasma-pk-updates
|
||||
# Non-critical apps -> Flatpak
|
||||
- akregator
|
||||
- cagibi
|
||||
|
|
@ -180,7 +183,6 @@ desktop_exclude_list:
|
|||
- kcalc
|
||||
- kcharselect
|
||||
- kcolorchooser
|
||||
- kde-partitionmanager
|
||||
- kdnssd
|
||||
- kf5-kipi-plugins
|
||||
- kfind
|
||||
|
|
@ -197,18 +199,14 @@ desktop_exclude_list:
|
|||
- kwrite
|
||||
- libreoffice-kde
|
||||
- okular
|
||||
- spectacle
|
||||
# Misc
|
||||
- adwaita-gtk2-theme
|
||||
- colord-kde
|
||||
- keditbookmarks
|
||||
- kwebkitpart
|
||||
- plasma-nm-l2tp
|
||||
- plasma-nm-openconnect
|
||||
- plasma-nm-openswan
|
||||
- plasma-nm-openvpn
|
||||
- plasma-nm-pptp
|
||||
- plasma-nm-vpnc
|
||||
xfce-desktop:
|
||||
# Incompatible with ostree for various reasons
|
||||
- abrt-desktop
|
||||
|
|
@ -265,5 +263,5 @@ desktop_exclude_list:
|
|||
- NetworkManager-strongswan-gnome
|
||||
- NetworkManager-team
|
||||
- NetworkManager-wifi
|
||||
# Use Silverblue release package for now
|
||||
- fedora-release-matecompiz
|
||||
# Already in the common set
|
||||
- wireplumber
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/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
|
||||
# which are not mentioned in comps, and add packages from
|
||||
|
|
|
|||
4
config/environment.d/wayland.conf
Normal file
4
config/environment.d/wayland.conf
Normal 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
6
config/greetd/config.toml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
[terminal]
|
||||
vt = 1
|
||||
|
||||
[default_session]
|
||||
command = "cage -s -- gtkgreet"
|
||||
user = "greeter"
|
||||
2
config/greetd/environments
Normal file
2
config/greetd/environments
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
sway
|
||||
bash
|
||||
|
|
@ -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
6
fedora-35-updates.repo
Normal 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
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
[fedora-34]
|
||||
name=Fedora 34 $basearch
|
||||
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch
|
||||
[fedora-35]
|
||||
name=Fedora 35 $basearch
|
||||
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
|
||||
enabled=0
|
||||
gpgcheck=1
|
||||
metadata_expire=1d
|
||||
|
|
@ -1,10 +1,13 @@
|
|||
include: fedora-common-ostree.yaml
|
||||
ref: fedora/34/${basearch}/base
|
||||
ref: fedora/35/${basearch}/base
|
||||
rojig:
|
||||
name: fedora-base
|
||||
summary: "Fedora base image for alternative DE"
|
||||
license: MIT
|
||||
packages:
|
||||
# Generic release package for desktop variants
|
||||
- fedora-release
|
||||
- fedora-release-ostree-desktop
|
||||
# XWayland support
|
||||
- xorg-x11-server-Xwayland
|
||||
# Portals for Flatpak
|
||||
|
|
@ -12,5 +15,5 @@ packages:
|
|||
- xdg-desktop-portal-gtk
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ packages:
|
|||
- NetworkManager-config-connectivity-fedora
|
||||
- NetworkManager-wifi
|
||||
- NetworkManager-wwan
|
||||
- aajohan-comfortaa-fonts
|
||||
- abattis-cantarell-fonts
|
||||
- acl
|
||||
- adwaita-qt5
|
||||
|
|
@ -36,6 +35,7 @@ packages:
|
|||
- cups-filters
|
||||
- curl
|
||||
- cyrus-sasl-plain
|
||||
- default-editor
|
||||
- dejavu-sans-fonts
|
||||
- dejavu-sans-mono-fonts
|
||||
- dejavu-serif-fonts
|
||||
|
|
@ -52,8 +52,6 @@ packages:
|
|||
- filesystem
|
||||
- firefox
|
||||
- firewalld
|
||||
- foomatic
|
||||
- foomatic-db-ppds
|
||||
- fpaste
|
||||
- fros-gnome
|
||||
- gamemode
|
||||
|
|
@ -81,7 +79,7 @@ packages:
|
|||
- ibus-m17n
|
||||
- ibus-typing-booster
|
||||
- iproute
|
||||
- iptables
|
||||
- iptables-nft
|
||||
- iptstate
|
||||
- iputils
|
||||
- ipw2100-firmware
|
||||
|
|
@ -102,8 +100,8 @@ packages:
|
|||
- iwl6000g2b-firmware
|
||||
- iwl6050-firmware
|
||||
- iwl7260-firmware
|
||||
- iwlax2xx-firmware
|
||||
- jomolhari-fonts
|
||||
- julietaula-montserrat-fonts
|
||||
- kbd
|
||||
- kernel
|
||||
- kernel-modules-extra
|
||||
|
|
@ -136,8 +134,6 @@ packages:
|
|||
- mlocate
|
||||
- mpage
|
||||
- mtr
|
||||
- nano
|
||||
- nano-default-editor
|
||||
- nfs-utils
|
||||
- nss-altfiles
|
||||
- nss-mdns
|
||||
|
|
@ -163,7 +159,6 @@ packages:
|
|||
- policycoreutils-python-utils
|
||||
- procps-ng
|
||||
- psmisc
|
||||
- pt-sans-fonts
|
||||
- qemu-guest-agent
|
||||
- qt5-qtbase
|
||||
- qt5-qtbase-gui
|
||||
|
|
@ -193,6 +188,7 @@ packages:
|
|||
- system-config-printer-udev
|
||||
- systemd
|
||||
- systemd-oomd-defaults
|
||||
- systemd-resolved
|
||||
- systemd-udev
|
||||
- tar
|
||||
- thai-scalable-waree-fonts
|
||||
|
|
@ -206,7 +202,9 @@ packages:
|
|||
- vim-minimal
|
||||
- wget
|
||||
- which
|
||||
- wireplumber
|
||||
- words
|
||||
- wpa_supplicant
|
||||
- xorg-x11-drv-amdgpu
|
||||
- xorg-x11-drv-ati
|
||||
- xorg-x11-drv-evdev
|
||||
|
|
@ -216,7 +214,6 @@ packages:
|
|||
- xorg-x11-drv-qxl
|
||||
- xorg-x11-drv-wacom
|
||||
- xorg-x11-server-Xorg
|
||||
- xorg-x11-utils
|
||||
- xorg-x11-xauth
|
||||
- xorg-x11-xinit
|
||||
- zd1211-firmware
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
ref: fedora/34/${basearch}/ostree-base
|
||||
ref: fedora/rawhide/${basearch}/ostree-base
|
||||
|
||||
automatic_version_prefix: "34"
|
||||
mutate-os-release: "34"
|
||||
automatic_version_prefix: "35"
|
||||
mutate-os-release: "35"
|
||||
|
||||
include: fedora-common-ostree-pkgs.yaml
|
||||
|
||||
packages:
|
||||
- fedora-release-silverblue
|
||||
- git-core
|
||||
- lvm2
|
||||
- rpm-ostree
|
||||
# Container management
|
||||
- buildah
|
||||
|
|
@ -15,6 +17,21 @@ packages:
|
|||
# Flatpak support
|
||||
- flatpak
|
||||
- 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
|
||||
documentation: true
|
||||
|
|
@ -23,17 +40,18 @@ etc-group-members:
|
|||
- wheel
|
||||
tmp-is-dir: true
|
||||
|
||||
# We can drop this when it's the rpm-ostree default
|
||||
rpmdb: sqlite
|
||||
|
||||
postprocess-script: post.sh
|
||||
|
||||
ignore-removed-users:
|
||||
- root
|
||||
ignore-removed-groups:
|
||||
- root
|
||||
check-passwd: { type: file, filename: passwd }
|
||||
check-groups: { type: file, filename: group }
|
||||
check-passwd:
|
||||
type: file
|
||||
filename: passwd
|
||||
check-groups:
|
||||
type: file
|
||||
filename: group
|
||||
|
||||
default_target: graphical.target
|
||||
|
||||
|
|
@ -53,14 +71,23 @@ packages-ppc64le:
|
|||
- grub2
|
||||
- ostree-grub2
|
||||
packages-x86_64:
|
||||
- grub2
|
||||
- grub2-efi-ia32
|
||||
- grub2-efi-x64
|
||||
- grub2-pc
|
||||
- ostree-grub2
|
||||
- efibootmgr
|
||||
- shim
|
||||
- shim-ia32
|
||||
- shim-x64
|
||||
- microcode_ctl
|
||||
- mcelog
|
||||
- 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
|
||||
exclude-packages:
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
include: deepin-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/deepin
|
||||
ref: fedora/35/${basearch}/deepin
|
||||
rojig:
|
||||
name: fedora-deepin
|
||||
summary: "Fedora Deepin base image"
|
||||
license: MIT
|
||||
packages:
|
||||
# Generic release package for desktop variants
|
||||
- fedora-release
|
||||
- fedora-release-ostree-desktop
|
||||
# GUI to manage updates & Flatpaks
|
||||
- gnome-software
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
include: kde-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/kinoite
|
||||
ref: fedora/35/${basearch}/kinoite
|
||||
rojig:
|
||||
name: fedora-kde
|
||||
summary: "Fedora Kinoite (KDE) base image"
|
||||
license: MIT
|
||||
packages:
|
||||
- fedora-release-kinoite
|
||||
# Wayland support
|
||||
- kwayland-integration
|
||||
- kwin-wayland
|
||||
|
|
@ -14,12 +15,21 @@ packages:
|
|||
- xdg-desktop-portal-kde
|
||||
# Provide an archive manager by default
|
||||
- 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
|
||||
exclude-packages:
|
||||
- plasma-discover-offline-updates
|
||||
- plasma-discover-packagekit
|
||||
# Exclude currently broken support for rpm-ostree in Discover
|
||||
- plasma-discover-rpm-ostree
|
||||
- plasma-pk-updates
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
include: lxqt-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/lxqt
|
||||
ref: fedora/35/${basearch}/lxqt
|
||||
rojig:
|
||||
name: fedora-lxqt
|
||||
summary: "Fedora LXQt base image"
|
||||
license: MIT
|
||||
packages:
|
||||
# Generic release package for desktop variants
|
||||
- fedora-release
|
||||
- fedora-release-ostree-desktop
|
||||
- libqtxdg
|
||||
# Portals for Flatpak
|
||||
- xdg-desktop-portal-kde
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
include: mate-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/mate
|
||||
ref: fedora/35/${basearch}/mate
|
||||
rojig:
|
||||
name: fedora-mate
|
||||
summary: "Fedora Mate base image"
|
||||
license: MIT
|
||||
|
||||
packages:
|
||||
# Generic release sub package for desktop variants
|
||||
- fedora-release-ostree-desktop
|
||||
# Portals for Flatpak
|
||||
- xdg-desktop-portal-gtk
|
||||
|
||||
|
|
@ -13,5 +14,5 @@ exclude-packages:
|
|||
- python3-unbound
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
include: pantheon-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/pantheon
|
||||
ref: fedora/35/${basearch}/pantheon
|
||||
rojig:
|
||||
name: fedora-pantheon
|
||||
summary: "Fedora Pantheon base image"
|
||||
license: MIT
|
||||
packages:
|
||||
# Generic release package for desktop variants
|
||||
- fedora-release
|
||||
- fedora-release-ostree-desktop
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
include: gnome-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/silverblue
|
||||
ref: fedora/35/${basearch}/silverblue
|
||||
rojig:
|
||||
name: fedora-silverblue
|
||||
summary: "Fedora Silverblue base image"
|
||||
license: MIT
|
||||
packages:
|
||||
- fedora-release-silverblue
|
||||
- desktop-backgrounds-gnome
|
||||
- gnome-shell-extension-background-logo
|
||||
- pinentry-gnome3
|
||||
|
|
@ -14,10 +15,13 @@ packages:
|
|||
# Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus
|
||||
# https://github.com/fedora-silverblue/issue-tracker/issues/98
|
||||
- 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
|
||||
# https://pagure.io/fedora-workstation/issue/168
|
||||
- totem-video-thumbnailer
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
include: xfce-desktop-pkgs.yaml
|
||||
ref: fedora/34/${basearch}/xfce
|
||||
ref: fedora/35/${basearch}/xfce
|
||||
rojig:
|
||||
name: fedora-xfce
|
||||
summary: "Fedora XFCE base image"
|
||||
license: MIT
|
||||
packages:
|
||||
- fedora-release-xfce
|
||||
# Generic release sub package for desktop variants
|
||||
- fedora-release-ostree-desktop
|
||||
# Portals for Flatpak
|
||||
- xdg-desktop-portal-gtk
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ packages:
|
|||
- tracker
|
||||
- tracker-miners
|
||||
- xdg-desktop-portal
|
||||
- xdg-desktop-portal-gnome
|
||||
- xdg-desktop-portal-gtk
|
||||
- xdg-user-dirs-gtk
|
||||
- yelp
|
||||
|
|
|
|||
11
greetd-35.repo
Normal file
11
greetd-35.repo
Normal 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
|
||||
|
|
@ -10,6 +10,7 @@ packages:
|
|||
- gnome-keyring-pam
|
||||
- initial-setup-gui
|
||||
- kde-gtk-config
|
||||
- kde-partitionmanager
|
||||
- kde-print-manager
|
||||
- kde-settings-pulseaudio
|
||||
- kdegraphics-thumbnailers
|
||||
|
|
@ -37,11 +38,16 @@ packages:
|
|||
- plasma-desktop-doc
|
||||
- plasma-discover
|
||||
- plasma-discover-notifier
|
||||
- plasma-disks
|
||||
- plasma-drkonqi
|
||||
- plasma-nm
|
||||
- plasma-nm-openconnect
|
||||
- plasma-nm-openvpn
|
||||
- plasma-nm-vpnc
|
||||
- plasma-pa
|
||||
- plasma-systemmonitor
|
||||
- plasma-thunderbolt
|
||||
- plasma-vault
|
||||
- plasma-workspace
|
||||
- plasma-workspace-geolocation
|
||||
- plasma-workspace-xorg
|
||||
|
|
@ -52,4 +58,6 @@ packages:
|
|||
- sddm
|
||||
- sddm-breeze
|
||||
- sddm-kcm
|
||||
- spectacle
|
||||
- xdg-desktop-portal-gnome
|
||||
- xorg-x11-drv-libinput
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@ packages:
|
|||
- dconf-editor
|
||||
- engrampa
|
||||
- eom
|
||||
- f34-backgrounds-base
|
||||
- f34-backgrounds-extras-base
|
||||
- f34-backgrounds-extras-mate
|
||||
- f34-backgrounds-mate
|
||||
- f35-backgrounds-base
|
||||
- f35-backgrounds-extras-base
|
||||
- f35-backgrounds-extras-mate
|
||||
- f35-backgrounds-mate
|
||||
- fedora-release-matecompiz
|
||||
- firefox
|
||||
- firewall-config
|
||||
- gnome-epub-thumbnailer
|
||||
|
|
|
|||
10
post.sh
10
post.sh
|
|
@ -6,16 +6,13 @@
|
|||
set -xeuo pipefail
|
||||
|
||||
# https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
|
||||
# for x in /etc/yum.repos.d/*modular.repo; do
|
||||
# sed -i -e 's,enabled=[01],enabled=0,' ${x}
|
||||
# done
|
||||
|
||||
ls -al /etc/yum.repos.d/
|
||||
for x in /etc/yum.repos.d/*modular.repo; do
|
||||
sed -i -e 's,enabled=[01],enabled=0,' ${x}
|
||||
done
|
||||
|
||||
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
|
||||
# Also note the create-new-then-rename dance for rofiles-fuse compat
|
||||
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
|
||||
mv /etc/systemd.journald.conf{.new,}
|
||||
fi
|
||||
|
|
@ -25,7 +22,6 @@ fi
|
|||
# mid-transaction, which never applies to rpm-ostree. This is structured as a
|
||||
# loop/glob to avoid hardcoding (or trying to match) the architecture.
|
||||
for x in /usr/sbin/glibc_post_upgrade.*; do
|
||||
echo "Disabling srcipt ${x}"
|
||||
if test -f ${x}; then
|
||||
ln -srf /usr/bin/true ${x}
|
||||
fi
|
||||
|
|
|
|||
33
rpmfusion-free-35.repo
Normal file
33
rpmfusion-free-35.repo
Normal 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
30
rpmfusion-free-updates-35.repo
Normal 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
|
||||
|
||||
|
|
@ -1,107 +1,147 @@
|
|||
include: fedora-common-ostree.yaml
|
||||
|
||||
ref: x1-gen7-sway-desktop
|
||||
ref: x1-gen7-sway-desktop-35
|
||||
rojig:
|
||||
name: x1-gen7-sway-desktop
|
||||
summary: "Thinkpad X1 Gen 7 Sway Desktop"
|
||||
name: x1-gen7-sway-desktop-35
|
||||
summary: "Thinkpad X1 Gen 7 Sway Desktop - Fedora 35"
|
||||
license: MIT
|
||||
|
||||
automatic_version_prefix: "35"
|
||||
mutate-os-release: "35"
|
||||
|
||||
repos:
|
||||
- fedora-34
|
||||
- fedora-34-updates
|
||||
- fedora-34-updates-testing
|
||||
- rpmfusion-free
|
||||
- rpmfusion-free-updates
|
||||
- fedora-35
|
||||
- fedora-35-updates
|
||||
- rpmfusion-free-35
|
||||
- rpmfusion-free-updates-35
|
||||
- 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:
|
||||
# hardware / drivers
|
||||
- alsa-sof-firmware
|
||||
- lvm2
|
||||
- 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
|
||||
- iwl6000g2a-firmware
|
||||
- iwl7260-firmware
|
||||
- kernel
|
||||
- kernel-modules-extra
|
||||
- grub2-efi-ia32
|
||||
- grub2-efi-x64
|
||||
- grub2-pc
|
||||
- libva-intel-driver
|
||||
- libva-intel-hybrid-driver
|
||||
- opensc
|
||||
- udisks2-lvm2
|
||||
# basic system
|
||||
- acl
|
||||
- attr
|
||||
- basesystem
|
||||
- coreutils
|
||||
- mcelog
|
||||
- microcode_ctl
|
||||
- ostree-grub2
|
||||
- shim-ia32
|
||||
- shim-x64
|
||||
- thermald
|
||||
- thinkfan
|
||||
# base system
|
||||
- biosdevname
|
||||
- coreutils-common
|
||||
- cpio
|
||||
- cryptsetup
|
||||
- dnsmasq
|
||||
- filesystem
|
||||
- glibc-langpack-en
|
||||
- glibc-langpack-mk
|
||||
- hostname
|
||||
- kbd
|
||||
- nss-altfiles
|
||||
- passwd
|
||||
- sddm
|
||||
- selinux-policy-targeted
|
||||
- sudo
|
||||
- systemd
|
||||
- usbutils
|
||||
- util-linux
|
||||
- dbus-daemon
|
||||
- device-mapper-multipath
|
||||
- nvme-cli
|
||||
- rng-tools
|
||||
# diagnostic / utils
|
||||
- bind-utils
|
||||
- htop
|
||||
- iotop
|
||||
- iproute
|
||||
- lm_sensors
|
||||
- lsof
|
||||
- mtr
|
||||
- lshw
|
||||
- net-tools
|
||||
- nmap-ncat
|
||||
- pciutils
|
||||
- powertop
|
||||
- wireshark
|
||||
# alternative modern rust apps
|
||||
- bat
|
||||
- ripgrep
|
||||
# wifi
|
||||
# networking
|
||||
- bridge-utils
|
||||
- dhcpcd
|
||||
- iwd
|
||||
- NetworkManager
|
||||
- network-manager-applet
|
||||
- wpa_supplicant
|
||||
# shell tools and development
|
||||
- alacritty
|
||||
- bash-completion
|
||||
- bc
|
||||
- bzip2
|
||||
- autoconf
|
||||
- automake
|
||||
- ctags
|
||||
- emacs
|
||||
- gettext-devel
|
||||
- git
|
||||
- gnupg2
|
||||
- intltool
|
||||
- ipython3
|
||||
- libtool
|
||||
- make
|
||||
- man-db
|
||||
- neovim
|
||||
- openssh-server
|
||||
- patchutils
|
||||
- squashfs-tools
|
||||
- strace
|
||||
- systemd-container
|
||||
- tree
|
||||
- unzip
|
||||
- vim-enhanced
|
||||
- w3m
|
||||
- wget
|
||||
- zip
|
||||
- zram-generator
|
||||
# fonts
|
||||
- dejavu-sans-fonts
|
||||
- dejavu-serif-fonts
|
||||
- dejavu-sans-mono-fonts
|
||||
- adobe-source-sans-pro-fonts
|
||||
- bitstream-vera-fonts-all
|
||||
- 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
|
||||
- alsa-plugins-pulseaudio
|
||||
- ffmpeg
|
||||
- gstreamer1-libav
|
||||
- gstreamer1-plugins-good
|
||||
- gstreamer1-plugins-ugly
|
||||
- gvfs-mtp
|
||||
- libavdevice
|
||||
- libva
|
||||
|
|
@ -110,23 +150,28 @@ packages:
|
|||
- pulseaudio-utils
|
||||
- vlc
|
||||
# misc
|
||||
- feh
|
||||
- okular
|
||||
- redshift
|
||||
- xdg-desktop-portal-gtk
|
||||
# sway / wayland desktop
|
||||
- brightnessctl
|
||||
- firefox-wayland
|
||||
- cage
|
||||
- greetd
|
||||
- greetd-gtkgreet
|
||||
- grim
|
||||
- i3status-rs
|
||||
- kanshi
|
||||
- mako
|
||||
- pinentry-qt
|
||||
- slurp
|
||||
- sway
|
||||
- swayidle
|
||||
- swaylock
|
||||
- waybar
|
||||
- wayland-devel
|
||||
- wdisplays
|
||||
- wl-clipboard
|
||||
- wofi
|
||||
- xdg-desktop-portal-wlr
|
||||
# virtualization
|
||||
- libguestfs-tools
|
||||
- libvirt-daemon-config-network
|
||||
|
|
@ -140,17 +185,234 @@ packages:
|
|||
- virt-manager
|
||||
- virt-top
|
||||
- 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:
|
||||
- ["config/systemd/firefox.service", "/etc/systemd/user/firefox.service"]
|
||||
- ["config/systemd/mako.service", "/etc/systemd/user/mako.service"]
|
||||
- ["config/systemd/nm-applet.service", "/etc/systemd/user/nm-applet.service"]
|
||||
- ["config/systemd/swayidle.service", "/etc/systemd/user/swayidle.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/wayland-session.target", "/etc/systemd/user/wayland-session.target"]
|
||||
- ["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/environment.d/wayland.conf", "/etc/environment.d/wayland.conf"]
|
||||
- ["config/greetd/config.toml", "/etc/greetd/config.toml"]
|
||||
- ["config/greetd/environments", "/etc/greetd/environments"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue