From 61ac168bea55cdad53bdc6d638827e3ee791b698 Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vladanovic@gmail.com>
Date: Sun, 14 Aug 2022 23:08:23 +0200
Subject: [PATCH] fedora36 on x13 gen1 ryzen7

---
 better-fonts.repo => better-fonts-36.repo     |   2 +-
 compose.sh                                    |   6 +-
 fedora-35-updates.repo                        |   6 -
 fedora-35.repo                                |   6 -
 greetd-35.repo => greetd-36.repo              |   2 +-
 ...ion-free-35.repo => rpmfusion-free-36.repo |  30 +-
 rpmfusion-free-updates-35.repo                |  30 --
 rpmfusion-free-updates-36.repo                |  30 ++
 rpmfusion.repo                                |  18 -
 x13-gen1-sway-desktop.yaml                    | 360 ++++++++++++++++++
 10 files changed, 410 insertions(+), 80 deletions(-)
 rename better-fonts.repo => better-fonts-36.repo (90%)
 delete mode 100644 fedora-35-updates.repo
 delete mode 100644 fedora-35.repo
 rename greetd-35.repo => greetd-36.repo (90%)
 rename rpmfusion-free-35.repo => rpmfusion-free-36.repo (58%)
 delete mode 100644 rpmfusion-free-updates-35.repo
 create mode 100644 rpmfusion-free-updates-36.repo
 delete mode 100644 rpmfusion.repo
 create mode 100644 x13-gen1-sway-desktop.yaml

diff --git a/better-fonts.repo b/better-fonts-36.repo
similarity index 90%
rename from better-fonts.repo
rename to better-fonts-36.repo
index 48a44c8..d355377 100644
--- a/better-fonts.repo
+++ b/better-fonts-36.repo
@@ -1,6 +1,6 @@
 [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/
+baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-36-$basearch/
 type=rpm-md
 skip_if_unavailable=True
 gpgcheck=1
diff --git a/compose.sh b/compose.sh
index 8038f04..c68628d 100755
--- a/compose.sh
+++ b/compose.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
-CACHE=/var/cache/x1-gen7-sway-ostree
-REPO=/srv/ostree/repo
+CACHE=/var/cache/x13-gen1-sway-ostree
+REPO=/srv/ostree/x13-gen1-sway-repo
 
 mkdir -p $CACHE
 
@@ -9,4 +9,4 @@ if [ ! -d $REPO/objects ]; then
     ostree --repo=$REPO init --mode=archive-z2
 fi
 
-rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml
+rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x13-gen1-sway-desktop.yaml
diff --git a/fedora-35-updates.repo b/fedora-35-updates.repo
deleted file mode 100644
index afcf850..0000000
--- a/fedora-35-updates.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[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
\ No newline at end of file
diff --git a/fedora-35.repo b/fedora-35.repo
deleted file mode 100644
index 07213ca..0000000
--- a/fedora-35.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[fedora-35]
-name=Fedora 35 $basearch
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
-enabled=0
-gpgcheck=1
-metadata_expire=1d
diff --git a/greetd-35.repo b/greetd-36.repo
similarity index 90%
rename from greetd-35.repo
rename to greetd-36.repo
index f78ff45..2152ba6 100644
--- a/greetd-35.repo
+++ b/greetd-36.repo
@@ -1,6 +1,6 @@
 [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/
+baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-36-$basearch/
 type=rpm-md
 skip_if_unavailable=True
 gpgcheck=1
diff --git a/rpmfusion-free-35.repo b/rpmfusion-free-36.repo
similarity index 58%
rename from rpmfusion-free-35.repo
rename to rpmfusion-free-36.repo
index a1fb520..73c8297 100644
--- a/rpmfusion-free-35.repo
+++ b/rpmfusion-free-36.repo
@@ -1,33 +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
+[rpmfusion-free-36]
+name=RPM Fusion for Fedora 36 - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-36&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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
 
-[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
+[rpmfusion-free-debuginfo-36]
+name=RPM Fusion for Fedora 36 - Free - Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-36&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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
 
-[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
+[rpmfusion-free-source-36]
+name=RPM Fusion for Fedora 36 - Free - Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-36&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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
 
diff --git a/rpmfusion-free-updates-35.repo b/rpmfusion-free-updates-35.repo
deleted file mode 100644
index f7553a1..0000000
--- a/rpmfusion-free-updates-35.repo
+++ /dev/null
@@ -1,30 +0,0 @@
-[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
-
diff --git a/rpmfusion-free-updates-36.repo b/rpmfusion-free-updates-36.repo
new file mode 100644
index 0000000..4bb0d7c
--- /dev/null
+++ b/rpmfusion-free-updates-36.repo
@@ -0,0 +1,30 @@
+[rpmfusion-free-updates-36]
+name=RPM Fusion for Fedora 36 - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-36&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
+
+[rpmfusion-free-updates-debuginfo-36]
+name=RPM Fusion for Fedora 36 - Free - Updates Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-36&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
+
+[rpmfusion-free-updates-source-36]
+name=RPM Fusion for Fedora 36 - Free - Updates Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-36&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36
+
diff --git a/rpmfusion.repo b/rpmfusion.repo
deleted file mode 100644
index e826798..0000000
--- a/rpmfusion.repo
+++ /dev/null
@@ -1,18 +0,0 @@
-[rpmfusion-free]
-name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-34&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=0
-
-[rpmfusion-free-updates]
-name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-34&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=0
-repo_gpgcheck=0
diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml
new file mode 100644
index 0000000..f8a53d0
--- /dev/null
+++ b/x13-gen1-sway-desktop.yaml
@@ -0,0 +1,360 @@
+ref: x13-gen1-sway-desktop-36
+rojig:
+  name: x13-gen1-sway-desktop-36
+  summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 36"
+  license: MIT
+
+automatic_version_prefix: "36"
+mutate-os-release: "36"
+
+repos:
+  - fedora-36
+  - fedora-36-updates
+  - rpmfusion-free-36
+  - rpmfusion-free-updates-36
+  - 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:
+  - 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
+  - libva-intel-driver
+  - libva-intel-hybrid-driver
+  - mcelog
+  - microcode_ctl
+  - thermald
+  - thinkfan
+# base system
+  - biosdevname
+  - coreutils-common
+  - dbus-daemon
+  - device-mapper-multipath
+  - nvme-cli
+  - rng-tools
+# diagnostic / utils
+  - htop
+  - iotop
+  - lm_sensors
+  - lshw
+  - net-tools
+  - nmap-ncat
+  - powertop
+  - wireshark
+# alternative modern rust apps
+  - bat
+  - ripgrep
+# networking
+  - bridge-utils
+  - dhcpcd
+  - iwd
+  - NetworkManager
+  - network-manager-applet
+  - NetworkManager-bluetooth
+  - NetworkManager-config-connectivity-fedora
+  - NetworkManager-wifi
+  - NetworkManager-wwan
+# shell tools and development
+  - alacritty
+  - autoconf
+  - automake
+  - ctags
+  - emacs
+  - gettext-devel
+  - git
+  - intltool
+  - ipython3
+  - libtool
+  - make
+  - neovim
+  - patchutils
+  - squashfs-tools
+  - strace
+  - systemd-container
+  - vim-enhanced
+  - w3m
+  - zram-generator
+# fonts
+  - adobe-source-sans-pro-fonts
+  - bitstream-vera-fonts-all
+  - dejavu-sans-fonts
+  - dejavu-sans-mono-fonts
+  - dejavu-serif-fonts
+  - fontawesome-fonts
+  - fontawesome-fonts-web
+  - fontconfig
+  - fontconfig-enhanced-defaults
+  - fontconfig-font-replacements
+  - google-noto-emoji-color-fonts
+  - google-noto-sans-gurmukhi-fonts
+  - google-noto-sans-sinhala-vf-fonts
+  - khmer-os-system-fonts
+  - langpacks-core-font-en
+  - liberation-mono-fonts
+  - liberation-sans-fonts
+  - liberation-serif-fonts
+  - lohit-assamese-fonts
+  - lohit-bengali-fonts
+  - lohit-devanagari-fonts
+  - lohit-gujarati-fonts
+  - lohit-kannada-fonts
+  - lohit-odia-fonts
+  - lohit-tamil-fonts
+  - lohit-telugu-fonts
+  - open-sans-fonts
+  - paktype-naskh-basic-fonts
+  - sil-abyssinica-fonts
+  - sil-mingzat-fonts
+  - sil-nuosu-fonts
+  - sil-padauk-fonts
+  - smc-meera-fonts
+  - terminus-fonts
+  - thai-scalable-waree-fonts
+  - ucs-miscfixed-opentype-fonts
+  - urw-base35-bookman-fonts
+  - urw-base35-c059-fonts
+  - urw-base35-d050000l-fonts
+  - urw-base35-fonts
+  - urw-base35-fonts-common
+  - 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
+  - gvfs-mtp
+  - libavdevice
+  - libva
+  - libva-utils
+  - pavucontrol
+  - pulseaudio-utils
+# misc
+  - feh
+  - okular
+# sway / wayland desktop
+  - brightnessctl
+  - 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
+  - libvirt-daemon-kvm
+  - python-libguestfs
+  - qemu-img
+  - qemu-kvm
+  - qemu-system-x86-core
+  - qemu-ui-sdl
+  - virt-install
+  - virt-manager
+  - virt-top
+  - virt-viewer
+# comps-sync
+  - abattis-cantarell-fonts
+  - acl
+  - alsa-sof-firmware
+  - alsa-ucm
+  - alsa-utils
+  - attr
+  - audit
+  - b43-fwcutter
+  - b43-openfwwf
+  - basesystem
+  - bash
+  - bash-completion
+  - bc
+  - bind-utils
+  - bzip2
+  - colord
+  - compsize
+  - coreutils
+  - cpio
+  - cryptsetup
+  - curl
+  - dhcp-client
+  - dnsmasq
+  - e2fsprogs
+  - ethtool
+  - exfatprogs
+  - fedora-repos-modular
+  - file
+  - filesystem
+  - firefox
+  - firewalld
+  - glibc
+  - glibc-all-langpacks
+  - glx-utils
+  - gnupg2
+  - gstreamer1-plugins-bad-free
+  - gstreamer1-plugins-good
+  - gstreamer1-plugins-ugly-free
+  - hostname
+  - hunspell
+  - ibus-anthy
+  - ibus-gtk3
+  - ibus-hangul
+  - ibus-libpinyin
+  - ibus-libzhuyin
+  - ibus-m17n
+  - ibus-typing-booster
+  - iproute
+  - iptables-nft
+  - iptstate
+  - iputils
+  - iwl7260-firmware
+  - jomolhari-fonts
+  - kbd
+  - kernel
+  - kernel-modules-extra
+  - less
+  - libertas-sd8686-firmware
+  - libertas-sd8787-firmware
+  - libertas-usb8388-firmware
+  - linux-firmware
+  - logrotate
+  - lsof
+  - man-db
+  - man-pages
+  - mdadm
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
+  - mlocate
+  - mtr
+  - nfs-utils
+  - nss-altfiles
+  - nss-mdns
+  - opensc
+  - openssh-clients
+  - openssh-server
+  - pam_afs_session
+  - 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
+  - rootfiles
+  - rpm
+  - rsync
+  - selinux-policy-targeted
+  - setup
+  - shadow-utils
+  - sos
+  - spice-vdagent
+  - sssd
+  - sssd-common
+  - sssd-kcm
+  - stix-fonts
+  - sudo
+  - systemd
+  - systemd-oomd-defaults
+  - systemd-resolved
+  - systemd-udev
+  - tar
+  - time
+  - tree
+  - unzip
+  - uresourced
+  - usb_modeswitch
+  - usbutils
+  - util-linux
+  - wget
+  - which
+  - wireplumber
+  - words
+  - wpa_supplicant
+  - 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/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-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/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"]