From 29db52d114e5974b9f18b32fad5a0b9165784f31 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 14:48:30 +0100 Subject: [PATCH 001/113] Setup for rawhide being F35 Signed-off-by: Tomas Hrcka --- comps-sync.py | 2 +- fedora-common-ostree.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/comps-sync.py b/comps-sync.py index cd9d73e..aea3449 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -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 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index e66c6cc..8f04289 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,7 @@ 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 From f4b3efccaef50e8d07cd3177b12b000957a7c0f5 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 14:55:45 +0100 Subject: [PATCH 002/113] Branching F34 from rawhide Signed-off-by: Tomas Hrcka --- fedora-34-updates.repo | 6 ++++++ fedora-34.repo | 6 ++++++ fedora-deepin.yaml | 4 ++-- fedora-kinoite.yaml | 4 ++-- fedora-lxqt.yaml | 4 ++-- fedora-mate.yaml | 4 ++-- fedora-pantheon.yaml | 4 ++-- fedora-rawhide.repo | 7 ------- fedora-silverblue.yaml | 4 ++-- fedora-xfce.yaml | 4 ++-- 10 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 fedora-34-updates.repo create mode 100644 fedora-34.repo delete mode 100644 fedora-rawhide.repo diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo new file mode 100644 index 0000000..e0e937d --- /dev/null +++ b/fedora-34-updates.repo @@ -0,0 +1,6 @@ +[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 \ No newline at end of file diff --git a/fedora-34.repo b/fedora-34.repo new file mode 100644 index 0000000..0bb56db --- /dev/null +++ b/fedora-34.repo @@ -0,0 +1,6 @@ +[fedora-f34] +name=Fedora f34 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch +enabled=0 +gpgcheck=0 +metadata_expire=1d diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index a6470e4..11edbe0 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -1,5 +1,5 @@ include: deepin-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/deepin +ref: fedora/34/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -9,4 +9,4 @@ packages: - gnome-software repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 25099f1..94d4be2 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,5 +1,5 @@ include: kde-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/kinoite +ref: fedora/34/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" @@ -16,4 +16,4 @@ packages: - ark repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 21ecf2b..eabd25e 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -1,5 +1,5 @@ include: lxqt-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/lxqt +ref: fedora/34/${basearch}/lxqt rojig: name: fedora-lxqt summary: "Fedora LXQt base image" @@ -10,4 +10,4 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 6080915..beacb4c 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -1,5 +1,5 @@ include: mate-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/mate +ref: fedora/34/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -13,4 +13,4 @@ exclude-packages: - python3-unbound repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 31327f4..811d7f6 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -1,5 +1,5 @@ include: pantheon-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/pantheon +ref: fedora/34/${basearch}/pantheon rojig: name: fedora-pantheon summary: "Fedora Pantheon base image" @@ -7,4 +7,4 @@ rojig: packages: repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo deleted file mode 100644 index 5881c94..0000000 --- a/fedora-rawhide.repo +++ /dev/null @@ -1,7 +0,0 @@ -[fedora-rawhide] -name=Fedora rawhide $basearch -#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=0 -gpgcheck=0 -metadata_expire=1d diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index f7f810a..f6db615 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,5 +1,5 @@ include: gnome-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/silverblue +ref: fedora/34/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -16,4 +16,4 @@ packages: - evince-thumbnailer repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 4655808..088d1ea 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -1,5 +1,5 @@ include: xfce-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/xfce +ref: fedora/34/${basearch}/xfce rojig: name: fedora-xfce summary: "Fedora XFCE base image" @@ -8,4 +8,4 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk repos: - - fedora-rawhide + - fedora-34 From e9bafa89fe3e60eb4b10338eb1a3a866b360ef5a Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 18:33:57 +0100 Subject: [PATCH 003/113] Fix mirrorlist URL Signed-off-by: Tomas Hrcka --- fedora-34.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-34.repo b/fedora-34.repo index 0bb56db..7e3d722 100644 --- a/fedora-34.repo +++ b/fedora-34.repo @@ -1,6 +1,6 @@ [fedora-f34] name=Fedora f34 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch enabled=0 gpgcheck=0 metadata_expire=1d From 0ed8f327de8f375e566a1fb0a93ab88f8ee3b982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 8 Feb 2021 19:20:15 +0100 Subject: [PATCH 004/113] comps-sync rawhide 2021-02-18 --- fedora-common-ostree-pkgs.yaml | 6 ++++-- gnome-desktop-pkgs.yaml | 1 - kde-desktop-pkgs.yaml | 3 +-- mate-desktop-pkgs.yaml | 8 ++++---- xfce-desktop-pkgs.yaml | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index f99a8fd..d8527be 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -28,6 +28,7 @@ packages: - chrony - cifs-utils - colord + - compsize - coreutils - cpio - cryptsetup @@ -41,8 +42,8 @@ packages: - dhcp-client - dnsmasq - e2fsprogs - - earlyoom - ethtool + - exfatprogs - fedora-bookmarks - fedora-chromium-config - fedora-repos-modular @@ -72,9 +73,9 @@ packages: - hostname - hplip - hunspell + - ibus-anthy - ibus-gtk3 - ibus-hangul - - ibus-kkc - ibus-libpinyin - ibus-libzhuyin - ibus-m17n @@ -189,6 +190,7 @@ packages: - sudo - system-config-printer-udev - systemd + - systemd-oomd-defaults - systemd-udev - tar - thai-scalable-waree-fonts diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index fd31ff5..4a2901b 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -25,7 +25,6 @@ packages: - gnome-color-manager - gnome-control-center - gnome-disk-utility - - gnome-getting-started-docs - gnome-initial-setup - gnome-remote-desktop - gnome-session-wayland-session diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 2a1afb6..2b3df0f 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -5,7 +5,6 @@ packages: - bluedevil - breeze-icon-theme - dolphin - - earlyoom - firewall-config - glibc-all-langpacks - gnome-keyring-pam @@ -29,7 +28,6 @@ packages: - konsole5 - kscreen - kscreenlocker - - ksysguard - kwalletmanager5 - kwin - pam-kwallet @@ -42,6 +40,7 @@ packages: - plasma-drkonqi - plasma-nm - plasma-pa + - plasma-systemmonitor - plasma-workspace - plasma-workspace-geolocation - plasma-workspace-xorg diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 1f49c68..bfa91a2 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -23,10 +23,10 @@ packages: - dconf-editor - engrampa - eom - - f33-backgrounds-base - - f33-backgrounds-extras-base - - f33-backgrounds-extras-mate - - f33-backgrounds-mate + - f34-backgrounds-base + - f34-backgrounds-extras-base + - f34-backgrounds-extras-mate + - f34-backgrounds-mate - firefox - firewall-config - gnome-epub-thumbnailer diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml index e473a98..def43f1 100644 --- a/xfce-desktop-pkgs.yaml +++ b/xfce-desktop-pkgs.yaml @@ -45,5 +45,4 @@ packages: - xfconf - xfdesktop - xfwm4 - - xfwm4-theme-nodoka - xfwm4-themes From ce5deffce62b9fb54688fa58a3d121d1bead7e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 17 Feb 2021 19:52:51 +0100 Subject: [PATCH 005/113] comps-sync f34 2020-02-18 --- fedora-common-ostree-pkgs.yaml | 6 ++++-- gnome-desktop-pkgs.yaml | 1 - kde-desktop-pkgs.yaml | 3 +-- mate-desktop-pkgs.yaml | 8 ++++---- xfce-desktop-pkgs.yaml | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index f99a8fd..d8527be 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -28,6 +28,7 @@ packages: - chrony - cifs-utils - colord + - compsize - coreutils - cpio - cryptsetup @@ -41,8 +42,8 @@ packages: - dhcp-client - dnsmasq - e2fsprogs - - earlyoom - ethtool + - exfatprogs - fedora-bookmarks - fedora-chromium-config - fedora-repos-modular @@ -72,9 +73,9 @@ packages: - hostname - hplip - hunspell + - ibus-anthy - ibus-gtk3 - ibus-hangul - - ibus-kkc - ibus-libpinyin - ibus-libzhuyin - ibus-m17n @@ -189,6 +190,7 @@ packages: - sudo - system-config-printer-udev - systemd + - systemd-oomd-defaults - systemd-udev - tar - thai-scalable-waree-fonts diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index fd31ff5..4a2901b 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -25,7 +25,6 @@ packages: - gnome-color-manager - gnome-control-center - gnome-disk-utility - - gnome-getting-started-docs - gnome-initial-setup - gnome-remote-desktop - gnome-session-wayland-session diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 2a1afb6..2b3df0f 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -5,7 +5,6 @@ packages: - bluedevil - breeze-icon-theme - dolphin - - earlyoom - firewall-config - glibc-all-langpacks - gnome-keyring-pam @@ -29,7 +28,6 @@ packages: - konsole5 - kscreen - kscreenlocker - - ksysguard - kwalletmanager5 - kwin - pam-kwallet @@ -42,6 +40,7 @@ packages: - plasma-drkonqi - plasma-nm - plasma-pa + - plasma-systemmonitor - plasma-workspace - plasma-workspace-geolocation - plasma-workspace-xorg diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 1f49c68..bfa91a2 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -23,10 +23,10 @@ packages: - dconf-editor - engrampa - eom - - f33-backgrounds-base - - f33-backgrounds-extras-base - - f33-backgrounds-extras-mate - - f33-backgrounds-mate + - f34-backgrounds-base + - f34-backgrounds-extras-base + - f34-backgrounds-extras-mate + - f34-backgrounds-mate - firefox - firewall-config - gnome-epub-thumbnailer diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml index e473a98..def43f1 100644 --- a/xfce-desktop-pkgs.yaml +++ b/xfce-desktop-pkgs.yaml @@ -45,5 +45,4 @@ packages: - xfconf - xfdesktop - xfwm4 - - xfwm4-theme-nodoka - xfwm4-themes From 7a9e5da06f83b524d9295edbd41c85d69c1ae45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:47:49 +0100 Subject: [PATCH 006/113] repos: Fixup repo names and EOF --- fedora-34-updates.repo | 2 +- fedora-34.repo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo index e0e937d..516e164 100644 --- a/fedora-34-updates.repo +++ b/fedora-34-updates.repo @@ -3,4 +3,4 @@ name=Fedora 34 $basearch Updates mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34&arch=$basearch enabled=0 gpgcheck=1 -metadata_expire=1d \ No newline at end of file +metadata_expire=1d diff --git a/fedora-34.repo b/fedora-34.repo index 7e3d722..18b9b5c 100644 --- a/fedora-34.repo +++ b/fedora-34.repo @@ -1,6 +1,6 @@ -[fedora-f34] -name=Fedora f34 $basearch +[fedora-34] +name=Fedora 34 $basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch enabled=0 -gpgcheck=0 +gpgcheck=1 metadata_expire=1d From 3fcb9eed981d18ee670a505dca432cdebe20ecfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:54:35 +0100 Subject: [PATCH 007/113] Fix Rawhide -> F34 branching --- fedora-base.yaml | 4 ++-- fedora-common-ostree.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-base.yaml b/fedora-base.yaml index ed3c178..3601a31 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -1,5 +1,5 @@ include: fedora-common-ostree.yaml -ref: fedora/rawhide/${basearch}/base +ref: fedora/34/${basearch}/base rojig: name: fedora-base summary: "Fedora base image for alternative DE" @@ -12,4 +12,4 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-rawhide + - fedora-34 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index e66c6cc..3018aff 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,4 +1,4 @@ -ref: fedora/rawhide/${basearch}/ostree-base +ref: fedora/34/${basearch}/ostree-base automatic_version_prefix: "34" mutate-os-release: "34" From 46439e6e429e2f39c74326ffdeccddc7a9c8f24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:59:03 +0100 Subject: [PATCH 008/113] Pre-enable updates repo This repo is currently empty but will be used after F34 is released. This is a noop for official variants built via Pungi but useful for unofficial ones. --- fedora-base.yaml | 1 + fedora-deepin.yaml | 1 + fedora-kinoite.yaml | 1 + fedora-lxqt.yaml | 1 + fedora-mate.yaml | 1 + fedora-pantheon.yaml | 1 + fedora-silverblue.yaml | 1 + fedora-xfce.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/fedora-base.yaml b/fedora-base.yaml index 3601a31..d0ed67e 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -13,3 +13,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 11edbe0..4808cd8 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -10,3 +10,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 94d4be2..67cddec 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -17,3 +17,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index eabd25e..7106dfc 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -11,3 +11,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index beacb4c..948010d 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -14,3 +14,4 @@ exclude-packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 811d7f6..455de5b 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -8,3 +8,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index f6db615..908e8cf 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -17,3 +17,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 088d1ea..5da1f1b 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -9,3 +9,4 @@ packages: - xdg-desktop-portal-gtk repos: - fedora-34 + - fedora-34-updates From aa574371b8145cb8b4dd6c38ad56851e530d0b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 11:13:02 +0100 Subject: [PATCH 009/113] Use sqlite instead of bdb for rpmdb --- fedora-common-ostree.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 3018aff..03e476a 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -42,6 +42,9 @@ 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: From a2743ec5de29446e66672d6283696e7beaa2dbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 11:13:02 +0100 Subject: [PATCH 010/113] Use sqlite instead of bdb for rpmdb --- fedora-common-ostree.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 8f04289..4b07303 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -42,6 +42,9 @@ 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: From df22c7fdc8fd4a3d44c811ddd2dad7d93b7d190f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 23 Feb 2021 14:34:55 +0100 Subject: [PATCH 011/113] Include totem-video-thumbnailer for video thumbnailing in Nautilus https://pagure.io/fedora-workstation/issue/168 --- fedora-silverblue.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index f7f810a..fe9b4cb 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -14,6 +14,9 @@ packages: # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus # https://github.com/fedora-silverblue/issue-tracker/issues/98 - evince-thumbnailer + # Include totem-video-thumbnailer for video thumbnailing in Nautilus + # https://pagure.io/fedora-workstation/issue/168 + - totem-video-thumbnailer repos: - fedora-rawhide From 8be943cc459d83c9d7eadb9b560f4ff4b0d0c489 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 23 Feb 2021 14:34:55 +0100 Subject: [PATCH 012/113] Include totem-video-thumbnailer for video thumbnailing in Nautilus https://pagure.io/fedora-workstation/issue/168 --- fedora-silverblue.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 908e8cf..9f4980a 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -14,6 +14,9 @@ packages: # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus # https://github.com/fedora-silverblue/issue-tracker/issues/98 - evince-thumbnailer + # Include totem-video-thumbnailer for video thumbnailing in Nautilus + # https://pagure.io/fedora-workstation/issue/168 + - totem-video-thumbnailer repos: - fedora-34 From 943d7a4140f15cadc5e8858a7a2144035ce1aef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 26 Feb 2021 12:51:22 +0100 Subject: [PATCH 013/113] comps-sync: Exclude python3-dnf-plugin-system-upgrade --- comps-sync-exclude-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 4aa2ed1..5f3cc4c 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -61,6 +61,7 @@ exclude_list: - dnf - dnf-plugins-core - deltarpm + - python3-dnf-plugin-system-upgrade # We use fedora-release-silverblue instead - fedora-release-workstation # Really not worth listing explicitly From 2c7dc6fa804c760285a01d086adf7d1331cfff77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 26 Feb 2021 12:49:01 +0100 Subject: [PATCH 014/113] comps-sync: Exclude python3-dnf-plugin-system-upgrade --- comps-sync-exclude-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 4aa2ed1..5f3cc4c 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -61,6 +61,7 @@ exclude_list: - dnf - dnf-plugins-core - deltarpm + - python3-dnf-plugin-system-upgrade # We use fedora-release-silverblue instead - fedora-release-workstation # Really not worth listing explicitly From fb9e76052587c8f19cad7269ec76cec4c9872dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 24 Mar 2021 15:42:12 +0100 Subject: [PATCH 015/113] Kinoite: Explicitely exclude PackageKit & Offline updates support --- fedora-kinoite.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 67cddec..f3a54cf 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -15,6 +15,11 @@ packages: # Provide an archive manager by default - ark +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + repos: - fedora-34 - fedora-34-updates From 17cd8d48c88f4c2b27153b9b96a1dbbebb3911dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 25 Mar 2021 12:48:13 +0100 Subject: [PATCH 016/113] comps-sync: Exclude arch specific s390utils-base package --- comps-sync-exclude-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 5f3cc4c..16173f7 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -41,6 +41,7 @@ exclude_list: # Architecture specific packages - powerpc-utils - lsvpd + - s390utils-base base-x: # x86 specific packages. Added back by fedora-common-ostree.yaml - xorg-x11-drv-intel From af5d41326418700e9e08ce2cbe7d83683719ae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 5 Mar 2021 10:43:06 +0100 Subject: [PATCH 017/113] comps-sync f34 2021-03-25 --- fedora-common-ostree-pkgs.yaml | 1 - kde-desktop-pkgs.yaml | 1 + pantheon-desktop-pkgs.yaml | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index d8527be..0903ce7 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -155,7 +155,6 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils - - plymouth - plymouth-system-theme - policycoreutils - policycoreutils-python-utils diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 2b3df0f..f75362e 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -41,6 +41,7 @@ packages: - plasma-nm - plasma-pa - plasma-systemmonitor + - plasma-thunderbolt - plasma-workspace - plasma-workspace-geolocation - plasma-workspace-xorg diff --git a/pantheon-desktop-pkgs.yaml b/pantheon-desktop-pkgs.yaml index dd97c4d..cc4df6e 100644 --- a/pantheon-desktop-pkgs.yaml +++ b/pantheon-desktop-pkgs.yaml @@ -11,10 +11,12 @@ packages: - elementary-greeter - elementary-icon-theme - elementary-music + - elementary-notifications - elementary-photos - elementary-print - elementary-screenshot-tool - elementary-shortcut-overlay + - elementary-sideload - elementary-sound-theme - elementary-terminal - elementary-theme @@ -36,7 +38,6 @@ packages: - switchboard-plug-mouse-touchpad - switchboard-plug-networking - switchboard-plug-notifications - - switchboard-plug-onlineaccounts - switchboard-plug-pantheon-shell - switchboard-plug-printers - switchboard-plug-sharing From 78d6cf5424bccab854577f41487aedc984f7c323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 24 Mar 2021 12:55:53 +0100 Subject: [PATCH 018/113] Kinoite: Explicitely exclude PackageKit & Offline updates support --- fedora-kinoite.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 25099f1..45f93e1 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -15,5 +15,10 @@ packages: # Provide an archive manager by default - ark +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + repos: - fedora-rawhide From 9116a38a71744de0036b15cf5b5790982d4ad4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 25 Mar 2021 12:48:13 +0100 Subject: [PATCH 019/113] comps-sync: Exclude arch specific s390utils-base package --- comps-sync-exclude-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 5f3cc4c..16173f7 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -41,6 +41,7 @@ exclude_list: # Architecture specific packages - powerpc-utils - lsvpd + - s390utils-base base-x: # x86 specific packages. Added back by fedora-common-ostree.yaml - xorg-x11-drv-intel From dc78baa94172baca456412f5e1016b4dd84c6480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 5 Mar 2021 10:55:33 +0100 Subject: [PATCH 020/113] comps-sync rawhide 2021-03-25 --- fedora-common-ostree-pkgs.yaml | 1 - kde-desktop-pkgs.yaml | 1 + pantheon-desktop-pkgs.yaml | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index d8527be..0903ce7 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -155,7 +155,6 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils - - plymouth - plymouth-system-theme - policycoreutils - policycoreutils-python-utils diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 2b3df0f..f75362e 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -41,6 +41,7 @@ packages: - plasma-nm - plasma-pa - plasma-systemmonitor + - plasma-thunderbolt - plasma-workspace - plasma-workspace-geolocation - plasma-workspace-xorg diff --git a/pantheon-desktop-pkgs.yaml b/pantheon-desktop-pkgs.yaml index dd97c4d..cc4df6e 100644 --- a/pantheon-desktop-pkgs.yaml +++ b/pantheon-desktop-pkgs.yaml @@ -11,10 +11,12 @@ packages: - elementary-greeter - elementary-icon-theme - elementary-music + - elementary-notifications - elementary-photos - elementary-print - elementary-screenshot-tool - elementary-shortcut-overlay + - elementary-sideload - elementary-sound-theme - elementary-terminal - elementary-theme @@ -36,7 +38,6 @@ packages: - switchboard-plug-mouse-touchpad - switchboard-plug-networking - switchboard-plug-notifications - - switchboard-plug-onlineaccounts - switchboard-plug-pantheon-shell - switchboard-plug-printers - switchboard-plug-sharing From ea80b2a224e06c8ab36e84bd5612c8eb9f82b6c2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 29 Mar 2021 17:16:19 +0200 Subject: [PATCH 021/113] fedora-common-ostree: Drop flatpak-builder People who do local flatpak builds can use flatpak-builder from toolbox, or just use flathub gnome-builder that bundles flatpak-builder. --- fedora-common-ostree.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 03e476a..cf68221 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -17,7 +17,6 @@ packages: - toolbox # Flatpak support - flatpak - - flatpak-builder - xdg-desktop-portal # HFS filesystem tools for Apple hardware # See https://github.com/projectatomic/rpm-ostree/issues/1380 From d57d538e39cf73cf76ea287162dbb58e88700bf6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 29 Mar 2021 17:16:19 +0200 Subject: [PATCH 022/113] fedora-common-ostree: Drop flatpak-builder People who do local flatpak builds can use flatpak-builder from toolbox, or just use flathub gnome-builder that bundles flatpak-builder. --- fedora-common-ostree.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 4b07303..22aa218 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -17,7 +17,6 @@ packages: - toolbox # Flatpak support - flatpak - - flatpak-builder - xdg-desktop-portal # HFS filesystem tools for Apple hardware # See https://github.com/projectatomic/rpm-ostree/issues/1380 From 519b1474211760981c710e6355634b9524fc59b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 1 Apr 2021 12:18:39 +0200 Subject: [PATCH 023/113] Kinoite: Replace plasma-pk-updates by plasma-discover-notifier plasma-pk-updates was previously excluded and plasma-discover-notifier will gain support for rpm-ostree based systems in an upcoming release. Flatpak and fwupd support is already functionnal. --- comps-sync-exclude-list.yml | 1 - kde-desktop-pkgs.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 16173f7..a80954e 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -171,7 +171,6 @@ desktop_exclude_list: - abrt-desktop - cups-pk-helper - dnfdragora - - plasma-pk-updates # Non-critical apps -> Flatpak - akregator - cagibi diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index f75362e..321c11d 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -37,6 +37,7 @@ packages: - plasma-desktop - plasma-desktop-doc - plasma-discover + - plasma-discover-notifier - plasma-drkonqi - plasma-nm - plasma-pa From cea2e95d2374fead320a4a420aef4c7b3225b3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 1 Apr 2021 12:18:39 +0200 Subject: [PATCH 024/113] Kinoite: Replace plasma-pk-updates by plasma-discover-notifier plasma-pk-updates was previously excluded and plasma-discover-notifier will gain support for rpm-ostree based systems in an upcoming release. Flatpak and fwupd support is already functionnal. --- comps-sync-exclude-list.yml | 1 - kde-desktop-pkgs.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 16173f7..a80954e 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -171,7 +171,6 @@ desktop_exclude_list: - abrt-desktop - cups-pk-helper - dnfdragora - - plasma-pk-updates # Non-critical apps -> Flatpak - akregator - cagibi diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index f75362e..321c11d 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -37,6 +37,7 @@ packages: - plasma-desktop - plasma-desktop-doc - plasma-discover + - plasma-discover-notifier - plasma-drkonqi - plasma-nm - plasma-pa From 4a1951747157806acf06d4253b1de03c97a59804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sat, 10 Apr 2021 16:39:30 +0200 Subject: [PATCH 025/113] comps-sync rawhide 2021-04-10 --- kde-desktop-pkgs.yaml | 1 - mate-desktop-pkgs.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 321c11d..57d38db 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -9,7 +9,6 @@ packages: - glibc-all-langpacks - gnome-keyring-pam - initial-setup-gui - - kcm_systemd - kde-gtk-config - kde-print-manager - kde-settings-pulseaudio diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index bfa91a2..cadcaad 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -94,3 +94,5 @@ packages: - system-config-printer-applet - usermode-gtk - xdg-user-dirs-gtk + - xmodmap + - xrdb From b873c8b97c067c470bfac74fc201deefb9d6635c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sat, 10 Apr 2021 16:41:33 +0200 Subject: [PATCH 026/113] comps-sync f34 2021-04-10 --- kde-desktop-pkgs.yaml | 1 - mate-desktop-pkgs.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 321c11d..57d38db 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -9,7 +9,6 @@ packages: - glibc-all-langpacks - gnome-keyring-pam - initial-setup-gui - - kcm_systemd - kde-gtk-config - kde-print-manager - kde-settings-pulseaudio diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index bfa91a2..cadcaad 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -94,3 +94,5 @@ packages: - system-config-printer-applet - usermode-gtk - xdg-user-dirs-gtk + - xmodmap + - xrdb From 0a1adf6f6ca295ce1843066c07726900eb70221a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 12 Apr 2021 12:31:22 +0200 Subject: [PATCH 027/113] comps-sync-exclude: Keep ntfs-3g (already included) ntfs-3g is required for proper RW support of NTFS partitions and is already included via a dependency from another package. --- comps-sync-exclude-list.yml | 1 - fedora-common-ostree-pkgs.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index a80954e..cbfb2de 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -108,7 +108,6 @@ exclude_list: # filesystem tools, again priv container - symlinks - dosfstools - - ntfs-3g # Misc - dos2unix # Gnome specific diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 0903ce7..d3db31c 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -140,6 +140,7 @@ packages: - nfs-utils - nss-altfiles - nss-mdns + - ntfs-3g - ntfsprogs - opensc - openssh-clients From 61e7b69d91586d83036ab8bd165861abd7b5b899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 12 Apr 2021 12:31:22 +0200 Subject: [PATCH 028/113] comps-sync-exclude: Keep ntfs-3g (already included) ntfs-3g is required for proper RW support of NTFS partitions and is already included via a dependency from another package. --- comps-sync-exclude-list.yml | 1 - fedora-common-ostree-pkgs.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index a80954e..cbfb2de 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -108,7 +108,6 @@ exclude_list: # filesystem tools, again priv container - symlinks - dosfstools - - ntfs-3g # Misc - dos2unix # Gnome specific diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 0903ce7..d3db31c 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -140,6 +140,7 @@ packages: - nfs-utils - nss-altfiles - nss-mdns + - ntfs-3g - ntfsprogs - opensc - openssh-clients From f1094db244f80d805347f3e6d8961059a265238e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 19 Apr 2021 18:41:08 +0200 Subject: [PATCH 029/113] comps-sync f34 2021-04-23 --- fedora-common-ostree-pkgs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index d3db31c..df5fcb3 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -115,6 +115,7 @@ packages: - libertas-sd8686-firmware - libertas-sd8787-firmware - libertas-usb8388-firmware + - libglvnd-gles - linux-firmware - logrotate - lohit-assamese-fonts @@ -156,6 +157,7 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils + - plymouth - plymouth-system-theme - policycoreutils - policycoreutils-python-utils From 8e483e4dd369bed93243e3508d43d47b5074a2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 19 Apr 2021 18:39:09 +0200 Subject: [PATCH 030/113] comps-sync rawhide 2021-04-26 Includes https://pagure.io/fedora-comps/pull-request/651 --- fedora-common-ostree-pkgs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index d3db31c..712f548 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -115,6 +115,7 @@ packages: - libertas-sd8686-firmware - libertas-sd8787-firmware - libertas-usb8388-firmware + - libglvnd-gles - linux-firmware - logrotate - lohit-assamese-fonts @@ -156,6 +157,7 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils + - plymouth - plymouth-system-theme - policycoreutils - policycoreutils-python-utils @@ -214,7 +216,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 From 4b9a6da6f1b73500841b302ed4be07a6a9040073 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sun, 17 Nov 2019 16:21:54 +0100 Subject: [PATCH 031/113] Remove unwanted packages for pitti's workstation --- fedora-common-ostree.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index cf68221..01d4f56 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -8,31 +8,12 @@ include: fedora-common-ostree-pkgs.yaml packages: - fedora-release-silverblue - git-core - - lvm2 - rpm-ostree # Container management - buildah - podman - skopeo - toolbox - # 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 @@ -79,13 +60,6 @@ packages-x86_64: - 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: From a3397a39b9e6998a4d7ef5d1bc4fbffd48ab3a31 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 17 Jun 2019 21:42:46 +0200 Subject: [PATCH 032/113] Define tree for pitti's workstation Also add helper script for running the ostree build. --- 2015-RH-IT-Root-CA.pem | 25 +++++++ README.md | 27 ++++++++ compose.sh | 12 ++++ fedora-34-updates.repo | 7 ++ fedora-common-ostree.yaml | 2 - pitti-desktop.yaml | 142 ++++++++++++++++++++++++++++++++++++++ pitti-post.sh | 40 +++++++++++ rpmfusion.repo | 18 +++++ 8 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 2015-RH-IT-Root-CA.pem create mode 100755 compose.sh create mode 100644 pitti-desktop.yaml create mode 100755 pitti-post.sh create mode 100644 rpmfusion.repo diff --git a/2015-RH-IT-Root-CA.pem b/2015-RH-IT-Root-CA.pem new file mode 100644 index 0000000..f306f00 --- /dev/null +++ b/2015-RH-IT-Root-CA.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD +VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp +Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx +GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m +b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx +WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD +VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS +ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG +9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz +bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2 +c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo +GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES +X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK +BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R +4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz +bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e +LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak +oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj +S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf +4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel +RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3 +-----END CERTIFICATE----- diff --git a/README.md b/README.md index 31f49b8..b0eb74d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,30 @@ +Martin Pitt's desktop +===================== + +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. + +It gets [automatically built](.github/workflows/build.yml) every week and [published to my server](https://piware.de/ostree/pitti-workstation/). + +To use it from an existing OSTree based system like [Fedora CoreOS](https://getfedora.org/coreos) or [Fedora Silverblue](https://docs.fedoraproject.org/en-US/fedora-silverblue/), add my server URL as new remote and rebase your tree to it: + +```sh +sudo ostree remote add --no-gpg-verify piware https://piware.de/ostree/pitti-workstation/ +sudo rpm-ostree rebase piware:pitti-desktop +``` + +After that, you can install weekly updates with + +``` +sudo rpm-ostree upgrade +``` + +If anything goes wrong, you can go back to the previous version with `sudo rpm-ostree rollback`. + + +Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) +============================================= + For some background, see: - https://fedoraproject.org/wiki/Workstation/AtomicWorkstation diff --git a/compose.sh b/compose.sh new file mode 100755 index 0000000..101da94 --- /dev/null +++ b/compose.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -eu +CACHE=/var/cache/ostree +REPO=/var/tmp/repo + +mkdir -p $CACHE + +if [ ! -d $REPO/objects ]; then + ostree --repo=$REPO init --mode=archive-z2 +fi + +rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO pitti-desktop.yaml diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo index 516e164..e107df5 100644 --- a/fedora-34-updates.repo +++ b/fedora-34-updates.repo @@ -4,3 +4,10 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34& 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 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 01d4f56..83c952e 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -3,8 +3,6 @@ ref: fedora/34/${basearch}/ostree-base automatic_version_prefix: "34" mutate-os-release: "34" -include: fedora-common-ostree-pkgs.yaml - packages: - fedora-release-silverblue - git-core diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml new file mode 100644 index 0000000..5ce1473 --- /dev/null +++ b/pitti-desktop.yaml @@ -0,0 +1,142 @@ +include: fedora-common-ostree.yaml + +ref: pitti-desktop +rojig: + name: pitti-desktop + summary: "Pitti Desktop" + license: MIT + +repos: + - fedora-34 + - fedora-34-updates + - fedora-34-updates-testing + - rpmfusion-free + - rpmfusion-free-updates + +packages: +# hardware/drivers + - kernel + - kernel-modules-extra + - iwl6000g2a-firmware + - iwl7260-firmware + - alsa-sof-firmware + - NetworkManager-wifi + - NetworkManager-openvpn-gnome + - sane-backends + - sane-backends-drivers-scanners + - powertop + - iwd + - udisks2-lvm2 + - opensc +# basic system + - acl + - attr + - basesystem + - cryptsetup + - dnsmasq + - fedora-workstation-backgrounds + - filesystem + - glibc-langpack-de + - glibc-langpack-en + - hostname + - iproute + - kbd + - nss-altfiles + - pciutils + - sudo + - usbutils +# shell tools and development + - bc + - gnupg2 + - fpaste + - lsof + - man-db + - mtr + - tree + - bzip2 + - zip + - unzip + - vim-enhanced + - ranger + - bash-completion + - fish + - qemu-system-x86-core + - qemu-ui-sdl + - qemu-img + - openvpn + - mutt + - nmap-ncat + - isync + - weechat + - duplicity + - openssh-server + - systemd-container + - git + - patchutils + - make + - strace + - wget + - w3m + - cockpit-system + - cockpit-ws + - syncthing + - krb5-workstation + +# desktop plumbing/apps + - dejavu-sans-fonts + - dejavu-serif-fonts + - dejavu-sans-mono-fonts + - fontawesome-fonts + - google-noto-emoji-color-fonts + + - gvfs-mtp + - pulseaudio-utils + - alsa-plugins-pulseaudio + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly + - gstreamer1-libav + # for wf-recorder + - libavdevice + + - pavucontrol + - pcmanfm + - simple-scan + - nm-connection-editor + - eog + - evince + - rhythmbox + - gnome-keyring + - pinentry-gnome3 + - lxpolkit + - lxterminal + - gnome-disk-utility + - gtimelog + +# sway/wayland desktop + - sway + - swayidle + - swaylock + - kanshi + - mako + - waybar + - slurp + - grim + - xorg-x11-server-Xwayland + - firefox-wayland + - wofi + - brightnessctl + - wl-clipboard + +exclude-packages: + # recommended by sway + - alacritty + - brltty + - glibc-all-langpacks + - xdg-desktop-portal-wlr + # recommended by gtimelog + - yelp + +add-files: + - ["2015-RH-IT-Root-CA.pem", "/etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem"] + +postprocess-script: pitti-post.sh diff --git a/pitti-post.sh b/pitti-post.sh new file mode 100755 index 0000000..5491324 --- /dev/null +++ b/pitti-post.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +set -xeuo pipefail + +# Enable SysRQ +echo 'kernel.sysrq = 1' > /usr/lib/sysctl.d/90-sysrq.conf + +# power saving +echo 'blacklist e1000e' > /usr/lib/modprobe.d/blacklist-local.conf + +# NetworkManager config +cat < /usr/lib/NetworkManager/conf.d/local.conf +[main] +plugins= + +[device] +wifi.backend=iwd +EOF +ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service +ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf + +# enable other units +mkdir -p /usr/lib/systemd/system/getty.target.wants +ln -s ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service +ln -s ../systemd-timesyncd.service /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service +ln -s ../cockpit.socket /usr/lib/systemd/system/sockets.target.wants/cockpit.socket +ln -s ../sshd.socket /usr/lib/systemd/system/sockets.target.wants/sshd.socket + +# disable unwanted services +ln -sfn /dev/null /usr/lib/systemd/user/at-spi-dbus-bus.service + +# move OS systemd unit defaults to /usr +cp -a --verbose /etc/systemd/system /etc/systemd/user /usr/lib/systemd/ +rm -r /etc/systemd/system /etc/systemd/user + +# avoid LVM spew in /etc +sed -i 's/backup = 1/backup = 0/; s/archive = 1/archive = 0/' /etc/lvm/lvm.conf + +# update for Red Hat certificate +ln -s /etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem /etc/pki/tls/certs/2015-RH-IT-Root-CA.pem +update-ca-trust diff --git a/rpmfusion.repo b/rpmfusion.repo new file mode 100644 index 0000000..e826798 --- /dev/null +++ b/rpmfusion.repo @@ -0,0 +1,18 @@ +[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 From cb9799f779230105ddb5c4a408727bc1dcd60430 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 26 Sep 2020 17:25:01 +0200 Subject: [PATCH 033/113] Enable systemd-homed This requires some PAM config updates and disabling SELinux. --- pitti-post.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/pitti-post.sh b/pitti-post.sh index 5491324..a5441e5 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -18,10 +18,69 @@ EOF ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf +# set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) +patch /etc/pam.d/system-auth < Date: Sat, 12 Dec 2020 19:41:13 +0100 Subject: [PATCH 034/113] Add GitHub workflow for building the OSTree repository Also add a script to download and unpack the artifact on my server's `public_html/`. --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ github-fetch.sh | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100755 github-fetch.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9d791b3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: build +on: + schedule: + - cron: 0 2 * * 6 + workflow_dispatch: +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker.io/fedora:latest + # Fix SELinux for the built OSTree: https://github.com/coreos/rpm-ostree/issues/1943 + options: --privileged --security-opt label:disable + steps: + - name: Install dependencies + run: dnf install -y rpm-ostree selinux-policy selinux-policy-targeted policycoreutils + + - name: Clone repository + uses: actions/checkout@v2 + + - name: Build OSTree + run: ./compose.sh + + # upload-artifact@v2 has trouble with tens of thousands of files + - name: Create repo tarball + run: tar -czf /var/tmp/repo.tar.gz -C /var/tmp/repo . + + - name: Create repository artifact + uses: actions/upload-artifact@v2 + with: + name: repository + path: /var/tmp/repo.tar.gz + retention-days: 5 diff --git a/github-fetch.sh b/github-fetch.sh new file mode 100755 index 0000000..ebf972e --- /dev/null +++ b/github-fetch.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# Download built GitHub OSTree repository artifact and unpack it into a plain directory +set -eux + +# download latest repo build +REPO_FINAL="$(dirname $0)/pitti-workstation" +REPO="${REPO_FINAL}.new" + +CURL="curl -u token:$(cat ~/.config/github-token) --show-error --fail" +RESPONSE=$($CURL --silent https://api.github.com/repos/martinpitt/ostree-pitti-workstation/actions/artifacts) +ZIP=$(echo "$RESPONSE" | jq --raw-output '.artifacts | map(select(.name == "repository"))[0].archive_download_url') +echo "INFO: Downloading $ZIP ..." +[ -e /tmp/repository.zip ] || $CURL -L -o /tmp/repository.zip "$ZIP" +rm -rf "$REPO" +mkdir -p "$REPO" +unzip -p /tmp/repository.zip | tar -xzC "$REPO" +rm /tmp/repository.zip +[ ! -e "$REPO_FINAL" ] || mv "${REPO_FINAL}" "${REPO_FINAL}.old" +mv "$REPO" "$REPO_FINAL" +rm -rf "${REPO_FINAL}.old" From 2e9e416b508511dcae783f10f3b2818da20d8d07 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 8 Jan 2021 08:46:53 +0100 Subject: [PATCH 035/113] Move back from iwd to wpa_supplicant iwd has a really strange behaviour of randomly interrupting the wifi connection: Received Deauthentication event, reason: 4, from_ap: false This also interrupts VPN. This does not happen with wpasupplicant. https://bugzilla.redhat.com/show_bug.cgi?id=1915641 --- pitti-desktop.yaml | 1 + pitti-post.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 5ce1473..14ed529 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -26,6 +26,7 @@ packages: - sane-backends-drivers-scanners - powertop - iwd + - wpa_supplicant - udisks2-lvm2 - opensc # basic system diff --git a/pitti-post.sh b/pitti-post.sh index a5441e5..f68fee3 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -13,9 +13,9 @@ cat < /usr/lib/NetworkManager/conf.d/local.conf plugins= [device] -wifi.backend=iwd +#wifi.backend=iwd EOF -ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service +#ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf # set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) From ce6305d557f9494872535b93ff2b930907ba3c96 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:42:34 +0200 Subject: [PATCH 036/113] Install selinux-policy-targeted Otherwise latest rpm-ostree fails with ``` Writing rpmdb... done error: Loading pkgcache branch rpmostree/pkg/adwaita-cursor-theme/40.0-2.fc34.noarch: SELinux enabled, but no policy found ``` --- pitti-desktop.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 14ed529..1c299b9 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -44,6 +44,8 @@ packages: - kbd - nss-altfiles - pciutils + # don't care, but rpm-ostree build fails otherwise + - selinux-policy-targeted - sudo - usbutils # shell tools and development From 8a869f9d6da8b756e774d61b45a9880d91eca4ee Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:49:27 +0200 Subject: [PATCH 037/113] Unignore flatpak --- fedora-common-ostree.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 83c952e..3818b66 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -12,6 +12,9 @@ packages: - podman - skopeo - toolbox + # Flatpak support + - flatpak + - xdg-desktop-portal selinux: true documentation: true From 4f8bee9d2337e001e6cccd8ad6febd32a3729940 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:50:13 +0200 Subject: [PATCH 038/113] Install xdg-desktop-portal-gtk for proper flatpak app support --- pitti-desktop.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 1c299b9..9454555 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -100,6 +100,7 @@ packages: - gstreamer1-libav # for wf-recorder - libavdevice + - xdg-desktop-portal-gtk - pavucontrol - pcmanfm From 00cb9ed884183ca2ff35438d4b4df80323f91e41 Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Sat, 1 May 2021 16:29:16 +0200 Subject: [PATCH 039/113] comps-sync-exclude: Exclude mediawriter It's available as a Flatpak. --- comps-sync-exclude-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index cbfb2de..1bd55d3 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -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 From 6383af99339d704bfd6ea74958a3436e8266002e Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Sat, 1 May 2021 16:31:37 +0200 Subject: [PATCH 040/113] comps-sync rawhide 2021-05-01 Includes https://pagure.io/fedora-comps/pull-request/645 --- fedora-common-ostree-pkgs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 712f548..42c587e 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -52,8 +52,6 @@ packages: - filesystem - firefox - firewalld - - foomatic - - foomatic-db-ppds - fpaste - fros-gnome - gamemode From e0217f59e04b51019a0234277063206e383b0a41 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 4 May 2021 06:02:58 +0200 Subject: [PATCH 041/113] Move to systemd-resolved For per-interface resolution --- pitti-post.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pitti-post.sh b/pitti-post.sh index f68fee3..1a4032c 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -16,7 +16,8 @@ plugins= #wifi.backend=iwd EOF #ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service -ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf + +ln -sfn /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf # set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) patch /etc/pam.d/system-auth < Date: Mon, 11 Jan 2021 19:25:52 +0100 Subject: [PATCH 042/113] Switch to per variant fedora-release-* package Move the fedora-release-* package requirement to each variant treefile to enable per variant specifc release package. Silverblue keeps its existing release package and Kinoite gets its own for Fedora 35: https://fedoraproject.org/wiki/Changes/Fedora_Kinoite For now, all other unofficial variants will use the Fedora generic release package (or the corresponding Spin release package) with the ostree counting and desktop sub packages to enable those features by default. --- fedora-base.yaml | 4 ++++ fedora-common-ostree.yaml | 1 - fedora-deepin.yaml | 4 ++++ fedora-kinoite.yaml | 1 + fedora-lxqt.yaml | 4 ++++ fedora-mate.yaml | 5 ++++- fedora-pantheon.yaml | 4 ++++ fedora-silverblue.yaml | 1 + fedora-xfce.yaml | 4 ++++ 9 files changed, 26 insertions(+), 2 deletions(-) diff --git a/fedora-base.yaml b/fedora-base.yaml index ed3c178..55a4c75 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -5,6 +5,10 @@ rojig: summary: "Fedora base image for alternative DE" license: MIT packages: + # Generic release packages for desktop variants and counting + - fedora-release + - fedora-release-ostree-desktop + - fedora-release-ostree-counting # XWayland support - xorg-x11-server-Xwayland # Portals for Flatpak diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 22aa218..66a892c 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -6,7 +6,6 @@ mutate-os-release: "35" include: fedora-common-ostree-pkgs.yaml packages: - - fedora-release-silverblue - git-core - lvm2 - rpm-ostree diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index a6470e4..ff49255 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -5,6 +5,10 @@ rojig: summary: "Fedora Deepin base image" license: MIT packages: + # Generic release packages for desktop variants and counting + - fedora-release + - fedora-release-ostree-desktop + - fedora-release-ostree-counting # GUI to manage updates & Flatpaks - gnome-software diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 45f93e1..d709c52 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -5,6 +5,7 @@ rojig: summary: "Fedora Kinoite (KDE) base image" license: MIT packages: + - fedora-release-kinoite # Wayland support - kwayland-integration - kwin-wayland diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 21ecf2b..5c5e713 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -5,6 +5,10 @@ rojig: summary: "Fedora LXQt base image" license: MIT packages: + # Generic release packages for desktop variants and counting + - fedora-release + - fedora-release-ostree-desktop + - fedora-release-ostree-counting - libqtxdg # Portals for Flatpak - xdg-desktop-portal-kde diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 6080915..26091d5 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -4,8 +4,11 @@ rojig: name: fedora-mate summary: "Fedora Mate base image" license: MIT - packages: + - fedora-release-matecompiz + # Generic release sub packages for desktop variants and counting + - fedora-release-ostree-desktop + - fedora-release-ostree-counting # Portals for Flatpak - xdg-desktop-portal-gtk diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 31327f4..b887b98 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -5,6 +5,10 @@ rojig: summary: "Fedora Pantheon base image" license: MIT packages: + # Generic release packages for desktop variants and counting + - fedora-release + - fedora-release-ostree-desktop + - fedora-release-ostree-counting repos: - fedora-rawhide diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index fe9b4cb..942ae73 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -5,6 +5,7 @@ rojig: summary: "Fedora Silverblue base image" license: MIT packages: + - fedora-release-silverblue - desktop-backgrounds-gnome - gnome-shell-extension-background-logo - pinentry-gnome3 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 4655808..33ac52e 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -5,6 +5,10 @@ rojig: summary: "Fedora XFCE base image" license: MIT packages: + - fedora-release-xfce + # Generic release sub packages for desktop variants and counting + - fedora-release-ostree-desktop + - fedora-release-ostree-counting # Portals for Flatpak - xdg-desktop-portal-gtk repos: From cd73bfcc207215412244096ff5c7c42d6333042e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 13 May 2021 10:16:44 +0200 Subject: [PATCH 043/113] Silverblue: Include evince-previewer Otherwise print previews are broken in Evince. See https://github.com/fedora-silverblue/issue-tracker/issues/122 --- fedora-silverblue.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 942ae73..0819c10 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -15,6 +15,9 @@ 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 From c6aa31404a14de335b8547cce21bf6decec07431 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 17 May 2021 10:58:58 +0200 Subject: [PATCH 044/113] Include shim and grub2 packages for 32-bit EFI firmware https://pagure.io/workstation-ostree-config/issue/217 --- fedora-common-ostree.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 66a892c..87dffe8 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -71,10 +71,12 @@ packages-ppc64le: - ostree-grub2 packages-x86_64: - grub2 + - grub2-efi-ia32 - grub2-efi-x64 - ostree-grub2 - efibootmgr - - shim + - shim-ia32 + - shim-x64 - microcode_ctl - mcelog - thermald From ff60c0a260e2e8c18c766af7367f93fd2d56469d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 17 May 2021 11:21:32 +0200 Subject: [PATCH 045/113] Explicitly include grub2-pc instead of grub2 This makes the listing more explicit but shouldn't change the package set as grub2-pc provides grub2. --- fedora-common-ostree.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 87dffe8..a861128 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -70,9 +70,9 @@ packages-ppc64le: - grub2 - ostree-grub2 packages-x86_64: - - grub2 - grub2-efi-ia32 - grub2-efi-x64 + - grub2-pc - ostree-grub2 - efibootmgr - shim-ia32 From bea529a1a247e02c4509358ea7e15d6b55067caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sun, 30 May 2021 15:04:13 +0200 Subject: [PATCH 046/113] Kinoite: Keep spectacle & a subset of plasma-nm-* - Spectacle is not yet available as a Flatpak - plasma-nm-openconnect, plasma-nm-openvpn and plasma-nm-vpnc are common VPN options so keep them installed by default. The other ones are either less common or insecure and will work fine as overlayed packages. --- comps-sync-exclude-list.yml | 4 ---- kde-desktop-pkgs.yaml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 1bd55d3..1f73e12 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -198,18 +198,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 diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 57d38db..a0a868c 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -39,6 +39,9 @@ packages: - plasma-discover-notifier - plasma-drkonqi - plasma-nm + - plasma-nm-openconnect + - plasma-nm-openvpn + - plasma-nm-vpnc - plasma-pa - plasma-systemmonitor - plasma-thunderbolt @@ -52,4 +55,5 @@ packages: - sddm - sddm-breeze - sddm-kcm + - spectacle - xorg-x11-drv-libinput From 4247bce5e44f31119f7b23efcff5c722d1e12d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 7 Jun 2021 15:17:46 +0200 Subject: [PATCH 047/113] comps-sync rawhide 2021-06-07 --- fedora-common-ostree-pkgs.yaml | 1 + kde-desktop-pkgs.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 42c587e..4dcb53e 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -205,6 +205,7 @@ packages: - wget - which - words + - wpa_supplicant - xorg-x11-drv-amdgpu - xorg-x11-drv-ati - xorg-x11-drv-evdev diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index a0a868c..760d141 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -37,6 +37,7 @@ packages: - plasma-desktop-doc - plasma-discover - plasma-discover-notifier + - plasma-disks - plasma-drkonqi - plasma-nm - plasma-nm-openconnect @@ -45,6 +46,7 @@ packages: - plasma-pa - plasma-systemmonitor - plasma-thunderbolt + - plasma-vault - plasma-workspace - plasma-workspace-geolocation - plasma-workspace-xorg From 588cc3455d9fe9f6bf21bf38c15491182165c641 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 8 Jun 2021 19:20:35 +0200 Subject: [PATCH 048/113] Add rofimoji Nice wofi based emoji search. --- pitti-desktop.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 9454555..d8aae02 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -115,6 +115,7 @@ packages: - lxterminal - gnome-disk-utility - gtimelog + - rofimoji # sway/wayland desktop - sway From 43d57ab38c749a4d56cc8ebaacbe6ebe43f60c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 14 Jun 2021 20:03:55 +0200 Subject: [PATCH 049/113] comps-sync rawhide 2021-06-14 --- fedora-common-ostree-pkgs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 4dcb53e..90eb721 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -5,7 +5,6 @@ packages: - NetworkManager-config-connectivity-fedora - NetworkManager-wifi - NetworkManager-wwan - - aajohan-comfortaa-fonts - abattis-cantarell-fonts - acl - adwaita-qt5 @@ -101,7 +100,6 @@ packages: - iwl6050-firmware - iwl7260-firmware - jomolhari-fonts - - julietaula-montserrat-fonts - kbd - kernel - kernel-modules-extra From 74d1b0827e64f9eb00dcb050cf530693d8ecfb9c Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Thu, 17 Jun 2021 00:49:38 +0200 Subject: [PATCH 050/113] X1 Carbon Gen 7 Sway Desktop --- README.md | 22 +-- compose.sh | 2 +- config/i3status-rust/config.toml | 78 ++++++++ config/modprobe.d/i2c_i801-blacklist.conf | 1 + config/modprobe.d/i915.conf | 4 + config/sway-service.desktop | 6 + config/sway-service.sh | 7 + config/swaylock/config | 8 + config/systemd/firefox.service | 10 + config/systemd/mako.service | 15 ++ config/systemd/nm-applet.service | 14 ++ config/systemd/sway-session.target | 6 + config/systemd/sway.service | 14 ++ config/systemd/swayidle.service | 13 ++ config/systemd/swaylock.service | 11 ++ config/systemd/wayland-session.target | 16 ++ config/waybar/config | 95 ++++++++++ config/waybar/style.css | 213 ++++++++++++++++++++++ pitti-desktop.yaml | 147 --------------- pitti-post.sh | 101 ---------- post.sh | 10 +- x1-gen7-sway-desktop.yaml | 156 ++++++++++++++++ 22 files changed, 677 insertions(+), 272 deletions(-) create mode 100644 config/i3status-rust/config.toml create mode 100644 config/modprobe.d/i2c_i801-blacklist.conf create mode 100644 config/modprobe.d/i915.conf create mode 100644 config/sway-service.desktop create mode 100755 config/sway-service.sh create mode 100644 config/swaylock/config create mode 100644 config/systemd/firefox.service create mode 100644 config/systemd/mako.service create mode 100644 config/systemd/nm-applet.service create mode 100644 config/systemd/sway-session.target create mode 100644 config/systemd/sway.service create mode 100644 config/systemd/swayidle.service create mode 100644 config/systemd/swaylock.service create mode 100644 config/systemd/wayland-session.target create mode 100644 config/waybar/config create mode 100644 config/waybar/style.css delete mode 100644 pitti-desktop.yaml delete mode 100755 pitti-post.sh create mode 100644 x1-gen7-sway-desktop.yaml diff --git a/README.md b/README.md index b0eb74d..0340c1c 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,9 @@ -Martin Pitt's desktop -===================== +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. -It gets [automatically built](.github/workflows/build.yml) every week and [published to my server](https://piware.de/ostree/pitti-workstation/). - -To use it from an existing OSTree based system like [Fedora CoreOS](https://getfedora.org/coreos) or [Fedora Silverblue](https://docs.fedoraproject.org/en-US/fedora-silverblue/), add my server URL as new remote and rebase your tree to it: - -```sh -sudo ostree remote add --no-gpg-verify piware https://piware.de/ostree/pitti-workstation/ -sudo rpm-ostree rebase piware:pitti-desktop -``` - -After that, you can install weekly updates with - -``` -sudo rpm-ostree upgrade -``` - -If anything goes wrong, you can go back to the previous version with `sudo rpm-ostree rollback`. - - Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) ============================================= diff --git a/compose.sh b/compose.sh index 101da94..01f2231 100755 --- a/compose.sh +++ b/compose.sh @@ -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 pitti-desktop.yaml +rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml diff --git a/config/i3status-rust/config.toml b/config/i3status-rust/config.toml new file mode 100644 index 0000000..4681a21 --- /dev/null +++ b/config/i3status-rust/config.toml @@ -0,0 +1,78 @@ +# when using 3istsatus-rs with swaybar +# https://github.com/greshake/i3status-rust +# + +theme = "solarized-dark" +icons = "awesome5" + +[[block]] +block = "temperature" +collapsed = false +interval = 10 +format = "gpu {max}°" +chip = "amdgpu-pci-*" + +[[block]] +block = "temperature" +collapsed = false +interval = 10 +format = "cpu {max}°" +chip = "k10temp-pci-*" + +[[block]] +block = "temperature" +collapsed = true +interval = 10 +format = "nvme: {max}°" +chip = "nvme-pci-*" + +[[block]] +block = "temperature" +collapsed = true +interval = 10 +format = "wifi: {max}°" +chip = "iwlwifi_1-*" + +[[block]] +block = "net" +device = "wlan0" +format = "{ssid} {signal_strength} {ip} {speed_down} {graph_down}" +interval = 5 + +[[block]] +block = "disk_space" +path = "/" +alias = "/" +info_type = "available" +unit = "GB" +interval = 20 +warning = 20.0 +alert = 10.0 + +[[block]] +block = "memory" +display_type = "memory" +format_mem = "{Mup}%" +format_swap = "{SUp}%" + +[[block]] +block = "cpu" +interval = 1 + +[[block]] +block = "load" +interval = 1 +format = "{1m}" + +[[block]] +block = "sound" + +[[block]] +block = "keyboard_layout" +driver = "sway" +sway_kb_identifier = "6127:24585:Lite-On_Technology_Corp._ThinkPad_USB_Keyboard_with_TrackPoint" + +[[block]] +block = "time" +interval = 60 +format = "%a %d/%m %R" diff --git a/config/modprobe.d/i2c_i801-blacklist.conf b/config/modprobe.d/i2c_i801-blacklist.conf new file mode 100644 index 0000000..70f1f9b --- /dev/null +++ b/config/modprobe.d/i2c_i801-blacklist.conf @@ -0,0 +1 @@ +blacklist i2c_i801 diff --git a/config/modprobe.d/i915.conf b/config/modprobe.d/i915.conf new file mode 100644 index 0000000..39114f5 --- /dev/null +++ b/config/modprobe.d/i915.conf @@ -0,0 +1,4 @@ +options i915 enable_fbc=1 +options i915 enable_guc=2 +options i915 nuclear_pageflip=Y +options i915 enable_dc=2 diff --git a/config/sway-service.desktop b/config/sway-service.desktop new file mode 100644 index 0000000..63f18af --- /dev/null +++ b/config/sway-service.desktop @@ -0,0 +1,6 @@ +# /usr/share/wayland-sessions/sway-service.desktop +[Desktop Entry] +Name=Sway Service +Comment=i3-compatible Wayland compositor as a systemd service +Exec=sway-service.sh +Type=Application diff --git a/config/sway-service.sh b/config/sway-service.sh new file mode 100755 index 0000000..8b0de34 --- /dev/null +++ b/config/sway-service.sh @@ -0,0 +1,7 @@ +#! /bin/sh +# /usr/local/bin/sway-service.sh - needs to be 0755 + +# first import environment variables from the login manager +systemctl --user import-environment +# then start the service +exec systemctl --wait --user start sway.service \ No newline at end of file diff --git a/config/swaylock/config b/config/swaylock/config new file mode 100644 index 0000000..acb5cb4 --- /dev/null +++ b/config/swaylock/config @@ -0,0 +1,8 @@ +# ~/.config/swayidle/config +before-sleep 'systemctl --user start swaylock' +lock 'systemctl --user start swaylock' +unlock 'swaymsg "output * dpms on"' +after-resume 'swaymsg "output * dpms on"' +timeout 300 'systemctl --user start swaylock' +timeout 600 'swaymsg "output * dpms off"' +resume 'swaymsg "output * dpms on"' diff --git a/config/systemd/firefox.service b/config/systemd/firefox.service new file mode 100644 index 0000000..55bf229 --- /dev/null +++ b/config/systemd/firefox.service @@ -0,0 +1,10 @@ +[Unit] +Description=Firefox nightly +PartOf=graphical-session.target + +[Service] +Type=exec +ExecStart=/opt/firefox/firefox + +[Install] +WantedBy=graphical-session.target diff --git a/config/systemd/mako.service b/config/systemd/mako.service new file mode 100644 index 0000000..bd2fac2 --- /dev/null +++ b/config/systemd/mako.service @@ -0,0 +1,15 @@ +[Unit] +Description=Lightweight Wayland notification daemon +Documentation=man:mako(1) +PartOf=sway-session.target +After=sway-session.target + +[Service] +Type=dbus +BusName=org.freedesktop.Notifications +ExecCondition=/bin/sh -c '[ -n "$WAYLAND_DISPLAY" ]' +ExecStart=/usr/bin/mako +ExecReload=/usr/bin/makoctl reload + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/nm-applet.service b/config/systemd/nm-applet.service new file mode 100644 index 0000000..3e35f1c --- /dev/null +++ b/config/systemd/nm-applet.service @@ -0,0 +1,14 @@ +[Unit] +Description=network monitor and control GUI applet +Documentation=man:nm-applet(1) +PartOf=wayland-session.target +After=wayland-session.target + +# requires nm-applet compiled with -D appindicator=yes +[Service] +Type=dbus +BusName=org.freedesktop.network-manager-applet +ExecStart=/usr/bin/nm-applet --indicator + +[Install] +WantedBy=wayland-session.target diff --git a/config/systemd/sway-session.target b/config/systemd/sway-session.target new file mode 100644 index 0000000..87fe41d --- /dev/null +++ b/config/systemd/sway-session.target @@ -0,0 +1,6 @@ +[Unit] +Description=sway compositor session +Documentation=man:systemd.special(7) +BindsTo=graphical-session.target wayland-session.target +Wants=graphical-session-pre.target +After=graphical-session-pre.target diff --git a/config/systemd/sway.service b/config/systemd/sway.service new file mode 100644 index 0000000..ea21f05 --- /dev/null +++ b/config/systemd/sway.service @@ -0,0 +1,14 @@ +[Unit] +Description=sway - i3-compatible Wayland compositor +Documentation=man:sway(5) +Before=graphical-session.service +Wants=graphical-session-pre.service +After=graphical-session-pre.service + +[Service] +Type=simple +EnvironmentFile=-%h/.config/sway/env +ExecStart=/usr/bin/sway +Restart=on-failure +RestartSec=1 +TimeoutStopSec=10 diff --git a/config/systemd/swayidle.service b/config/systemd/swayidle.service new file mode 100644 index 0000000..d235a7a --- /dev/null +++ b/config/systemd/swayidle.service @@ -0,0 +1,13 @@ +[Unit] +Description=Idle manager for Wayland +Documentation=man:swayidle(1) +Documentation=https://github.com/gdamjan/swayidle - fork with sd-notify and autolock +PartOf=graphical-session.target +After=sway-session.target + +[Service] +Type=notify +ExecStart=/usr/bin/swayidle -w + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/swaylock.service b/config/systemd/swaylock.service new file mode 100644 index 0000000..88c7a10 --- /dev/null +++ b/config/systemd/swaylock.service @@ -0,0 +1,11 @@ +[Unit] +Description=swaylock - Screen locker for Wayland +Documentation=man:swaylock(1) + +[Service] +Type=forking +ExecStart=/usr/bin/swaylock -f +Restart=on-failure + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/wayland-session.target b/config/systemd/wayland-session.target new file mode 100644 index 0000000..d0b2888 --- /dev/null +++ b/config/systemd/wayland-session.target @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is inspired from systemd's `graphical-session.target` +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Current wayland user session +Documentation=man:systemd.special(7) +Requires=basic.target +RefuseManualStart=yes +StopWhenUnneeded=yes +BindsTo=graphical-session.target diff --git a/config/waybar/config b/config/waybar/config new file mode 100644 index 0000000..8b81d45 --- /dev/null +++ b/config/waybar/config @@ -0,0 +1,95 @@ +{ + "layer": "top", + "position": "bottom", + "height": 24, + "modules-left": ["sway/workspaces", "idle_inhibitor", "sway/mode"], + "modules-center": ["sway/window"], + "modules-right": [ "pulseaudio", "backlight", "network", "cpu", "memory", "battery#bat0", "battery#bat1", + "tray", "sway/language", "clock" ], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{index} {name}" + }, + "sway/mode": { + "format": "{}" + }, + "sway/language": { + "format": "{}", + "max-length": 50 + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "tooltip-format": "{:%A\n%d %B %Y\n%H:%M}", + "format": "{:%a %d %b %H:%M}", + "format-alt": "{:%H:%M}" + }, + "cpu": { + "format": "{usage:2}% ī‹›" + }, + "memory": { + "format": "{}% īƒ‰" + }, + "battery#bat0": { + "bat": "BAT0", + "name": "BAT0", + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}", + "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] + }, + "battery#bat1": { + "bat": "BAT1", + "name": "BAT1", + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}", + "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] + }, + "network": { + "interval": 1, + "max-width": 50, + // "interface": "wlp2s0", // (Optional) To force the use of this interface + "format-wifi": "ī‡Ģ", + "format-ethernet": "{bandwidthUpBits} {bandwidthDownBits} īƒ", + "format-disconnected": "⚠", + "tooltip-format-wifi": "ī‡Ģ {essid}: {frequency}Mhz ({signalStrength}%)\n{bandwidthUpBits}\n{bandwidthDownBits}", + "tooltip-format-ethernet": "īƒ {ifname}: {ipaddr}/{cidr}", + "tooltip-format-disconnected": "⚠ Disconnected" + }, + "pulseaudio": { + //"scroll-step": 1, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}īŠ”", + "format-muted": "ī€Ļ", + "format-icons": { + "headphones": "ī€Ĩ", + "handsfree": "ī–", + "headset": "ī–", + "phone": "ī‚•", + "portable": "ī‚•", + "car": "ī†š", + "default": ["ī€§", "ī€¨"] + }, + "on-click": "pavucontrol" + }, + "backlight": { + "device": "intel_backlight", + "format": "{percent}% {icon}", + "format-icons": ["ī†…", "ī„‘"] + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "īŽ", + "deactivated": "ī°" + } + } +} diff --git a/config/waybar/style.css b/config/waybar/style.css new file mode 100644 index 0000000..f9db8d2 --- /dev/null +++ b/config/waybar/style.css @@ -0,0 +1,213 @@ +* { + border: none; + border-radius: 0; + font-family: Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + min-height: 0; +} + +window#waybar { + background-color: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid rgba(100, 114, 125, 0.5); + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + +/* +window#waybar.empty { + background-color: transparent; +} +window#waybar.solo { + background-color: #FFFFFF; +} +*/ + +window#waybar.termite { + background-color: #3F3F3F; +} + +window#waybar.chromium { + background-color: #000000; + border: none; +} + +#workspaces button { + padding: 0 5px; + background-color: transparent; + color: #ffffff; + border-bottom: 3px solid transparent; +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +#workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + box-shadow: inherit; + border-bottom: 3px solid #ffffff; +} + +#workspaces button.focused { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#workspaces button.urgent { + background-color: #eb4d4b; +} + +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#cpu, +#memory, +#temperature, +#backlight, +#network, +#pulseaudio, +#custom-media, +#tray, +#mode, +#idle_inhibitor { + padding: 0 10px; + margin: 0 4px; + color: #ffffff; +} + +#clock { + padding: 0 10px; + color: #ffffff; + background-color: #64727D; +} + +#battery .BAT0 { + margin-left: 9px; +} +#battery .BAT1 { + margin-right: 9px; +} +#battery { + padding: 0 10px; + background-color: #ffffff; + color: #000000; +} + +#battery.charging { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#cpu { + background-color: #2ecc71; + color: #000000; +} + +#memory { + background-color: #9b59b6; +} + +#backlight { + background-color: #90b1b1; +} + +#network { + background-color: #2980b9; +} + +#network.disconnected { + background-color: #f53c3c; +} + +#pulseaudio { + background-color: #f1c40f; + color: #000000; +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +#custom-media { + background-color: #66cc99; + color: #2a5c45; + min-width: 100px; +} + +#custom-media.custom-spotify { + background-color: #66cc99; +} + +#custom-media.custom-vlc { + background-color: #ffa000; +} + +#temperature { + background-color: #f0932b; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #2980b9; +} + +#idle_inhibitor { + background-color: #2d3436; +} + +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; +} + +#mpd { + background-color: #66cc99; + color: #2a5c45; +} + +#mpd.disconnected { + background-color: #f53c3c; +} + +#mpd.stopped { + background-color: #90b1b1; +} + +#mpd.paused { + background-color: #51a37a; +} +#custom-layout { + background-color: #ecf0f1; + color: #2d3436; + min-width: 2em; +} + diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml deleted file mode 100644 index d8aae02..0000000 --- a/pitti-desktop.yaml +++ /dev/null @@ -1,147 +0,0 @@ -include: fedora-common-ostree.yaml - -ref: pitti-desktop -rojig: - name: pitti-desktop - summary: "Pitti Desktop" - license: MIT - -repos: - - fedora-34 - - fedora-34-updates - - fedora-34-updates-testing - - rpmfusion-free - - rpmfusion-free-updates - -packages: -# hardware/drivers - - kernel - - kernel-modules-extra - - iwl6000g2a-firmware - - iwl7260-firmware - - alsa-sof-firmware - - NetworkManager-wifi - - NetworkManager-openvpn-gnome - - sane-backends - - sane-backends-drivers-scanners - - powertop - - iwd - - wpa_supplicant - - udisks2-lvm2 - - opensc -# basic system - - acl - - attr - - basesystem - - cryptsetup - - dnsmasq - - fedora-workstation-backgrounds - - filesystem - - glibc-langpack-de - - glibc-langpack-en - - hostname - - iproute - - kbd - - nss-altfiles - - pciutils - # don't care, but rpm-ostree build fails otherwise - - selinux-policy-targeted - - sudo - - usbutils -# shell tools and development - - bc - - gnupg2 - - fpaste - - lsof - - man-db - - mtr - - tree - - bzip2 - - zip - - unzip - - vim-enhanced - - ranger - - bash-completion - - fish - - qemu-system-x86-core - - qemu-ui-sdl - - qemu-img - - openvpn - - mutt - - nmap-ncat - - isync - - weechat - - duplicity - - openssh-server - - systemd-container - - git - - patchutils - - make - - strace - - wget - - w3m - - cockpit-system - - cockpit-ws - - syncthing - - krb5-workstation - -# desktop plumbing/apps - - dejavu-sans-fonts - - dejavu-serif-fonts - - dejavu-sans-mono-fonts - - fontawesome-fonts - - google-noto-emoji-color-fonts - - - gvfs-mtp - - pulseaudio-utils - - alsa-plugins-pulseaudio - - gstreamer1-plugins-good - - gstreamer1-plugins-ugly - - gstreamer1-libav - # for wf-recorder - - libavdevice - - xdg-desktop-portal-gtk - - - pavucontrol - - pcmanfm - - simple-scan - - nm-connection-editor - - eog - - evince - - rhythmbox - - gnome-keyring - - pinentry-gnome3 - - lxpolkit - - lxterminal - - gnome-disk-utility - - gtimelog - - rofimoji - -# sway/wayland desktop - - sway - - swayidle - - swaylock - - kanshi - - mako - - waybar - - slurp - - grim - - xorg-x11-server-Xwayland - - firefox-wayland - - wofi - - brightnessctl - - wl-clipboard - -exclude-packages: - # recommended by sway - - alacritty - - brltty - - glibc-all-langpacks - - xdg-desktop-portal-wlr - # recommended by gtimelog - - yelp - -add-files: - - ["2015-RH-IT-Root-CA.pem", "/etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem"] - -postprocess-script: pitti-post.sh diff --git a/pitti-post.sh b/pitti-post.sh deleted file mode 100755 index 1a4032c..0000000 --- a/pitti-post.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env bash -set -xeuo pipefail - -# Enable SysRQ -echo 'kernel.sysrq = 1' > /usr/lib/sysctl.d/90-sysrq.conf - -# power saving -echo 'blacklist e1000e' > /usr/lib/modprobe.d/blacklist-local.conf - -# NetworkManager config -cat < /usr/lib/NetworkManager/conf.d/local.conf -[main] -plugins= - -[device] -#wifi.backend=iwd -EOF -#ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service - -ln -sfn /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf - -# set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) -patch /etc/pam.d/system-auth < /etc/systemd.journald.conf.new mv /etc/systemd.journald.conf{.new,} fi @@ -22,6 +25,7 @@ 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 diff --git a/x1-gen7-sway-desktop.yaml b/x1-gen7-sway-desktop.yaml new file mode 100644 index 0000000..9066bad --- /dev/null +++ b/x1-gen7-sway-desktop.yaml @@ -0,0 +1,156 @@ +include: fedora-common-ostree.yaml + +ref: x1-gen7-sway-desktop +rojig: + name: x1-gen7-sway-desktop + summary: "Thinkpad X1 Gen 7 Sway Desktop" + license: MIT + +repos: + - fedora-34 + - fedora-34-updates + - fedora-34-updates-testing + - rpmfusion-free + - rpmfusion-free-updates + +packages: +# hardware / drivers + - alsa-sof-firmware + - fwupd + - iwl6000g2a-firmware + - iwl7260-firmware + - kernel + - kernel-modules-extra + - libva-intel-driver + - libva-intel-hybrid-driver + - opensc + - udisks2-lvm2 +# basic system + - acl + - attr + - basesystem + - coreutils + - 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 +# diagnostic / utils + - bind-utils + - htop + - iotop + - iproute + - lm_sensors + - lsof + - mtr + - net-tools + - nmap-ncat + - pciutils + - powertop +# alternative modern rust apps + - bat + - ripgrep +# wifi + - iwd + - NetworkManager + - network-manager-applet + - wpa_supplicant +# shell tools and development + - alacritty + - bash-completion + - bc + - bzip2 + - emacs + - git + - gnupg2 + - 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 + - fontawesome-fonts + - google-noto-emoji-color-fonts +# audio / video + - alsa-plugins-pulseaudio + - ffmpeg + - gstreamer1-libav + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly + - gvfs-mtp + - libavdevice + - libva + - libva-utils + - pavucontrol + - pulseaudio-utils + - vlc +# misc + - okular + - redshift + - xdg-desktop-portal-gtk +# sway / wayland desktop + - brightnessctl + - firefox-wayland + - grim + - i3status-rs + - kanshi + - mako + - slurp + - sway + - swayidle + - swaylock + - waybar + - wl-clipboard + - wofi +# 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 + +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"] From a3833e591ff04ae941310b3ccf50bc0737a21dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sun, 20 Jun 2021 11:38:41 +0200 Subject: [PATCH 051/113] comps-sync rawhide 2021-06-20 --- fedora-common-ostree-pkgs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 90eb721..52af4ab 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -189,6 +189,7 @@ packages: - system-config-printer-udev - systemd - systemd-oomd-defaults + - systemd-resolved - systemd-udev - tar - thai-scalable-waree-fonts From f53ee393aab15c4f536e125f92c61509e6536cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 6 Jul 2021 17:21:26 +0200 Subject: [PATCH 052/113] comps-sync rawhide 2021-07-06 --- fedora-common-ostree-pkgs.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 52af4ab..4100f71 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -35,6 +35,7 @@ packages: - cups-filters - curl - cyrus-sasl-plain + - default-editor - dejavu-sans-fonts - dejavu-sans-mono-fonts - dejavu-serif-fonts @@ -78,7 +79,7 @@ packages: - ibus-m17n - ibus-typing-booster - iproute - - iptables + - iptables-nft - iptstate - iputils - ipw2100-firmware @@ -132,8 +133,6 @@ packages: - mlocate - mpage - mtr - - nano - - nano-default-editor - nfs-utils - nss-altfiles - nss-mdns From 4ff0f23a8b8f8e7e02f4c644d095d7a76664c612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 2 Aug 2021 13:45:20 +0200 Subject: [PATCH 053/113] comps-sync rawhide 2021-08-02 --- fedora-common-ostree-pkgs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 4100f71..6a01d5a 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -158,7 +158,6 @@ packages: - policycoreutils-python-utils - procps-ng - psmisc - - pt-sans-fonts - qemu-guest-agent - qt5-qtbase - qt5-qtbase-gui From 2852268aabec530224988e1330dc0328d737b1cd Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 14:23:18 +0200 Subject: [PATCH 054/113] Rawhide is now f36 Signed-off-by: Tomas Hrcka --- comps-sync.py | 2 +- fedora-common-ostree.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/comps-sync.py b/comps-sync.py index aea3449..6474b1d 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Usage: ./comps-sync.py /path/to/comps-f35.xml.in +# Usage: ./comps-sync.py /path/to/comps-f36.xml.in # # Can both remove packages from the manifest # which are not mentioned in comps, and add packages from diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index a861128..7d7a891 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,7 @@ ref: fedora/rawhide/${basearch}/ostree-base -automatic_version_prefix: "35" -mutate-os-release: "35" +automatic_version_prefix: "36" +mutate-os-release: "36" include: fedora-common-ostree-pkgs.yaml From d82eefe7c306abdda4c91208c21100e756cef90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 19 Aug 2021 12:06:57 +0200 Subject: [PATCH 055/113] Revert "Use sqlite instead of bdb for rpmdb" This is now the default for rpm-ostree in F34+. This reverts commit a2743ec5de29446e66672d6283696e7beaa2dbbb. --- fedora-common-ostree.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 7d7a891..902ea8f 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -40,9 +40,6 @@ 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: From 66ba0e109ff0757b4a426e8c42b9968ec0b2ad9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 24 Aug 2021 17:35:20 +0200 Subject: [PATCH 056/113] Remove fedora-release-ostree-counting from manifests See https://src.fedoraproject.org/rpms/fedora-release/pull-request/199 --- fedora-base.yaml | 3 +-- fedora-deepin.yaml | 3 +-- fedora-lxqt.yaml | 3 +-- fedora-mate.yaml | 3 +-- fedora-pantheon.yaml | 3 +-- fedora-xfce.yaml | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/fedora-base.yaml b/fedora-base.yaml index 55a4c75..9c7f93e 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -5,10 +5,9 @@ rojig: summary: "Fedora base image for alternative DE" license: MIT packages: - # Generic release packages for desktop variants and counting + # Generic release package for desktop variants - fedora-release - fedora-release-ostree-desktop - - fedora-release-ostree-counting # XWayland support - xorg-x11-server-Xwayland # Portals for Flatpak diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index ff49255..f59a315 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -5,10 +5,9 @@ rojig: summary: "Fedora Deepin base image" license: MIT packages: - # Generic release packages for desktop variants and counting + # Generic release package for desktop variants - fedora-release - fedora-release-ostree-desktop - - fedora-release-ostree-counting # GUI to manage updates & Flatpaks - gnome-software diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 5c5e713..e9affc8 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -5,10 +5,9 @@ rojig: summary: "Fedora LXQt base image" license: MIT packages: - # Generic release packages for desktop variants and counting + # Generic release package for desktop variants - fedora-release - fedora-release-ostree-desktop - - fedora-release-ostree-counting - libqtxdg # Portals for Flatpak - xdg-desktop-portal-kde diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 26091d5..4360ef1 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -6,9 +6,8 @@ rojig: license: MIT packages: - fedora-release-matecompiz - # Generic release sub packages for desktop variants and counting + # Generic release sub package for desktop variants - fedora-release-ostree-desktop - - fedora-release-ostree-counting # Portals for Flatpak - xdg-desktop-portal-gtk diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index b887b98..af4ab1b 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -5,10 +5,9 @@ rojig: summary: "Fedora Pantheon base image" license: MIT packages: - # Generic release packages for desktop variants and counting + # Generic release package for desktop variants - fedora-release - fedora-release-ostree-desktop - - fedora-release-ostree-counting repos: - fedora-rawhide diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 33ac52e..8a756a4 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -6,9 +6,8 @@ rojig: license: MIT packages: - fedora-release-xfce - # Generic release sub packages for desktop variants and counting + # Generic release sub package for desktop variants - fedora-release-ostree-desktop - - fedora-release-ostree-counting # Portals for Flatpak - xdg-desktop-portal-gtk repos: From 72a325f103eeb877a9d65dd1b9371f33fc758395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 23 Aug 2021 16:12:48 +0200 Subject: [PATCH 057/113] comps-sync rawhide 2021-08-23 --- gnome-desktop-pkgs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index 4a2901b..2bdddeb 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -23,6 +23,7 @@ packages: - gnome-bluetooth - gnome-classic-session - gnome-color-manager + - gnome-connections - gnome-control-center - gnome-disk-utility - gnome-initial-setup From 193646a75e5fbbfc2de2df55ca5f2f654aea070a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 28 Sep 2021 14:08:02 +0200 Subject: [PATCH 058/113] Mate: Ignore wireplubmer and use release package from comps --- comps-sync-exclude-list.yml | 4 ++-- fedora-mate.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 1f73e12..f52f7a8 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -262,5 +262,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 diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 4360ef1..a3ae8f5 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -5,7 +5,6 @@ rojig: summary: "Fedora Mate base image" license: MIT packages: - - fedora-release-matecompiz # Generic release sub package for desktop variants - fedora-release-ostree-desktop # Portals for Flatpak From 896b292752c7c71f119c460b36ac677c710195d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 28 Sep 2021 14:08:13 +0200 Subject: [PATCH 059/113] comps-sync f35 2021-09-28 --- fedora-common-ostree-pkgs.yaml | 1 + mate-desktop-pkgs.yaml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 6a01d5a..9c675f0 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -201,6 +201,7 @@ packages: - vim-minimal - wget - which + - wireplumber - words - wpa_supplicant - xorg-x11-drv-amdgpu diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index cadcaad..45c141b 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -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 From bcc49ab09c8b8486facdd1ea0afcb80bffc0b772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 4 Oct 2021 10:45:04 +0200 Subject: [PATCH 060/113] Silverblue: Exclude GNOME Connections Remove GNOME Connections as it not a core app and is available as Flatpak. This was added by mistake via a previous comps-sync as it was included in the default Workstation installation. See: - https://pagure.io/fedora-comps/c/29839a7651f41d4ffcec65062e2a500d17dac4fe?branch=main - https://pagure.io/workstation-ostree-config/c/72a325f103eeb877a9d65dd1b9371f33fc758395?branch=main --- comps-sync-exclude-list.yml | 1 + gnome-desktop-pkgs.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index f52f7a8..b369b08 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -147,6 +147,7 @@ desktop_exclude_list: - gnome-calendar - gnome-characters - gnome-clocks + - gnome-connections - gnome-contacts - gnome-documents - gnome-font-viewer diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index 2bdddeb..4a2901b 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -23,7 +23,6 @@ packages: - gnome-bluetooth - gnome-classic-session - gnome-color-manager - - gnome-connections - gnome-control-center - gnome-disk-utility - gnome-initial-setup From 58eba545677eabff938070f397113e7b94000f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sat, 9 Oct 2021 17:19:49 +0200 Subject: [PATCH 061/113] comps-sync rawhide 2021-10-09 --- fedora-common-ostree-pkgs.yaml | 1 + gnome-desktop-pkgs.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 9c675f0..f8492a7 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -100,6 +100,7 @@ packages: - iwl6000g2b-firmware - iwl6050-firmware - iwl7260-firmware + - iwlax2xx-firmware - jomolhari-fonts - kbd - kernel diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index 4a2901b..5200e7a 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -59,6 +59,7 @@ packages: - tracker - tracker-miners - xdg-desktop-portal + - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - xdg-user-dirs-gtk - yelp From 167a5f00974677dcc1e74f8ef7438730e45385cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 11 Oct 2021 13:06:47 +0200 Subject: [PATCH 062/113] fedora-common-ostree: Minor cosmetic fix --- fedora-common-ostree.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 902ea8f..3fa8ab0 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -46,8 +46,12 @@ 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 From 048502f488b917abd6d7bf680f6fb0711d5137a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 15 Nov 2021 20:07:38 +0100 Subject: [PATCH 063/113] Kinoite: Keep kde-partitionmanager Re-add kde-partitionmanager to the base image until we have it available as a Flatpak. See: https://pagure.io/fedora-kde/SIG/issue/131 --- comps-sync-exclude-list.yml | 1 - kde-desktop-pkgs.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index b369b08..fb3bc22 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -182,7 +182,6 @@ desktop_exclude_list: - kcalc - kcharselect - kcolorchooser - - kde-partitionmanager - kdnssd - kf5-kipi-plugins - kfind diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 760d141..3f21f97 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -10,6 +10,7 @@ packages: - gnome-keyring-pam - initial-setup-gui - kde-gtk-config + - kde-partitionmanager - kde-print-manager - kde-settings-pulseaudio - kdegraphics-thumbnailers From 61b9bf48022629bd313e4232dad3e16cc3caafe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 15 Nov 2021 19:18:17 +0100 Subject: [PATCH 064/113] Kinoite: Exclude plasma-pk-updates plasma-pk-updates is only useful with PackageKit and thus not needed on Kinoite. --- comps-sync-exclude-list.yml | 1 + fedora-kinoite.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index fb3bc22..92636ab 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -172,6 +172,7 @@ desktop_exclude_list: - abrt-desktop - cups-pk-helper - dnfdragora + - plasma-pk-updates # Non-critical apps -> Flatpak - akregator - cagibi diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index d709c52..895390c 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -20,6 +20,7 @@ packages: exclude-packages: - plasma-discover-offline-updates - plasma-discover-packagekit + - plasma-pk-updates repos: - fedora-rawhide From 30e1bff8946aa6b2db1f0ecdd353c3e7bd6d0f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 22 Oct 2021 11:45:44 +0200 Subject: [PATCH 065/113] comps-sync f35 2021-11-15 --- kde-desktop-pkgs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 3f21f97..6c48e82 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -59,4 +59,5 @@ packages: - sddm-breeze - sddm-kcm - spectacle + - xdg-desktop-portal-gnome - xorg-x11-drv-libinput From b3d1fa19873b16044b5354117ccb90139faa4499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 18 Nov 2021 17:37:22 +0100 Subject: [PATCH 066/113] README: General update --- README.md | 148 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 31f49b8..4efe7b2 100644 --- a/README.md +++ b/README.md @@ -1,73 +1,81 @@ +# Manifests for rpm-ostree based Fedora variants + +This is the configuration needed to create +[rpm-ostree](https://coreos.github.io/rpm-ostree/) based variants of Fedora. +Each variant is described in a YAML +[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by +rpm-ostree to compose an ostree commit with the package requested. + +In the Fedora infrastructure, this happens via +[pungi](https://pagure.io/pungi-fedora) with +[Lorax](https://github.com/weldr/lorax) +([templates](https://pagure.io/fedora-lorax-templates)). + +## Fedora Silverblue + +- Website: https://silverblue.fedoraproject.org/ ([sources](https://github.com/fedora-silverblue/silverblue-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-silverblue/ ([sources](https://github.com/fedora-silverblue/silverblue-docs)) +- Issue tracker: https://github.com/fedora-silverblue/issue-tracker/issues + +## Fedora Kinoite + +- Website: https://kinoite.fedoraproject.org/ ([sources](https://pagure.io/fedora-kde/kinoite-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-kinoite/ ([sources](https://pagure.io/fedora-kde/kinoite-docs)) +- Issue tracker: https://pagure.io/fedora-kde/SIG/issues + +## Building + +Instructions to perform a local build of Silverblue: + +``` +# Clone the config +git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config + +# Prepare repo & cache +mkdir -p repo cache && ostree --repo=repo init --mode=archive + +# Build (compose) the variant of your choice +sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml + +# Update summary file +ostree summary --repo=repo --update +``` + +## Testing + +Instructions to test the resulting build: + +- First, serve the ostree repo using an HTTP server. +- Then, on an already installed Silverblue system: + +``` +# Add an ostree remote +sudo ostree remote add testremote http:///repo + +# Pin the currently deployed (and probably working) version +sudo ostree admin pin 0 + +# List refs from variant remote +sudo ostree remote refs testremote + +# Switch to your variant +sudo rpm-ostree rebase testremote:fedora/35/x86_64/silverblue +``` + +## Historical references + +Building and testing instructions: + +- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/ +- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/ +- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/ +- https://www.projectatomic.io/docs/compose-your-own-tree/ + For some background, see: - - https://fedoraproject.org/wiki/Workstation/AtomicWorkstation - - https://fedoraproject.org/wiki/Changes/WorkstationOstree - -(Note also this repo obsoletes https://pagure.io/atomic-ws) +- +- +- +- -High level design ------------------ - -The goal of the system is to be a workstation, using -rpm-ostree for the base OS, and a combination of -Docker and Flatpak containers, as well as virtualization -tools such as Vagrant. - -Status ------- - -This project is actively maintained and is ready for use -by sophisticated and interested users, but not ready -for widespread promotion. - -See some [https://lists.fedoraproject.org/archives/list/desktop@lists.fedoraproject.org/thread/J6BJS7Z4NKNOQUZWGYXZZIEKYMWBBSUY/](discussion about the first release). - -Installing ------------- - -See the Silverblue documentation at -https://docs.fedoraproject.org/en-US/fedora-silverblue/installation-guide/. -There's also a guide for installing inside an existing system: -https://docs.fedoraproject.org/en-US/fedora-silverblue/installation-dual-boot/. - -Important issues: ------------------------ - - - [flatpak system repo](https://github.com/flatpak/flatpak/issues/113#issuecomment-247022006) - -Using the system --------------------- - -One of the first things you should do use is use a container runtime of your -choice to manage one or more "pet" containers. This is where you will use -`yum/dnf` to install utilities. - -With `docker` for example, you can use the `-v /srv:/srv` command line option so -these containers can share content with your host (such as git repositories). -Note that if you want to share content between multiple Docker containers and -the host (e.g. your desktop session), you should execute (once): - -``` -sudo chcon -R -h -t container_file_t /var/srv -``` - -Next, let's try flatpak. Before you do: There's a known flatpak issue on -AtomicWS - run [this workaround](https://github.com/flatpak/flatpak/issues/113#issuecomment-247022006), -which you only need to do once. After that, [try flatpak](http://flatpak.org/apps.html). - -If you are a developer for server applications, -try [oc cluster up](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) to -create a local OpenShift v3 cluster. - -Finally, try out `rpm-ostree install` to layer additional packages directly on -the host. This is needed for "host extensions" - privileged software that -doesn't make sense to live in a container. For example, `rpm-ostree install -powerline` to use that software for the shell prompts of the host. Another -good example is `rpm-ostree install vagrant-libvirt` to use [Vagrant](https://www.vagrantup.com/) -to manage VMs. - -Future work ------------ - - - GNOME Software support for both rpm-ostree/flatpak and possibly docker - - automated tests that run on this content +Note also this repo obsoletes https://pagure.io/atomic-ws From 487891c21f3f8f88685f2231494bf946bf8c36ce Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 3 Dec 2021 11:22:03 -0800 Subject: [PATCH 067/113] Drop ipw2100-firmware and ipw2200-firmware (retired) These packages were retired today as part of https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions . Them being listed in the manifest breaks the ostree compose: https://kojipkgs.fedoraproject.org/compose/rawhide/Fedora-Rawhide-20211203.n.0/logs/x86_64/Silverblue/ostree-4/create-ostree-repo.log Signed-off-by: Adam Williamson --- fedora-common-ostree-pkgs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index f8492a7..b3aeb31 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -82,8 +82,6 @@ packages: - iptables-nft - iptstate - iputils - - ipw2100-firmware - - ipw2200-firmware - iwl100-firmware - iwl1000-firmware - iwl105-firmware From 9ae2a6a5343f22fc4b2cdf3524c74a334f4ab661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 16 Dec 2021 11:39:31 +0100 Subject: [PATCH 068/113] LICENSE: Add MIT license text --- LICENSE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7f8f94e --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 387ad78e4ffdc2bee7b751bd7b73a3e41988286f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 13 Dec 2021 20:07:50 +0100 Subject: [PATCH 069/113] comps-sync f36 2021-12-13 https://pagure.io/fedora-comps/c/122cc1d1e51b3272207793672aded2b53835d1b7?branch=main https://pagure.io/fedora-comps/c/15a2b896371eb78ec2ecbafb6fe76a632c0bf58a?branch=main --- fedora-common-ostree-pkgs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index b3aeb31..83186bc 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -61,7 +61,7 @@ packages: - gnupg2 - google-noto-emoji-color-fonts - google-noto-sans-cjk-ttc-fonts - - google-noto-sans-gurmukhi-fonts + - google-noto-sans-gurmukhi-vf-fonts - google-noto-sans-sinhala-vf-fonts - gstreamer1-plugins-bad-free - gstreamer1-plugins-good @@ -129,7 +129,6 @@ packages: - mdadm - mesa-dri-drivers - mesa-vulkan-drivers - - mlocate - mpage - mtr - nfs-utils @@ -151,6 +150,7 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils + - plocate - plymouth - plymouth-system-theme - policycoreutils From 635f72795a13b475b4d85cc22a0ea713322702fb Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 12 Jan 2022 16:56:00 -0500 Subject: [PATCH 070/113] post.sh: stop disabling modular repos rpm-ostree understands modules now so it's safe to leave it enabled. FCOS equivalent: https://github.com/coreos/fedora-coreos-config/pull/1191 --- post.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/post.sh b/post.sh index 39db86f..77c5977 100755 --- a/post.sh +++ b/post.sh @@ -5,11 +5,6 @@ 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 - # 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 From c5edd168e1dae56f0853d0b4b1d315d9c90b832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 21 Jan 2022 11:29:47 +0100 Subject: [PATCH 071/113] post.sh: Update persistent journal workaround Add a systemd configuration drop-in instead of modyfing the default configuration file. Imported from: https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf --- post.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/post.sh b/post.sh index 77c5977..a09d851 100755 --- a/post.sh +++ b/post.sh @@ -6,11 +6,9 @@ set -xeuo pipefail # 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 - (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new - mv /etc/systemd.journald.conf{.new,} -fi +# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf +install -dm0755 /usr/lib/systemd/journald.conf.d/ +echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 # Basically that program handles deleting old shared library directories From eb48de275c7c8c464a06a83fff8fe6e81961feec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sat, 9 Oct 2021 16:31:03 +0200 Subject: [PATCH 072/113] fedora-common-ostree: Move post script inline This was difficult with the JSON based manifests but is now easy with the YAML ones. --- fedora-common-ostree.yaml | 22 ++++++++++++++++++++-- post.sh | 21 --------------------- 2 files changed, 20 insertions(+), 23 deletions(-) delete mode 100755 post.sh diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 3fa8ab0..3699e5d 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -40,8 +40,6 @@ etc-group-members: - wheel tmp-is-dir: true -postprocess-script: post.sh - ignore-removed-users: - root ignore-removed-groups: @@ -96,3 +94,23 @@ exclude-packages: - gstreamer1-plugin-openh264 - mozilla-openh264 - openh264 + +postprocess: + - | + #!/usr/bin/env bash + set -xeuo pipefail + + # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 + # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf + install -dm0755 /usr/lib/systemd/journald.conf.d/ + echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf + + # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 + # Basically that program handles deleting old shared library directories + # 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 + if test -f ${x}; then + ln -srf /usr/bin/true ${x} + fi + done diff --git a/post.sh b/post.sh deleted file mode 100755 index a09d851..0000000 --- a/post.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -# This file is very similar to treecompose-post.sh -# from fedora-atomic: https://pagure.io/fedora-atomic -# Make changes there first where applicable. - -set -xeuo pipefail - -# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 -# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf -install -dm0755 /usr/lib/systemd/journald.conf.d/ -echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf - -# See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 -# Basically that program handles deleting old shared library directories -# 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 - if test -f ${x}; then - ln -srf /usr/bin/true ${x} - fi -done From b550a02c83d36faeea3c9f9ccacd0497b4b718df Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 8 Feb 2022 13:53:53 +0100 Subject: [PATCH 073/113] Branch F36 from rawhide Signed-off-by: Tomas Hrcka --- config.ini | 4 ++-- fedora-36-updates.repo | 7 +++++++ fedora-36.repo | 7 +++++++ fedora-base.yaml | 4 ++-- fedora-common-ostree.yaml | 2 +- fedora-deepin.yaml | 4 ++-- fedora-kinoite.yaml | 4 ++-- fedora-lxqt.yaml | 4 ++-- fedora-mate.yaml | 4 ++-- fedora-pantheon.yaml | 4 ++-- fedora-rawhide.repo | 7 ------- fedora-silverblue.yaml | 4 ++-- fedora-xfce.yaml | 4 ++-- 13 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 fedora-36-updates.repo create mode 100644 fedora-36.repo delete mode 100644 fedora-rawhide.repo diff --git a/config.ini b/config.ini index 35a9cc7..4a7200f 100644 --- a/config.ini +++ b/config.ini @@ -10,10 +10,10 @@ os_pretty_name = Fedora ostree Workstation tree_name = workstation tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 -release = rawhide +release = 36 ref = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s # Force use of a closeish and fastish HTTP mirror, so that the HTTP proxy works -yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/ +yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/36/Everything/%(arch)s/os/ # lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides # lorax_include_packages = fedora-productimg-atomic docker_os_name = fedora diff --git a/fedora-36-updates.repo b/fedora-36-updates.repo new file mode 100644 index 0000000..65430f6 --- /dev/null +++ b/fedora-36-updates.repo @@ -0,0 +1,7 @@ +[fedora-36-updates] +name=Fedora 36 $basearch Updates +#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f36&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d diff --git a/fedora-36.repo b/fedora-36.repo new file mode 100644 index 0000000..ff715d3 --- /dev/null +++ b/fedora-36.repo @@ -0,0 +1,7 @@ +[fedora-36] +name=Fedora 36 $basearch +#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d diff --git a/fedora-base.yaml b/fedora-base.yaml index 9c7f93e..a64da3b 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -1,5 +1,5 @@ include: fedora-common-ostree.yaml -ref: fedora/rawhide/${basearch}/base +ref: fedora/36/${basearch}/base rojig: name: fedora-base summary: "Fedora base image for alternative DE" @@ -15,4 +15,4 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 3699e5d..628ced3 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,4 +1,4 @@ -ref: fedora/rawhide/${basearch}/ostree-base +ref: fedora/36/${basearch}/ostree-base automatic_version_prefix: "36" mutate-os-release: "36" diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index f59a315..438df5d 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -1,5 +1,5 @@ include: deepin-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/deepin +ref: fedora/36/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -12,4 +12,4 @@ packages: - gnome-software repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 895390c..21cd401 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,5 +1,5 @@ include: kde-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/kinoite +ref: fedora/36/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" @@ -23,4 +23,4 @@ exclude-packages: - plasma-pk-updates repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index e9affc8..54e39f4 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -1,5 +1,5 @@ include: lxqt-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/lxqt +ref: fedora/36/${basearch}/lxqt rojig: name: fedora-lxqt summary: "Fedora LXQt base image" @@ -13,4 +13,4 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-mate.yaml b/fedora-mate.yaml index a3ae8f5..d3d5b3f 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -1,5 +1,5 @@ include: mate-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/mate +ref: fedora/36/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -14,4 +14,4 @@ exclude-packages: - python3-unbound repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index af4ab1b..04657e7 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -1,5 +1,5 @@ include: pantheon-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/pantheon +ref: fedora/36/${basearch}/pantheon rojig: name: fedora-pantheon summary: "Fedora Pantheon base image" @@ -10,4 +10,4 @@ packages: - fedora-release-ostree-desktop repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo deleted file mode 100644 index 5881c94..0000000 --- a/fedora-rawhide.repo +++ /dev/null @@ -1,7 +0,0 @@ -[fedora-rawhide] -name=Fedora rawhide $basearch -#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=0 -gpgcheck=0 -metadata_expire=1d diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 0819c10..78315c7 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,5 +1,5 @@ include: gnome-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/silverblue +ref: fedora/36/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -23,4 +23,4 @@ packages: - totem-video-thumbnailer repos: - - fedora-rawhide + - fedora-36 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 8a756a4..c22f7c2 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -1,5 +1,5 @@ include: xfce-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/xfce +ref: fedora/36/${basearch}/xfce rojig: name: fedora-xfce summary: "Fedora XFCE base image" @@ -11,4 +11,4 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk repos: - - fedora-rawhide + - fedora-36 From 2e86d085a6e6502fd58fe2f602c19ca2d686396e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 8 Feb 2022 10:13:16 -0800 Subject: [PATCH 074/113] comps-sync f36 2022-02-08 Font changes related to https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts , and gedit replaced with gnome-text-editor (so changed the exclusion list). Signed-off-by: Adam Williamson --- comps-sync-exclude-list.yml | 2 +- fedora-common-ostree-pkgs.yaml | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 92636ab..f2e053b 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -141,7 +141,6 @@ desktop_exclude_list: - evince-nautilus - file-roller - file-roller-nautilus - - gedit - gnome-boxes - gnome-calculator - gnome-calendar @@ -155,6 +154,7 @@ desktop_exclude_list: - gnome-maps - gnome-photos - gnome-screenshot + - gnome-text-editor - gnome-weather - jwhois - rdist diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 83186bc..e339121 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -5,7 +5,7 @@ packages: - NetworkManager-config-connectivity-fedora - NetworkManager-wifi - NetworkManager-wwan - - abattis-cantarell-fonts + - abattis-cantarell-vf-fonts - acl - adwaita-qt5 - alsa-sof-firmware @@ -60,9 +60,22 @@ packages: - glx-utils - gnupg2 - google-noto-emoji-color-fonts + - google-noto-sans-arabic-vf-fonts + - google-noto-sans-armenian-vf-fonts + - google-noto-sans-canadian-aboriginal-vf-fonts + - google-noto-sans-cherokee-vf-fonts - google-noto-sans-cjk-ttc-fonts + - google-noto-sans-ethiopic-vf-fonts + - google-noto-sans-georgian-vf-fonts - google-noto-sans-gurmukhi-vf-fonts + - google-noto-sans-hebrew-vf-fonts + - google-noto-sans-lao-vf-fonts + - google-noto-sans-math-vf-fonts + - google-noto-sans-mono-vf-fonts - google-noto-sans-sinhala-vf-fonts + - google-noto-sans-thaana-vf-fonts + - google-noto-sans-vf-fonts + - google-noto-serif-vf-fonts - gstreamer1-plugins-bad-free - gstreamer1-plugins-good - gstreamer1-plugins-ugly-free @@ -164,6 +177,7 @@ packages: - qt5-qtxmlpatterns - quota - realmd + - rit-meera-new-fonts - rootfiles - rpm - rsync @@ -171,11 +185,9 @@ packages: - 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 From 1890d13ee5859031200913f9be14f738ec4b64df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 14 Feb 2022 10:05:28 +0100 Subject: [PATCH 075/113] Kinoite: Keep some application until with get Flatpaks Keep some basic application in the base image until we can replace them with Flatpaks. --- fedora-kinoite.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 21cd401..bd64e2f 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -15,6 +15,12 @@ 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: From 16af9adcb80fd2750a0e7cf6aa3cb3d8b9418903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 14 Feb 2022 10:07:52 +0100 Subject: [PATCH 076/113] Kinoite: Temporarily exclude plasma-discover-rpm-ostree Exclude rpm-ostree backend for Discover from the base image as it is still not ready for general consumption. Keep it in Rawhide to help debugging and testing. --- fedora-kinoite.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index bd64e2f..dc8b20d 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -26,6 +26,8 @@ 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: From d70b76520f414947e35ef71dd0b12cc089448336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 11 Feb 2022 15:08:30 +0100 Subject: [PATCH 077/113] repo: Enable fedora-36-updates repo --- fedora-base.yaml | 1 + fedora-deepin.yaml | 1 + fedora-kinoite.yaml | 1 + fedora-lxqt.yaml | 1 + fedora-mate.yaml | 1 + fedora-pantheon.yaml | 1 + fedora-silverblue.yaml | 1 + fedora-xfce.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/fedora-base.yaml b/fedora-base.yaml index a64da3b..860dcaa 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -16,3 +16,4 @@ packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 438df5d..977cbd7 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -13,3 +13,4 @@ packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index dc8b20d..5698321 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -32,3 +32,4 @@ exclude-packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 54e39f4..984ea31 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -14,3 +14,4 @@ packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index d3d5b3f..697d249 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -15,3 +15,4 @@ exclude-packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 04657e7..3601327 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -11,3 +11,4 @@ packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 78315c7..9e36320 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -24,3 +24,4 @@ packages: repos: - fedora-36 + - fedora-36-updates diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index c22f7c2..7405278 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -12,3 +12,4 @@ packages: - xdg-desktop-portal-gtk repos: - fedora-36 + - fedora-36-updates From 6975ed50435281a73cd4b856be8f3a19c644278b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 11 Feb 2022 17:49:33 +0100 Subject: [PATCH 078/113] repo: Remove unused baseurl --- fedora-36-updates.repo | 1 - fedora-36.repo | 1 - 2 files changed, 2 deletions(-) diff --git a/fedora-36-updates.repo b/fedora-36-updates.repo index 65430f6..563c4d5 100644 --- a/fedora-36-updates.repo +++ b/fedora-36-updates.repo @@ -1,6 +1,5 @@ [fedora-36-updates] name=Fedora 36 $basearch Updates -#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f36&arch=$basearch enabled=1 gpgcheck=1 diff --git a/fedora-36.repo b/fedora-36.repo index ff715d3..67918a5 100644 --- a/fedora-36.repo +++ b/fedora-36.repo @@ -1,6 +1,5 @@ [fedora-36] name=Fedora 36 $basearch -#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch enabled=1 gpgcheck=1 From 7c20a9179229dadf7457bc0b471fba4b33414cae Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Thu, 29 Apr 2021 11:11:39 +0200 Subject: [PATCH 079/113] Revert "Add minimal -devel packages as needed to build kernel modules" This reverts commit 31ad6acced8426a374d5af3701d0cfdbf58cb3da. With the addition of the fedora-updates-archive repository to fedora-repos, our concern about not being able to find the correct -devel packages to install have disappeared. Additionally, the kernel now ships -matched versions of its packages (to allow matching headers to the main kernel package) and akmods depends on the matched package, which means that we are sure to get the package we need. See also: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1195 See also: https://src.fedoraproject.org/rpms/akmods/pull-request/3 --- fedora-common-ostree.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 628ced3..b3f15d2 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -20,12 +20,6 @@ packages: # 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 From dbcf9d4913e6e370bea0723de3472c4cc5a714bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 16 Feb 2022 19:00:17 +0100 Subject: [PATCH 080/113] comps-sync f36 2022-02-16 --- fedora-common-ostree-pkgs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index e339121..b8d58f5 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -36,9 +36,7 @@ packages: - curl - cyrus-sasl-plain - default-editor - - dejavu-sans-fonts - dejavu-sans-mono-fonts - - dejavu-serif-fonts - dhcp-client - dnsmasq - e2fsprogs From ab7e8b50177325942a31e8e9836e2252f707a19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 20 Apr 2022 13:22:26 +0200 Subject: [PATCH 081/113] comps-sync f36 2022-04-20 --- fedora-common-ostree-pkgs.yaml | 5 +++-- mate-desktop-pkgs.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index b8d58f5..bdc6ab3 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -36,7 +36,6 @@ packages: - curl - cyrus-sasl-plain - default-editor - - dejavu-sans-mono-fonts - dhcp-client - dnsmasq - e2fsprogs @@ -52,13 +51,14 @@ packages: - firewalld - fpaste - fros-gnome + - fwupd - gamemode - glibc - glibc-all-langpacks - glx-utils - gnupg2 - google-noto-emoji-color-fonts - - google-noto-sans-arabic-vf-fonts + - google-noto-naskh-arabic-vf-fonts - google-noto-sans-armenian-vf-fonts - google-noto-sans-canadian-aboriginal-vf-fonts - google-noto-sans-cherokee-vf-fonts @@ -130,6 +130,7 @@ packages: - lohit-devanagari-fonts - lohit-gujarati-fonts - lohit-kannada-fonts + - lohit-marathi-fonts - lohit-odia-fonts - lohit-tamil-fonts - lohit-telugu-fonts diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 45c141b..3bd86d0 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -23,10 +23,10 @@ packages: - dconf-editor - engrampa - eom - - f35-backgrounds-base - - f35-backgrounds-extras-base - - f35-backgrounds-extras-mate - - f35-backgrounds-mate + - f36-backgrounds-base + - f36-backgrounds-extras-base + - f36-backgrounds-extras-mate + - f36-backgrounds-mate - fedora-release-matecompiz - firefox - firewall-config From e02e26439ba8d3969639e8b218817f555c18001e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 20 Apr 2022 13:29:34 +0200 Subject: [PATCH 082/113] fedora-common-ostree: Add ncurses Provides terminal tools like clear, reset, tput, and tset Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/253 Cherry-picked from: https://pagure.io/workstation-ostree-config/c/1628cb19bf7130f2475fa178fd2311798518e8b7?branch=main --- fedora-common-ostree.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index b3f15d2..5a509f4 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -14,6 +14,8 @@ packages: - podman - skopeo - toolbox + # Provides terminal tools like clear, reset, tput, and tset + - ncurses # Flatpak support - flatpak - xdg-desktop-portal From 7208e3cbac39a111185435a34164e6ecfea499b2 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 11 May 2022 23:12:32 +0200 Subject: [PATCH 083/113] f35 full tree --- README.md | 9 - better-fonts.repo | 10 + compose.sh | 4 +- comps-sync-exclude-list.yml | 12 +- comps-sync.py | 2 +- config/environment.d/wayland.conf | 4 + config/greetd/config.toml | 6 + config/greetd/environments | 2 + fedora-34-updates.repo | 13 - fedora-35-updates.repo | 6 + fedora-34.repo => fedora-35.repo | 6 +- fedora-base.yaml | 9 +- fedora-common-ostree-pkgs.yaml | 15 +- fedora-common-ostree.yaml | 49 +++- fedora-deepin.yaml | 9 +- fedora-kinoite.yaml | 16 +- fedora-lxqt.yaml | 9 +- fedora-mate.yaml | 9 +- fedora-pantheon.yaml | 9 +- fedora-silverblue.yaml | 10 +- fedora-xfce.yaml | 9 +- gnome-desktop-pkgs.yaml | 1 + greetd-35.repo | 11 + kde-desktop-pkgs.yaml | 8 + mate-desktop-pkgs.yaml | 9 +- post.sh | 10 +- rpmfusion-free-35.repo | 33 +++ rpmfusion-free-updates-35.repo | 30 +++ x1-gen7-sway-desktop.yaml | 402 ++++++++++++++++++++++++------ 29 files changed, 561 insertions(+), 161 deletions(-) create mode 100644 better-fonts.repo create mode 100644 config/environment.d/wayland.conf create mode 100644 config/greetd/config.toml create mode 100644 config/greetd/environments delete mode 100644 fedora-34-updates.repo create mode 100644 fedora-35-updates.repo rename fedora-34.repo => fedora-35.repo (64%) create mode 100644 greetd-35.repo create mode 100644 rpmfusion-free-35.repo create mode 100644 rpmfusion-free-updates-35.repo diff --git a/README.md b/README.md index 0340c1c..31f49b8 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/better-fonts.repo b/better-fonts.repo new file mode 100644 index 0000000..48a44c8 --- /dev/null +++ b/better-fonts.repo @@ -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 diff --git a/compose.sh b/compose.sh index 01f2231..8038f04 100755 --- a/compose.sh +++ b/compose.sh @@ -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 diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index cbfb2de..92636ab 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -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 diff --git a/comps-sync.py b/comps-sync.py index cd9d73e..aea3449 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -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 diff --git a/config/environment.d/wayland.conf b/config/environment.d/wayland.conf new file mode 100644 index 0000000..7a78aa7 --- /dev/null +++ b/config/environment.d/wayland.conf @@ -0,0 +1,4 @@ +XDG_SESSION_TYPE=wayland +XDG_CURRENT_DESKTOP=sway +MOZ_ENABLE_WAYLAND=1 +SDL_VIDEODRIVER=wayland diff --git a/config/greetd/config.toml b/config/greetd/config.toml new file mode 100644 index 0000000..8e05065 --- /dev/null +++ b/config/greetd/config.toml @@ -0,0 +1,6 @@ +[terminal] +vt = 1 + +[default_session] +command = "cage -s -- gtkgreet" +user = "greeter" diff --git a/config/greetd/environments b/config/greetd/environments new file mode 100644 index 0000000..d16bb19 --- /dev/null +++ b/config/greetd/environments @@ -0,0 +1,2 @@ +sway +bash diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo deleted file mode 100644 index e107df5..0000000 --- a/fedora-34-updates.repo +++ /dev/null @@ -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 diff --git a/fedora-35-updates.repo b/fedora-35-updates.repo new file mode 100644 index 0000000..afcf850 --- /dev/null +++ b/fedora-35-updates.repo @@ -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 \ No newline at end of file diff --git a/fedora-34.repo b/fedora-35.repo similarity index 64% rename from fedora-34.repo rename to fedora-35.repo index 18b9b5c..07213ca 100644 --- a/fedora-34.repo +++ b/fedora-35.repo @@ -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 diff --git a/fedora-base.yaml b/fedora-base.yaml index d0ed67e..0f7fa07 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -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 diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index df5fcb3..f8492a7 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -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 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 3818b66..6b06e46 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -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: diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 4808cd8..1bde080 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -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 diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index f3a54cf..cc331f8 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -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 diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 7106dfc..74f5071 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -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 diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 948010d..ee0f8e3 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -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 diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 455de5b..e6b32de 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -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 diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 9f4980a..bcaca35 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -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 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 5da1f1b..408ca09 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -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 diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index 4a2901b..5200e7a 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -59,6 +59,7 @@ packages: - tracker - tracker-miners - xdg-desktop-portal + - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - xdg-user-dirs-gtk - yelp diff --git a/greetd-35.repo b/greetd-35.repo new file mode 100644 index 0000000..f78ff45 --- /dev/null +++ b/greetd-35.repo @@ -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 diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 57d38db..6c48e82 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -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 diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index cadcaad..45c141b 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -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 diff --git a/post.sh b/post.sh index 03b03a8..39db86f 100755 --- a/post.sh +++ b/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 diff --git a/rpmfusion-free-35.repo b/rpmfusion-free-35.repo new file mode 100644 index 0000000..a1fb520 --- /dev/null +++ b/rpmfusion-free-35.repo @@ -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 + diff --git a/rpmfusion-free-updates-35.repo b/rpmfusion-free-updates-35.repo new file mode 100644 index 0000000..f7553a1 --- /dev/null +++ b/rpmfusion-free-updates-35.repo @@ -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 + diff --git a/x1-gen7-sway-desktop.yaml b/x1-gen7-sway-desktop.yaml index 9066bad..df68271 100644 --- a/x1-gen7-sway-desktop.yaml +++ b/x1-gen7-sway-desktop.yaml @@ -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"] From 81265a7d67d57a330b984afd25e36234f223fcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 16 May 2022 19:58:36 +0200 Subject: [PATCH 084/113] comps-sync f36 2022-05-16 --- kde-desktop-pkgs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 6c48e82..dd697c5 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -6,6 +6,7 @@ packages: - breeze-icon-theme - dolphin - firewall-config + - fprintd-pam - glibc-all-langpacks - gnome-keyring-pam - initial-setup-gui From 9151fe0047a1da7709d4f30a79a0d97cefce2633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 19 May 2022 17:10:11 +0200 Subject: [PATCH 085/113] Kinoite: Manually include imsettings-systemd Required to enable complex input-methods support. We might consider including the input-methods comps group if it turns out that we need more packages. Fixes: https://pagure.io/fedora-kde/SIG/issue/156 Backport: https://pagure.io/workstation-ostree-config/c/663cf9dac0bff235f67d0f8e3aae429d83281764?branch=main --- fedora-kinoite.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 5698321..d9c1141 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -21,6 +21,8 @@ packages: - kcalc - kwrite - okular + # Manually add missing packages for missing input-methods + - imsettings-systemd # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From 405725e8a6278ccb433f1d0d2759a993ff8d569c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 30 May 2022 19:43:41 +0200 Subject: [PATCH 086/113] Revert "Kinoite: Manually include imsettings-systemd" Support is currently not good enough. See https://pagure.io/fedora-kde/SIG/issue/156 This reverts commit 9151fe0047a1da7709d4f30a79a0d97cefce2633. --- fedora-kinoite.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index d9c1141..5698321 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -21,8 +21,6 @@ packages: - kcalc - kwrite - okular - # Manually add missing packages for missing input-methods - - imsettings-systemd # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From 6b1948851eac6a86589a1b183a01bbb9aae1f1d8 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 14:55:45 +0100 Subject: [PATCH 087/113] Branching F34 from rawhide Signed-off-by: Tomas Hrcka --- fedora-34-updates.repo | 6 ++++++ fedora-34.repo | 6 ++++++ fedora-deepin.yaml | 5 ++--- fedora-kinoite.yaml | 5 ++--- fedora-lxqt.yaml | 5 ++--- fedora-mate.yaml | 5 ++--- fedora-pantheon.yaml | 5 ++--- fedora-silverblue.yaml | 5 ++--- fedora-xfce.yaml | 5 ++--- 9 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 fedora-34-updates.repo create mode 100644 fedora-34.repo diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo new file mode 100644 index 0000000..e0e937d --- /dev/null +++ b/fedora-34-updates.repo @@ -0,0 +1,6 @@ +[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 \ No newline at end of file diff --git a/fedora-34.repo b/fedora-34.repo new file mode 100644 index 0000000..0bb56db --- /dev/null +++ b/fedora-34.repo @@ -0,0 +1,6 @@ +[fedora-f34] +name=Fedora f34 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch +enabled=0 +gpgcheck=0 +metadata_expire=1d diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 977cbd7..010c551 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -1,5 +1,5 @@ include: deepin-desktop-pkgs.yaml -ref: fedora/36/${basearch}/deepin +ref: fedora/34/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -12,5 +12,4 @@ packages: - gnome-software repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 5698321..7f4c80c 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,5 +1,5 @@ include: kde-desktop-pkgs.yaml -ref: fedora/36/${basearch}/kinoite +ref: fedora/34/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" @@ -31,5 +31,4 @@ exclude-packages: - plasma-pk-updates repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 984ea31..745e949 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -1,5 +1,5 @@ include: lxqt-desktop-pkgs.yaml -ref: fedora/36/${basearch}/lxqt +ref: fedora/34/${basearch}/lxqt rojig: name: fedora-lxqt summary: "Fedora LXQt base image" @@ -13,5 +13,4 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 697d249..cfd97c2 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -1,5 +1,5 @@ include: mate-desktop-pkgs.yaml -ref: fedora/36/${basearch}/mate +ref: fedora/34/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -14,5 +14,4 @@ exclude-packages: - python3-unbound repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 3601327..e45d8c5 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -1,5 +1,5 @@ include: pantheon-desktop-pkgs.yaml -ref: fedora/36/${basearch}/pantheon +ref: fedora/34/${basearch}/pantheon rojig: name: fedora-pantheon summary: "Fedora Pantheon base image" @@ -10,5 +10,4 @@ packages: - fedora-release-ostree-desktop repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 9e36320..8727f04 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,5 +1,5 @@ include: gnome-desktop-pkgs.yaml -ref: fedora/36/${basearch}/silverblue +ref: fedora/34/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -23,5 +23,4 @@ packages: - totem-video-thumbnailer repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 7405278..3802a35 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -1,5 +1,5 @@ include: xfce-desktop-pkgs.yaml -ref: fedora/36/${basearch}/xfce +ref: fedora/34/${basearch}/xfce rojig: name: fedora-xfce summary: "Fedora XFCE base image" @@ -11,5 +11,4 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk repos: - - fedora-36 - - fedora-36-updates + - fedora-34 From bd6da1fe64eea29e3b21ce2937b9c6aca0db987d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 18:33:57 +0100 Subject: [PATCH 088/113] Fix mirrorlist URL Signed-off-by: Tomas Hrcka --- fedora-34.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-34.repo b/fedora-34.repo index 0bb56db..7e3d722 100644 --- a/fedora-34.repo +++ b/fedora-34.repo @@ -1,6 +1,6 @@ [fedora-f34] name=Fedora f34 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch enabled=0 gpgcheck=0 metadata_expire=1d From 5baae7abf4e0a08dc4b2c2265ef577083e5fa300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:47:49 +0100 Subject: [PATCH 089/113] repos: Fixup repo names and EOF --- fedora-34-updates.repo | 2 +- fedora-34.repo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo index e0e937d..516e164 100644 --- a/fedora-34-updates.repo +++ b/fedora-34-updates.repo @@ -3,4 +3,4 @@ name=Fedora 34 $basearch Updates mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34&arch=$basearch enabled=0 gpgcheck=1 -metadata_expire=1d \ No newline at end of file +metadata_expire=1d diff --git a/fedora-34.repo b/fedora-34.repo index 7e3d722..18b9b5c 100644 --- a/fedora-34.repo +++ b/fedora-34.repo @@ -1,6 +1,6 @@ -[fedora-f34] -name=Fedora f34 $basearch +[fedora-34] +name=Fedora 34 $basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch enabled=0 -gpgcheck=0 +gpgcheck=1 metadata_expire=1d From c4a7e20f41511afa98a5cad5d5af7bfe1555fe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:54:35 +0100 Subject: [PATCH 090/113] Fix Rawhide -> F34 branching --- fedora-base.yaml | 5 ++--- fedora-common-ostree.yaml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fedora-base.yaml b/fedora-base.yaml index 860dcaa..0b895f2 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -1,5 +1,5 @@ include: fedora-common-ostree.yaml -ref: fedora/36/${basearch}/base +ref: fedora/34/${basearch}/base rojig: name: fedora-base summary: "Fedora base image for alternative DE" @@ -15,5 +15,4 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-36 - - fedora-36-updates + - fedora-34 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 5a509f4..c7b3418 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,4 +1,4 @@ -ref: fedora/36/${basearch}/ostree-base +ref: fedora/34/${basearch}/ostree-base automatic_version_prefix: "36" mutate-os-release: "36" From 9f9627876140ce727129916149b1f649551a0130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 19 Feb 2021 10:59:03 +0100 Subject: [PATCH 091/113] Pre-enable updates repo This repo is currently empty but will be used after F34 is released. This is a noop for official variants built via Pungi but useful for unofficial ones. --- fedora-base.yaml | 1 + fedora-deepin.yaml | 1 + fedora-kinoite.yaml | 1 + fedora-lxqt.yaml | 1 + fedora-mate.yaml | 1 + fedora-pantheon.yaml | 1 + fedora-silverblue.yaml | 1 + fedora-xfce.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/fedora-base.yaml b/fedora-base.yaml index 0b895f2..6b4910b 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -16,3 +16,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 010c551..890408c 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -13,3 +13,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 7f4c80c..9f30c92 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -32,3 +32,4 @@ exclude-packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 745e949..aa35f3c 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -14,3 +14,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index cfd97c2..4e865c2 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -15,3 +15,4 @@ exclude-packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index e45d8c5..84e62ca 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -11,3 +11,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 8727f04..15b9c35 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -24,3 +24,4 @@ packages: repos: - fedora-34 + - fedora-34-updates diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 3802a35..7a93437 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -12,3 +12,4 @@ packages: - xdg-desktop-portal-gtk repos: - fedora-34 + - fedora-34-updates From 6e22a7ad50a026318701dbdadd495b8f0a2530c6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 23 Feb 2021 14:34:55 +0100 Subject: [PATCH 092/113] Include totem-video-thumbnailer for video thumbnailing in Nautilus https://pagure.io/fedora-workstation/issue/168 --- fedora-silverblue.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 15b9c35..867cc64 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -15,9 +15,6 @@ 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 From 658cc65a70077b49cfb5287dd7d87c3a0dc8d76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 24 Mar 2021 15:42:12 +0100 Subject: [PATCH 093/113] Kinoite: Explicitely exclude PackageKit & Offline updates support --- fedora-kinoite.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 9f30c92..763dda2 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -30,6 +30,11 @@ exclude-packages: - plasma-discover-rpm-ostree - plasma-pk-updates +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + repos: - fedora-34 - fedora-34-updates From fb712bc8e712207ddd4a1e4aaf4fe9ce15c165e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 19 Apr 2021 18:41:08 +0200 Subject: [PATCH 094/113] comps-sync f34 2021-04-23 --- fedora-common-ostree-pkgs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index bdc6ab3..91183b6 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -162,7 +162,6 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils - - plocate - plymouth - plymouth-system-theme - policycoreutils From 8db43920801bbd1b47691c513d36e224d848a2fa Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sun, 17 Nov 2019 16:21:54 +0100 Subject: [PATCH 095/113] Remove unwanted packages for pitti's workstation --- fedora-common-ostree.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index c7b3418..14d4944 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -7,27 +7,12 @@ include: fedora-common-ostree-pkgs.yaml packages: - git-core - - lvm2 - rpm-ostree # Container management - buildah - podman - skopeo - toolbox - # Provides terminal tools like clear, reset, tput, and tset - - ncurses - # Flatpak support - - flatpak - - xdg-desktop-portal - # HFS filesystem tools for Apple hardware - # See https://github.com/projectatomic/rpm-ostree/issues/1380 - - hfsplus-tools - # 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 @@ -75,13 +60,6 @@ packages-x86_64: - 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: From 99bfa2406aa30982bd4b18c8fa0f303cffa13766 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 17 Jun 2019 21:42:46 +0200 Subject: [PATCH 096/113] Define tree for pitti's workstation Also add helper script for running the ostree build. --- 2015-RH-IT-Root-CA.pem | 25 +++++++ README.md | 74 ++++---------------- compose.sh | 12 ++++ fedora-34-updates.repo | 7 ++ fedora-common-ostree.yaml | 2 - pitti-desktop.yaml | 142 ++++++++++++++++++++++++++++++++++++++ pitti-post.sh | 40 +++++++++++ rpmfusion.repo | 18 +++++ 8 files changed, 258 insertions(+), 62 deletions(-) create mode 100644 2015-RH-IT-Root-CA.pem create mode 100755 compose.sh create mode 100644 pitti-desktop.yaml create mode 100755 pitti-post.sh create mode 100644 rpmfusion.repo diff --git a/2015-RH-IT-Root-CA.pem b/2015-RH-IT-Root-CA.pem new file mode 100644 index 0000000..f306f00 --- /dev/null +++ b/2015-RH-IT-Root-CA.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD +VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp +Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx +GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m +b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx +WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD +VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS +ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG +9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz +bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2 +c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo +GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES +X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK +BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R +4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz +bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e +LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak +oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj +S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf +4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel +RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3 +-----END CERTIFICATE----- diff --git a/README.md b/README.md index 4efe7b2..a2d2166 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,29 @@ -# Manifests for rpm-ostree based Fedora variants +Martin Pitt's desktop +===================== -This is the configuration needed to create -[rpm-ostree](https://coreos.github.io/rpm-ostree/) based variants of Fedora. -Each variant is described in a YAML -[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by -rpm-ostree to compose an ostree commit with the package requested. +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. -In the Fedora infrastructure, this happens via -[pungi](https://pagure.io/pungi-fedora) with -[Lorax](https://github.com/weldr/lorax) -([templates](https://pagure.io/fedora-lorax-templates)). +It gets [automatically built](.github/workflows/build.yml) every week and [published to my server](https://piware.de/ostree/pitti-workstation/). -## Fedora Silverblue +To use it from an existing OSTree based system like [Fedora CoreOS](https://getfedora.org/coreos) or [Fedora Silverblue](https://docs.fedoraproject.org/en-US/fedora-silverblue/), add my server URL as new remote and rebase your tree to it: -- Website: https://silverblue.fedoraproject.org/ ([sources](https://github.com/fedora-silverblue/silverblue-site)) -- Documentation: https://docs.fedoraproject.org/en-US/fedora-silverblue/ ([sources](https://github.com/fedora-silverblue/silverblue-docs)) -- Issue tracker: https://github.com/fedora-silverblue/issue-tracker/issues - -## Fedora Kinoite - -- Website: https://kinoite.fedoraproject.org/ ([sources](https://pagure.io/fedora-kde/kinoite-site)) -- Documentation: https://docs.fedoraproject.org/en-US/fedora-kinoite/ ([sources](https://pagure.io/fedora-kde/kinoite-docs)) -- Issue tracker: https://pagure.io/fedora-kde/SIG/issues - -## Building - -Instructions to perform a local build of Silverblue: - -``` -# Clone the config -git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config - -# Prepare repo & cache -mkdir -p repo cache && ostree --repo=repo init --mode=archive - -# Build (compose) the variant of your choice -sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml - -# Update summary file -ostree summary --repo=repo --update +```sh +sudo ostree remote add --no-gpg-verify piware https://piware.de/ostree/pitti-workstation/ +sudo rpm-ostree rebase piware:pitti-desktop ``` -## Testing - -Instructions to test the resulting build: - -- First, serve the ostree repo using an HTTP server. -- Then, on an already installed Silverblue system: +After that, you can install weekly updates with ``` -# Add an ostree remote -sudo ostree remote add testremote http:///repo - -# Pin the currently deployed (and probably working) version -sudo ostree admin pin 0 - -# List refs from variant remote -sudo ostree remote refs testremote - -# Switch to your variant -sudo rpm-ostree rebase testremote:fedora/35/x86_64/silverblue +sudo rpm-ostree upgrade ``` -## Historical references +If anything goes wrong, you can go back to the previous version with `sudo rpm-ostree rollback`. -Building and testing instructions: -- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/ -- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/ -- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/ -- https://www.projectatomic.io/docs/compose-your-own-tree/ +Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) +============================================= For some background, see: diff --git a/compose.sh b/compose.sh new file mode 100755 index 0000000..101da94 --- /dev/null +++ b/compose.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -eu +CACHE=/var/cache/ostree +REPO=/var/tmp/repo + +mkdir -p $CACHE + +if [ ! -d $REPO/objects ]; then + ostree --repo=$REPO init --mode=archive-z2 +fi + +rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO pitti-desktop.yaml diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo index 516e164..e107df5 100644 --- a/fedora-34-updates.repo +++ b/fedora-34-updates.repo @@ -4,3 +4,10 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34& 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 diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 14d4944..930667d 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -3,8 +3,6 @@ ref: fedora/34/${basearch}/ostree-base automatic_version_prefix: "36" mutate-os-release: "36" -include: fedora-common-ostree-pkgs.yaml - packages: - git-core - rpm-ostree diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml new file mode 100644 index 0000000..5ce1473 --- /dev/null +++ b/pitti-desktop.yaml @@ -0,0 +1,142 @@ +include: fedora-common-ostree.yaml + +ref: pitti-desktop +rojig: + name: pitti-desktop + summary: "Pitti Desktop" + license: MIT + +repos: + - fedora-34 + - fedora-34-updates + - fedora-34-updates-testing + - rpmfusion-free + - rpmfusion-free-updates + +packages: +# hardware/drivers + - kernel + - kernel-modules-extra + - iwl6000g2a-firmware + - iwl7260-firmware + - alsa-sof-firmware + - NetworkManager-wifi + - NetworkManager-openvpn-gnome + - sane-backends + - sane-backends-drivers-scanners + - powertop + - iwd + - udisks2-lvm2 + - opensc +# basic system + - acl + - attr + - basesystem + - cryptsetup + - dnsmasq + - fedora-workstation-backgrounds + - filesystem + - glibc-langpack-de + - glibc-langpack-en + - hostname + - iproute + - kbd + - nss-altfiles + - pciutils + - sudo + - usbutils +# shell tools and development + - bc + - gnupg2 + - fpaste + - lsof + - man-db + - mtr + - tree + - bzip2 + - zip + - unzip + - vim-enhanced + - ranger + - bash-completion + - fish + - qemu-system-x86-core + - qemu-ui-sdl + - qemu-img + - openvpn + - mutt + - nmap-ncat + - isync + - weechat + - duplicity + - openssh-server + - systemd-container + - git + - patchutils + - make + - strace + - wget + - w3m + - cockpit-system + - cockpit-ws + - syncthing + - krb5-workstation + +# desktop plumbing/apps + - dejavu-sans-fonts + - dejavu-serif-fonts + - dejavu-sans-mono-fonts + - fontawesome-fonts + - google-noto-emoji-color-fonts + + - gvfs-mtp + - pulseaudio-utils + - alsa-plugins-pulseaudio + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly + - gstreamer1-libav + # for wf-recorder + - libavdevice + + - pavucontrol + - pcmanfm + - simple-scan + - nm-connection-editor + - eog + - evince + - rhythmbox + - gnome-keyring + - pinentry-gnome3 + - lxpolkit + - lxterminal + - gnome-disk-utility + - gtimelog + +# sway/wayland desktop + - sway + - swayidle + - swaylock + - kanshi + - mako + - waybar + - slurp + - grim + - xorg-x11-server-Xwayland + - firefox-wayland + - wofi + - brightnessctl + - wl-clipboard + +exclude-packages: + # recommended by sway + - alacritty + - brltty + - glibc-all-langpacks + - xdg-desktop-portal-wlr + # recommended by gtimelog + - yelp + +add-files: + - ["2015-RH-IT-Root-CA.pem", "/etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem"] + +postprocess-script: pitti-post.sh diff --git a/pitti-post.sh b/pitti-post.sh new file mode 100755 index 0000000..5491324 --- /dev/null +++ b/pitti-post.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +set -xeuo pipefail + +# Enable SysRQ +echo 'kernel.sysrq = 1' > /usr/lib/sysctl.d/90-sysrq.conf + +# power saving +echo 'blacklist e1000e' > /usr/lib/modprobe.d/blacklist-local.conf + +# NetworkManager config +cat < /usr/lib/NetworkManager/conf.d/local.conf +[main] +plugins= + +[device] +wifi.backend=iwd +EOF +ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service +ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf + +# enable other units +mkdir -p /usr/lib/systemd/system/getty.target.wants +ln -s ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service +ln -s ../systemd-timesyncd.service /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service +ln -s ../cockpit.socket /usr/lib/systemd/system/sockets.target.wants/cockpit.socket +ln -s ../sshd.socket /usr/lib/systemd/system/sockets.target.wants/sshd.socket + +# disable unwanted services +ln -sfn /dev/null /usr/lib/systemd/user/at-spi-dbus-bus.service + +# move OS systemd unit defaults to /usr +cp -a --verbose /etc/systemd/system /etc/systemd/user /usr/lib/systemd/ +rm -r /etc/systemd/system /etc/systemd/user + +# avoid LVM spew in /etc +sed -i 's/backup = 1/backup = 0/; s/archive = 1/archive = 0/' /etc/lvm/lvm.conf + +# update for Red Hat certificate +ln -s /etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem /etc/pki/tls/certs/2015-RH-IT-Root-CA.pem +update-ca-trust diff --git a/rpmfusion.repo b/rpmfusion.repo new file mode 100644 index 0000000..e826798 --- /dev/null +++ b/rpmfusion.repo @@ -0,0 +1,18 @@ +[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 From aa2b9cc1ea38251e8165ba24e08504748baef061 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 26 Sep 2020 17:25:01 +0200 Subject: [PATCH 097/113] Enable systemd-homed This requires some PAM config updates and disabling SELinux. --- pitti-post.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/pitti-post.sh b/pitti-post.sh index 5491324..a5441e5 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -18,10 +18,69 @@ EOF ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf +# set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) +patch /etc/pam.d/system-auth < Date: Sat, 12 Dec 2020 19:41:13 +0100 Subject: [PATCH 098/113] Add GitHub workflow for building the OSTree repository Also add a script to download and unpack the artifact on my server's `public_html/`. --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ github-fetch.sh | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100755 github-fetch.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9d791b3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: build +on: + schedule: + - cron: 0 2 * * 6 + workflow_dispatch: +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker.io/fedora:latest + # Fix SELinux for the built OSTree: https://github.com/coreos/rpm-ostree/issues/1943 + options: --privileged --security-opt label:disable + steps: + - name: Install dependencies + run: dnf install -y rpm-ostree selinux-policy selinux-policy-targeted policycoreutils + + - name: Clone repository + uses: actions/checkout@v2 + + - name: Build OSTree + run: ./compose.sh + + # upload-artifact@v2 has trouble with tens of thousands of files + - name: Create repo tarball + run: tar -czf /var/tmp/repo.tar.gz -C /var/tmp/repo . + + - name: Create repository artifact + uses: actions/upload-artifact@v2 + with: + name: repository + path: /var/tmp/repo.tar.gz + retention-days: 5 diff --git a/github-fetch.sh b/github-fetch.sh new file mode 100755 index 0000000..ebf972e --- /dev/null +++ b/github-fetch.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# Download built GitHub OSTree repository artifact and unpack it into a plain directory +set -eux + +# download latest repo build +REPO_FINAL="$(dirname $0)/pitti-workstation" +REPO="${REPO_FINAL}.new" + +CURL="curl -u token:$(cat ~/.config/github-token) --show-error --fail" +RESPONSE=$($CURL --silent https://api.github.com/repos/martinpitt/ostree-pitti-workstation/actions/artifacts) +ZIP=$(echo "$RESPONSE" | jq --raw-output '.artifacts | map(select(.name == "repository"))[0].archive_download_url') +echo "INFO: Downloading $ZIP ..." +[ -e /tmp/repository.zip ] || $CURL -L -o /tmp/repository.zip "$ZIP" +rm -rf "$REPO" +mkdir -p "$REPO" +unzip -p /tmp/repository.zip | tar -xzC "$REPO" +rm /tmp/repository.zip +[ ! -e "$REPO_FINAL" ] || mv "${REPO_FINAL}" "${REPO_FINAL}.old" +mv "$REPO" "$REPO_FINAL" +rm -rf "${REPO_FINAL}.old" From e6767e9a28617f6569f1dec82200ec51b7761e10 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 8 Jan 2021 08:46:53 +0100 Subject: [PATCH 099/113] Move back from iwd to wpa_supplicant iwd has a really strange behaviour of randomly interrupting the wifi connection: Received Deauthentication event, reason: 4, from_ap: false This also interrupts VPN. This does not happen with wpasupplicant. https://bugzilla.redhat.com/show_bug.cgi?id=1915641 --- pitti-desktop.yaml | 1 + pitti-post.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 5ce1473..14ed529 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -26,6 +26,7 @@ packages: - sane-backends-drivers-scanners - powertop - iwd + - wpa_supplicant - udisks2-lvm2 - opensc # basic system diff --git a/pitti-post.sh b/pitti-post.sh index a5441e5..f68fee3 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -13,9 +13,9 @@ cat < /usr/lib/NetworkManager/conf.d/local.conf plugins= [device] -wifi.backend=iwd +#wifi.backend=iwd EOF -ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service +#ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf # set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) From bd41bf4cf21c75b0b569b6c9e07d43d8687d9fd8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:42:34 +0200 Subject: [PATCH 100/113] Install selinux-policy-targeted Otherwise latest rpm-ostree fails with ``` Writing rpmdb... done error: Loading pkgcache branch rpmostree/pkg/adwaita-cursor-theme/40.0-2.fc34.noarch: SELinux enabled, but no policy found ``` --- pitti-desktop.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 14ed529..1c299b9 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -44,6 +44,8 @@ packages: - kbd - nss-altfiles - pciutils + # don't care, but rpm-ostree build fails otherwise + - selinux-policy-targeted - sudo - usbutils # shell tools and development From cee7775cf29576a45063b0281886268ee0a445e4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:49:27 +0200 Subject: [PATCH 101/113] Unignore flatpak --- fedora-common-ostree.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 930667d..83082c0 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -11,6 +11,9 @@ packages: - podman - skopeo - toolbox + # Flatpak support + - flatpak + - xdg-desktop-portal selinux: true documentation: true From 0fb3d46275f7a22ef58e66daa6b305aec88070cc Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 1 May 2021 13:50:13 +0200 Subject: [PATCH 102/113] Install xdg-desktop-portal-gtk for proper flatpak app support --- pitti-desktop.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 1c299b9..9454555 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -100,6 +100,7 @@ packages: - gstreamer1-libav # for wf-recorder - libavdevice + - xdg-desktop-portal-gtk - pavucontrol - pcmanfm From cd80bf126f6c93171aa31d9f6e446be47126fbe1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 4 May 2021 06:02:58 +0200 Subject: [PATCH 103/113] Move to systemd-resolved For per-interface resolution --- pitti-post.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pitti-post.sh b/pitti-post.sh index f68fee3..1a4032c 100755 --- a/pitti-post.sh +++ b/pitti-post.sh @@ -16,7 +16,8 @@ plugins= #wifi.backend=iwd EOF #ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service -ln -sfn /run/NetworkManager/resolv.conf /etc/resolv.conf + +ln -sfn /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf # set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) patch /etc/pam.d/system-auth < Date: Tue, 8 Jun 2021 19:20:35 +0200 Subject: [PATCH 104/113] Add rofimoji Nice wofi based emoji search. --- pitti-desktop.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml index 9454555..d8aae02 100644 --- a/pitti-desktop.yaml +++ b/pitti-desktop.yaml @@ -115,6 +115,7 @@ packages: - lxterminal - gnome-disk-utility - gtimelog + - rofimoji # sway/wayland desktop - sway From f8790aa3375cd9821ba3c7a3898a71323e158e87 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Thu, 17 Jun 2021 00:49:38 +0200 Subject: [PATCH 105/113] X1 Carbon Gen 7 Sway Desktop --- README.md | 22 +-- compose.sh | 2 +- config/i3status-rust/config.toml | 78 ++++++++ config/modprobe.d/i2c_i801-blacklist.conf | 1 + config/modprobe.d/i915.conf | 4 + config/sway-service.desktop | 6 + config/sway-service.sh | 7 + config/swaylock/config | 8 + config/systemd/firefox.service | 10 + config/systemd/mako.service | 15 ++ config/systemd/nm-applet.service | 14 ++ config/systemd/sway-session.target | 6 + config/systemd/sway.service | 14 ++ config/systemd/swayidle.service | 13 ++ config/systemd/swaylock.service | 11 ++ config/systemd/wayland-session.target | 16 ++ config/waybar/config | 95 ++++++++++ config/waybar/style.css | 213 ++++++++++++++++++++++ pitti-desktop.yaml | 147 --------------- pitti-post.sh | 101 ---------- post.sh | 32 ++++ x1-gen7-sway-desktop.yaml | 156 ++++++++++++++++ 22 files changed, 702 insertions(+), 269 deletions(-) create mode 100644 config/i3status-rust/config.toml create mode 100644 config/modprobe.d/i2c_i801-blacklist.conf create mode 100644 config/modprobe.d/i915.conf create mode 100644 config/sway-service.desktop create mode 100755 config/sway-service.sh create mode 100644 config/swaylock/config create mode 100644 config/systemd/firefox.service create mode 100644 config/systemd/mako.service create mode 100644 config/systemd/nm-applet.service create mode 100644 config/systemd/sway-session.target create mode 100644 config/systemd/sway.service create mode 100644 config/systemd/swayidle.service create mode 100644 config/systemd/swaylock.service create mode 100644 config/systemd/wayland-session.target create mode 100644 config/waybar/config create mode 100644 config/waybar/style.css delete mode 100644 pitti-desktop.yaml delete mode 100755 pitti-post.sh create mode 100755 post.sh create mode 100644 x1-gen7-sway-desktop.yaml diff --git a/README.md b/README.md index a2d2166..cbf5eb2 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,9 @@ -Martin Pitt's desktop -===================== +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. -It gets [automatically built](.github/workflows/build.yml) every week and [published to my server](https://piware.de/ostree/pitti-workstation/). - -To use it from an existing OSTree based system like [Fedora CoreOS](https://getfedora.org/coreos) or [Fedora Silverblue](https://docs.fedoraproject.org/en-US/fedora-silverblue/), add my server URL as new remote and rebase your tree to it: - -```sh -sudo ostree remote add --no-gpg-verify piware https://piware.de/ostree/pitti-workstation/ -sudo rpm-ostree rebase piware:pitti-desktop -``` - -After that, you can install weekly updates with - -``` -sudo rpm-ostree upgrade -``` - -If anything goes wrong, you can go back to the previous version with `sudo rpm-ostree rollback`. - - Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) ============================================= diff --git a/compose.sh b/compose.sh index 101da94..01f2231 100755 --- a/compose.sh +++ b/compose.sh @@ -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 pitti-desktop.yaml +rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml diff --git a/config/i3status-rust/config.toml b/config/i3status-rust/config.toml new file mode 100644 index 0000000..4681a21 --- /dev/null +++ b/config/i3status-rust/config.toml @@ -0,0 +1,78 @@ +# when using 3istsatus-rs with swaybar +# https://github.com/greshake/i3status-rust +# + +theme = "solarized-dark" +icons = "awesome5" + +[[block]] +block = "temperature" +collapsed = false +interval = 10 +format = "gpu {max}°" +chip = "amdgpu-pci-*" + +[[block]] +block = "temperature" +collapsed = false +interval = 10 +format = "cpu {max}°" +chip = "k10temp-pci-*" + +[[block]] +block = "temperature" +collapsed = true +interval = 10 +format = "nvme: {max}°" +chip = "nvme-pci-*" + +[[block]] +block = "temperature" +collapsed = true +interval = 10 +format = "wifi: {max}°" +chip = "iwlwifi_1-*" + +[[block]] +block = "net" +device = "wlan0" +format = "{ssid} {signal_strength} {ip} {speed_down} {graph_down}" +interval = 5 + +[[block]] +block = "disk_space" +path = "/" +alias = "/" +info_type = "available" +unit = "GB" +interval = 20 +warning = 20.0 +alert = 10.0 + +[[block]] +block = "memory" +display_type = "memory" +format_mem = "{Mup}%" +format_swap = "{SUp}%" + +[[block]] +block = "cpu" +interval = 1 + +[[block]] +block = "load" +interval = 1 +format = "{1m}" + +[[block]] +block = "sound" + +[[block]] +block = "keyboard_layout" +driver = "sway" +sway_kb_identifier = "6127:24585:Lite-On_Technology_Corp._ThinkPad_USB_Keyboard_with_TrackPoint" + +[[block]] +block = "time" +interval = 60 +format = "%a %d/%m %R" diff --git a/config/modprobe.d/i2c_i801-blacklist.conf b/config/modprobe.d/i2c_i801-blacklist.conf new file mode 100644 index 0000000..70f1f9b --- /dev/null +++ b/config/modprobe.d/i2c_i801-blacklist.conf @@ -0,0 +1 @@ +blacklist i2c_i801 diff --git a/config/modprobe.d/i915.conf b/config/modprobe.d/i915.conf new file mode 100644 index 0000000..39114f5 --- /dev/null +++ b/config/modprobe.d/i915.conf @@ -0,0 +1,4 @@ +options i915 enable_fbc=1 +options i915 enable_guc=2 +options i915 nuclear_pageflip=Y +options i915 enable_dc=2 diff --git a/config/sway-service.desktop b/config/sway-service.desktop new file mode 100644 index 0000000..63f18af --- /dev/null +++ b/config/sway-service.desktop @@ -0,0 +1,6 @@ +# /usr/share/wayland-sessions/sway-service.desktop +[Desktop Entry] +Name=Sway Service +Comment=i3-compatible Wayland compositor as a systemd service +Exec=sway-service.sh +Type=Application diff --git a/config/sway-service.sh b/config/sway-service.sh new file mode 100755 index 0000000..8b0de34 --- /dev/null +++ b/config/sway-service.sh @@ -0,0 +1,7 @@ +#! /bin/sh +# /usr/local/bin/sway-service.sh - needs to be 0755 + +# first import environment variables from the login manager +systemctl --user import-environment +# then start the service +exec systemctl --wait --user start sway.service \ No newline at end of file diff --git a/config/swaylock/config b/config/swaylock/config new file mode 100644 index 0000000..acb5cb4 --- /dev/null +++ b/config/swaylock/config @@ -0,0 +1,8 @@ +# ~/.config/swayidle/config +before-sleep 'systemctl --user start swaylock' +lock 'systemctl --user start swaylock' +unlock 'swaymsg "output * dpms on"' +after-resume 'swaymsg "output * dpms on"' +timeout 300 'systemctl --user start swaylock' +timeout 600 'swaymsg "output * dpms off"' +resume 'swaymsg "output * dpms on"' diff --git a/config/systemd/firefox.service b/config/systemd/firefox.service new file mode 100644 index 0000000..55bf229 --- /dev/null +++ b/config/systemd/firefox.service @@ -0,0 +1,10 @@ +[Unit] +Description=Firefox nightly +PartOf=graphical-session.target + +[Service] +Type=exec +ExecStart=/opt/firefox/firefox + +[Install] +WantedBy=graphical-session.target diff --git a/config/systemd/mako.service b/config/systemd/mako.service new file mode 100644 index 0000000..bd2fac2 --- /dev/null +++ b/config/systemd/mako.service @@ -0,0 +1,15 @@ +[Unit] +Description=Lightweight Wayland notification daemon +Documentation=man:mako(1) +PartOf=sway-session.target +After=sway-session.target + +[Service] +Type=dbus +BusName=org.freedesktop.Notifications +ExecCondition=/bin/sh -c '[ -n "$WAYLAND_DISPLAY" ]' +ExecStart=/usr/bin/mako +ExecReload=/usr/bin/makoctl reload + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/nm-applet.service b/config/systemd/nm-applet.service new file mode 100644 index 0000000..3e35f1c --- /dev/null +++ b/config/systemd/nm-applet.service @@ -0,0 +1,14 @@ +[Unit] +Description=network monitor and control GUI applet +Documentation=man:nm-applet(1) +PartOf=wayland-session.target +After=wayland-session.target + +# requires nm-applet compiled with -D appindicator=yes +[Service] +Type=dbus +BusName=org.freedesktop.network-manager-applet +ExecStart=/usr/bin/nm-applet --indicator + +[Install] +WantedBy=wayland-session.target diff --git a/config/systemd/sway-session.target b/config/systemd/sway-session.target new file mode 100644 index 0000000..87fe41d --- /dev/null +++ b/config/systemd/sway-session.target @@ -0,0 +1,6 @@ +[Unit] +Description=sway compositor session +Documentation=man:systemd.special(7) +BindsTo=graphical-session.target wayland-session.target +Wants=graphical-session-pre.target +After=graphical-session-pre.target diff --git a/config/systemd/sway.service b/config/systemd/sway.service new file mode 100644 index 0000000..ea21f05 --- /dev/null +++ b/config/systemd/sway.service @@ -0,0 +1,14 @@ +[Unit] +Description=sway - i3-compatible Wayland compositor +Documentation=man:sway(5) +Before=graphical-session.service +Wants=graphical-session-pre.service +After=graphical-session-pre.service + +[Service] +Type=simple +EnvironmentFile=-%h/.config/sway/env +ExecStart=/usr/bin/sway +Restart=on-failure +RestartSec=1 +TimeoutStopSec=10 diff --git a/config/systemd/swayidle.service b/config/systemd/swayidle.service new file mode 100644 index 0000000..d235a7a --- /dev/null +++ b/config/systemd/swayidle.service @@ -0,0 +1,13 @@ +[Unit] +Description=Idle manager for Wayland +Documentation=man:swayidle(1) +Documentation=https://github.com/gdamjan/swayidle - fork with sd-notify and autolock +PartOf=graphical-session.target +After=sway-session.target + +[Service] +Type=notify +ExecStart=/usr/bin/swayidle -w + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/swaylock.service b/config/systemd/swaylock.service new file mode 100644 index 0000000..88c7a10 --- /dev/null +++ b/config/systemd/swaylock.service @@ -0,0 +1,11 @@ +[Unit] +Description=swaylock - Screen locker for Wayland +Documentation=man:swaylock(1) + +[Service] +Type=forking +ExecStart=/usr/bin/swaylock -f +Restart=on-failure + +[Install] +WantedBy=sway-session.target diff --git a/config/systemd/wayland-session.target b/config/systemd/wayland-session.target new file mode 100644 index 0000000..d0b2888 --- /dev/null +++ b/config/systemd/wayland-session.target @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is inspired from systemd's `graphical-session.target` +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Current wayland user session +Documentation=man:systemd.special(7) +Requires=basic.target +RefuseManualStart=yes +StopWhenUnneeded=yes +BindsTo=graphical-session.target diff --git a/config/waybar/config b/config/waybar/config new file mode 100644 index 0000000..8b81d45 --- /dev/null +++ b/config/waybar/config @@ -0,0 +1,95 @@ +{ + "layer": "top", + "position": "bottom", + "height": 24, + "modules-left": ["sway/workspaces", "idle_inhibitor", "sway/mode"], + "modules-center": ["sway/window"], + "modules-right": [ "pulseaudio", "backlight", "network", "cpu", "memory", "battery#bat0", "battery#bat1", + "tray", "sway/language", "clock" ], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{index} {name}" + }, + "sway/mode": { + "format": "{}" + }, + "sway/language": { + "format": "{}", + "max-length": 50 + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "tooltip-format": "{:%A\n%d %B %Y\n%H:%M}", + "format": "{:%a %d %b %H:%M}", + "format-alt": "{:%H:%M}" + }, + "cpu": { + "format": "{usage:2}% ī‹›" + }, + "memory": { + "format": "{}% īƒ‰" + }, + "battery#bat0": { + "bat": "BAT0", + "name": "BAT0", + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}", + "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] + }, + "battery#bat1": { + "bat": "BAT1", + "name": "BAT1", + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}", + "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] + }, + "network": { + "interval": 1, + "max-width": 50, + // "interface": "wlp2s0", // (Optional) To force the use of this interface + "format-wifi": "ī‡Ģ", + "format-ethernet": "{bandwidthUpBits} {bandwidthDownBits} īƒ", + "format-disconnected": "⚠", + "tooltip-format-wifi": "ī‡Ģ {essid}: {frequency}Mhz ({signalStrength}%)\n{bandwidthUpBits}\n{bandwidthDownBits}", + "tooltip-format-ethernet": "īƒ {ifname}: {ipaddr}/{cidr}", + "tooltip-format-disconnected": "⚠ Disconnected" + }, + "pulseaudio": { + //"scroll-step": 1, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}īŠ”", + "format-muted": "ī€Ļ", + "format-icons": { + "headphones": "ī€Ĩ", + "handsfree": "ī–", + "headset": "ī–", + "phone": "ī‚•", + "portable": "ī‚•", + "car": "ī†š", + "default": ["ī€§", "ī€¨"] + }, + "on-click": "pavucontrol" + }, + "backlight": { + "device": "intel_backlight", + "format": "{percent}% {icon}", + "format-icons": ["ī†…", "ī„‘"] + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "īŽ", + "deactivated": "ī°" + } + } +} diff --git a/config/waybar/style.css b/config/waybar/style.css new file mode 100644 index 0000000..f9db8d2 --- /dev/null +++ b/config/waybar/style.css @@ -0,0 +1,213 @@ +* { + border: none; + border-radius: 0; + font-family: Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + min-height: 0; +} + +window#waybar { + background-color: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid rgba(100, 114, 125, 0.5); + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + +/* +window#waybar.empty { + background-color: transparent; +} +window#waybar.solo { + background-color: #FFFFFF; +} +*/ + +window#waybar.termite { + background-color: #3F3F3F; +} + +window#waybar.chromium { + background-color: #000000; + border: none; +} + +#workspaces button { + padding: 0 5px; + background-color: transparent; + color: #ffffff; + border-bottom: 3px solid transparent; +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +#workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + box-shadow: inherit; + border-bottom: 3px solid #ffffff; +} + +#workspaces button.focused { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#workspaces button.urgent { + background-color: #eb4d4b; +} + +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#cpu, +#memory, +#temperature, +#backlight, +#network, +#pulseaudio, +#custom-media, +#tray, +#mode, +#idle_inhibitor { + padding: 0 10px; + margin: 0 4px; + color: #ffffff; +} + +#clock { + padding: 0 10px; + color: #ffffff; + background-color: #64727D; +} + +#battery .BAT0 { + margin-left: 9px; +} +#battery .BAT1 { + margin-right: 9px; +} +#battery { + padding: 0 10px; + background-color: #ffffff; + color: #000000; +} + +#battery.charging { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#cpu { + background-color: #2ecc71; + color: #000000; +} + +#memory { + background-color: #9b59b6; +} + +#backlight { + background-color: #90b1b1; +} + +#network { + background-color: #2980b9; +} + +#network.disconnected { + background-color: #f53c3c; +} + +#pulseaudio { + background-color: #f1c40f; + color: #000000; +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +#custom-media { + background-color: #66cc99; + color: #2a5c45; + min-width: 100px; +} + +#custom-media.custom-spotify { + background-color: #66cc99; +} + +#custom-media.custom-vlc { + background-color: #ffa000; +} + +#temperature { + background-color: #f0932b; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #2980b9; +} + +#idle_inhibitor { + background-color: #2d3436; +} + +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; +} + +#mpd { + background-color: #66cc99; + color: #2a5c45; +} + +#mpd.disconnected { + background-color: #f53c3c; +} + +#mpd.stopped { + background-color: #90b1b1; +} + +#mpd.paused { + background-color: #51a37a; +} +#custom-layout { + background-color: #ecf0f1; + color: #2d3436; + min-width: 2em; +} + diff --git a/pitti-desktop.yaml b/pitti-desktop.yaml deleted file mode 100644 index d8aae02..0000000 --- a/pitti-desktop.yaml +++ /dev/null @@ -1,147 +0,0 @@ -include: fedora-common-ostree.yaml - -ref: pitti-desktop -rojig: - name: pitti-desktop - summary: "Pitti Desktop" - license: MIT - -repos: - - fedora-34 - - fedora-34-updates - - fedora-34-updates-testing - - rpmfusion-free - - rpmfusion-free-updates - -packages: -# hardware/drivers - - kernel - - kernel-modules-extra - - iwl6000g2a-firmware - - iwl7260-firmware - - alsa-sof-firmware - - NetworkManager-wifi - - NetworkManager-openvpn-gnome - - sane-backends - - sane-backends-drivers-scanners - - powertop - - iwd - - wpa_supplicant - - udisks2-lvm2 - - opensc -# basic system - - acl - - attr - - basesystem - - cryptsetup - - dnsmasq - - fedora-workstation-backgrounds - - filesystem - - glibc-langpack-de - - glibc-langpack-en - - hostname - - iproute - - kbd - - nss-altfiles - - pciutils - # don't care, but rpm-ostree build fails otherwise - - selinux-policy-targeted - - sudo - - usbutils -# shell tools and development - - bc - - gnupg2 - - fpaste - - lsof - - man-db - - mtr - - tree - - bzip2 - - zip - - unzip - - vim-enhanced - - ranger - - bash-completion - - fish - - qemu-system-x86-core - - qemu-ui-sdl - - qemu-img - - openvpn - - mutt - - nmap-ncat - - isync - - weechat - - duplicity - - openssh-server - - systemd-container - - git - - patchutils - - make - - strace - - wget - - w3m - - cockpit-system - - cockpit-ws - - syncthing - - krb5-workstation - -# desktop plumbing/apps - - dejavu-sans-fonts - - dejavu-serif-fonts - - dejavu-sans-mono-fonts - - fontawesome-fonts - - google-noto-emoji-color-fonts - - - gvfs-mtp - - pulseaudio-utils - - alsa-plugins-pulseaudio - - gstreamer1-plugins-good - - gstreamer1-plugins-ugly - - gstreamer1-libav - # for wf-recorder - - libavdevice - - xdg-desktop-portal-gtk - - - pavucontrol - - pcmanfm - - simple-scan - - nm-connection-editor - - eog - - evince - - rhythmbox - - gnome-keyring - - pinentry-gnome3 - - lxpolkit - - lxterminal - - gnome-disk-utility - - gtimelog - - rofimoji - -# sway/wayland desktop - - sway - - swayidle - - swaylock - - kanshi - - mako - - waybar - - slurp - - grim - - xorg-x11-server-Xwayland - - firefox-wayland - - wofi - - brightnessctl - - wl-clipboard - -exclude-packages: - # recommended by sway - - alacritty - - brltty - - glibc-all-langpacks - - xdg-desktop-portal-wlr - # recommended by gtimelog - - yelp - -add-files: - - ["2015-RH-IT-Root-CA.pem", "/etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem"] - -postprocess-script: pitti-post.sh diff --git a/pitti-post.sh b/pitti-post.sh deleted file mode 100755 index 1a4032c..0000000 --- a/pitti-post.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env bash -set -xeuo pipefail - -# Enable SysRQ -echo 'kernel.sysrq = 1' > /usr/lib/sysctl.d/90-sysrq.conf - -# power saving -echo 'blacklist e1000e' > /usr/lib/modprobe.d/blacklist-local.conf - -# NetworkManager config -cat < /usr/lib/NetworkManager/conf.d/local.conf -[main] -plugins= - -[device] -#wifi.backend=iwd -EOF -#ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service - -ln -sfn /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf - -# set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949) -patch /etc/pam.d/system-auth < /etc/systemd.journald.conf.new + mv /etc/systemd.journald.conf{.new,} +fi + +# See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 +# Basically that program handles deleting old shared library directories +# 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 +done diff --git a/x1-gen7-sway-desktop.yaml b/x1-gen7-sway-desktop.yaml new file mode 100644 index 0000000..9066bad --- /dev/null +++ b/x1-gen7-sway-desktop.yaml @@ -0,0 +1,156 @@ +include: fedora-common-ostree.yaml + +ref: x1-gen7-sway-desktop +rojig: + name: x1-gen7-sway-desktop + summary: "Thinkpad X1 Gen 7 Sway Desktop" + license: MIT + +repos: + - fedora-34 + - fedora-34-updates + - fedora-34-updates-testing + - rpmfusion-free + - rpmfusion-free-updates + +packages: +# hardware / drivers + - alsa-sof-firmware + - fwupd + - iwl6000g2a-firmware + - iwl7260-firmware + - kernel + - kernel-modules-extra + - libva-intel-driver + - libva-intel-hybrid-driver + - opensc + - udisks2-lvm2 +# basic system + - acl + - attr + - basesystem + - coreutils + - 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 +# diagnostic / utils + - bind-utils + - htop + - iotop + - iproute + - lm_sensors + - lsof + - mtr + - net-tools + - nmap-ncat + - pciutils + - powertop +# alternative modern rust apps + - bat + - ripgrep +# wifi + - iwd + - NetworkManager + - network-manager-applet + - wpa_supplicant +# shell tools and development + - alacritty + - bash-completion + - bc + - bzip2 + - emacs + - git + - gnupg2 + - 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 + - fontawesome-fonts + - google-noto-emoji-color-fonts +# audio / video + - alsa-plugins-pulseaudio + - ffmpeg + - gstreamer1-libav + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly + - gvfs-mtp + - libavdevice + - libva + - libva-utils + - pavucontrol + - pulseaudio-utils + - vlc +# misc + - okular + - redshift + - xdg-desktop-portal-gtk +# sway / wayland desktop + - brightnessctl + - firefox-wayland + - grim + - i3status-rs + - kanshi + - mako + - slurp + - sway + - swayidle + - swaylock + - waybar + - wl-clipboard + - wofi +# 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 + +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"] From bc9f72009292e07142959ab95434f9758b6f52f3 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 11 May 2022 23:12:32 +0200 Subject: [PATCH 106/113] f35 full tree --- README.md | 9 - better-fonts.repo | 10 + compose.sh | 4 +- comps-sync.py | 2 +- config/environment.d/wayland.conf | 4 + config/greetd/config.toml | 6 + config/greetd/environments | 2 + fedora-34-updates.repo | 13 - fedora-35-updates.repo | 6 + fedora-34.repo => fedora-35.repo | 6 +- fedora-base.yaml | 6 +- fedora-common-ostree-pkgs.yaml | 5 +- fedora-common-ostree.yaml | 33 ++- fedora-deepin.yaml | 6 +- fedora-kinoite.yaml | 11 +- fedora-lxqt.yaml | 6 +- fedora-mate.yaml | 6 +- fedora-pantheon.yaml | 6 +- fedora-silverblue.yaml | 9 +- fedora-xfce.yaml | 6 +- greetd-35.repo | 11 + mate-desktop-pkgs.yaml | 8 +- post.sh | 10 +- rpmfusion-free-35.repo | 33 +++ rpmfusion-free-updates-35.repo | 30 +++ x1-gen7-sway-desktop.yaml | 402 ++++++++++++++++++++++++------ 26 files changed, 508 insertions(+), 142 deletions(-) create mode 100644 better-fonts.repo create mode 100644 config/environment.d/wayland.conf create mode 100644 config/greetd/config.toml create mode 100644 config/greetd/environments delete mode 100644 fedora-34-updates.repo create mode 100644 fedora-35-updates.repo rename fedora-34.repo => fedora-35.repo (64%) create mode 100644 greetd-35.repo create mode 100644 rpmfusion-free-35.repo create mode 100644 rpmfusion-free-updates-35.repo diff --git a/README.md b/README.md index cbf5eb2..0f9b56a 100644 --- a/README.md +++ b/README.md @@ -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: - diff --git a/better-fonts.repo b/better-fonts.repo new file mode 100644 index 0000000..48a44c8 --- /dev/null +++ b/better-fonts.repo @@ -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 diff --git a/compose.sh b/compose.sh index 01f2231..8038f04 100755 --- a/compose.sh +++ b/compose.sh @@ -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 diff --git a/comps-sync.py b/comps-sync.py index 6474b1d..aea3449 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Usage: ./comps-sync.py /path/to/comps-f36.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 diff --git a/config/environment.d/wayland.conf b/config/environment.d/wayland.conf new file mode 100644 index 0000000..7a78aa7 --- /dev/null +++ b/config/environment.d/wayland.conf @@ -0,0 +1,4 @@ +XDG_SESSION_TYPE=wayland +XDG_CURRENT_DESKTOP=sway +MOZ_ENABLE_WAYLAND=1 +SDL_VIDEODRIVER=wayland diff --git a/config/greetd/config.toml b/config/greetd/config.toml new file mode 100644 index 0000000..8e05065 --- /dev/null +++ b/config/greetd/config.toml @@ -0,0 +1,6 @@ +[terminal] +vt = 1 + +[default_session] +command = "cage -s -- gtkgreet" +user = "greeter" diff --git a/config/greetd/environments b/config/greetd/environments new file mode 100644 index 0000000..d16bb19 --- /dev/null +++ b/config/greetd/environments @@ -0,0 +1,2 @@ +sway +bash diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo deleted file mode 100644 index e107df5..0000000 --- a/fedora-34-updates.repo +++ /dev/null @@ -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 diff --git a/fedora-35-updates.repo b/fedora-35-updates.repo new file mode 100644 index 0000000..afcf850 --- /dev/null +++ b/fedora-35-updates.repo @@ -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 \ No newline at end of file diff --git a/fedora-34.repo b/fedora-35.repo similarity index 64% rename from fedora-34.repo rename to fedora-35.repo index 18b9b5c..07213ca 100644 --- a/fedora-34.repo +++ b/fedora-35.repo @@ -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 diff --git a/fedora-base.yaml b/fedora-base.yaml index 6b4910b..0f7fa07 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -1,5 +1,5 @@ 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" @@ -15,5 +15,5 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 91183b6..dfa1441 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -5,7 +5,7 @@ packages: - NetworkManager-config-connectivity-fedora - NetworkManager-wifi - NetworkManager-wwan - - abattis-cantarell-vf-fonts + - abattis-cantarell-fonts - acl - adwaita-qt5 - alsa-sof-firmware @@ -36,6 +36,9 @@ packages: - curl - cyrus-sasl-plain - default-editor + - dejavu-sans-fonts + - dejavu-sans-mono-fonts + - dejavu-serif-fonts - dhcp-client - dnsmasq - e2fsprogs diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 83082c0..fbda7e3 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,10 +1,13 @@ -ref: fedora/34/${basearch}/ostree-base +ref: fedora/rawhide/${basearch}/ostree-base -automatic_version_prefix: "36" -mutate-os-release: "36" +automatic_version_prefix: "35" +mutate-os-release: "35" + +include: fedora-common-ostree-pkgs.yaml packages: - git-core + - lvm2 - rpm-ostree # Container management - buildah @@ -14,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 @@ -22,6 +40,8 @@ etc-group-members: - wheel tmp-is-dir: true +postprocess-script: post.sh + ignore-removed-users: - root ignore-removed-groups: @@ -61,6 +81,13 @@ packages-x86_64: - 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: diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 890408c..1bde080 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -1,5 +1,5 @@ include: deepin-desktop-pkgs.yaml -ref: fedora/34/${basearch}/deepin +ref: fedora/35/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -12,5 +12,5 @@ packages: - gnome-software repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 763dda2..cc331f8 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,5 +1,5 @@ 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" @@ -30,11 +30,6 @@ exclude-packages: - plasma-discover-rpm-ostree - plasma-pk-updates -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - plasma-discover-offline-updates - - plasma-discover-packagekit - repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index aa35f3c..74f5071 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -1,5 +1,5 @@ include: lxqt-desktop-pkgs.yaml -ref: fedora/34/${basearch}/lxqt +ref: fedora/35/${basearch}/lxqt rojig: name: fedora-lxqt summary: "Fedora LXQt base image" @@ -13,5 +13,5 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 4e865c2..ee0f8e3 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -1,5 +1,5 @@ include: mate-desktop-pkgs.yaml -ref: fedora/34/${basearch}/mate +ref: fedora/35/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -14,5 +14,5 @@ exclude-packages: - python3-unbound repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml index 84e62ca..e6b32de 100644 --- a/fedora-pantheon.yaml +++ b/fedora-pantheon.yaml @@ -1,5 +1,5 @@ include: pantheon-desktop-pkgs.yaml -ref: fedora/34/${basearch}/pantheon +ref: fedora/35/${basearch}/pantheon rojig: name: fedora-pantheon summary: "Fedora Pantheon base image" @@ -10,5 +10,5 @@ packages: - fedora-release-ostree-desktop repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 867cc64..bcaca35 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,5 +1,5 @@ include: gnome-desktop-pkgs.yaml -ref: fedora/34/${basearch}/silverblue +ref: fedora/35/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -15,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 diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 7a93437..408ca09 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -1,5 +1,5 @@ include: xfce-desktop-pkgs.yaml -ref: fedora/34/${basearch}/xfce +ref: fedora/35/${basearch}/xfce rojig: name: fedora-xfce summary: "Fedora XFCE base image" @@ -11,5 +11,5 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk repos: - - fedora-34 - - fedora-34-updates + - fedora-35 + - fedora-35-updates diff --git a/greetd-35.repo b/greetd-35.repo new file mode 100644 index 0000000..f78ff45 --- /dev/null +++ b/greetd-35.repo @@ -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 diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 3bd86d0..45c141b 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -23,10 +23,10 @@ packages: - dconf-editor - engrampa - eom - - f36-backgrounds-base - - f36-backgrounds-extras-base - - f36-backgrounds-extras-mate - - f36-backgrounds-mate + - f35-backgrounds-base + - f35-backgrounds-extras-base + - f35-backgrounds-extras-mate + - f35-backgrounds-mate - fedora-release-matecompiz - firefox - firewall-config diff --git a/post.sh b/post.sh index 03b03a8..39db86f 100755 --- a/post.sh +++ b/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 diff --git a/rpmfusion-free-35.repo b/rpmfusion-free-35.repo new file mode 100644 index 0000000..a1fb520 --- /dev/null +++ b/rpmfusion-free-35.repo @@ -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 + diff --git a/rpmfusion-free-updates-35.repo b/rpmfusion-free-updates-35.repo new file mode 100644 index 0000000..f7553a1 --- /dev/null +++ b/rpmfusion-free-updates-35.repo @@ -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 + diff --git a/x1-gen7-sway-desktop.yaml b/x1-gen7-sway-desktop.yaml index 9066bad..df68271 100644 --- a/x1-gen7-sway-desktop.yaml +++ b/x1-gen7-sway-desktop.yaml @@ -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"] From 61ac168bea55cdad53bdc6d638827e3ee791b698 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sun, 14 Aug 2022 23:08:23 +0200 Subject: [PATCH 107/113] 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"] From e93bcf8bafd01d1f50325a50bc8adc4ac71f6742 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sat, 24 Dec 2022 22:16:08 +0100 Subject: [PATCH 108/113] upgrade to fedora 37 --- README.md | 92 +++++++++++++++++++ better-fonts-36.repo => better-fonts-37.repo | 2 +- compose.sh | 2 + ...-36-updates.repo => fedora-37-updates.repo | 6 +- fedora-36.repo => fedora-37.repo | 6 +- greetd-36.repo => greetd-37.repo | 2 +- post.sh | 3 + ...ion-free-36.repo => rpmfusion-free-37.repo | 25 +++-- ...-36.repo => rpmfusion-free-updates-37.repo | 25 +++-- x13-gen1-sway-desktop.yaml | 21 ++--- 10 files changed, 139 insertions(+), 45 deletions(-) rename better-fonts-36.repo => better-fonts-37.repo (90%) rename fedora-36-updates.repo => fedora-37-updates.repo (55%) rename fedora-36.repo => fedora-37.repo (64%) rename greetd-36.repo => greetd-37.repo (90%) rename rpmfusion-free-36.repo => rpmfusion-free-37.repo (74%) rename rpmfusion-free-updates-36.repo => rpmfusion-free-updates-37.repo (66%) diff --git a/README.md b/README.md index 0f9b56a..9744e91 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,95 @@ +# Vladan's X13 Gen 1 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. + +Run `sudo ./compose.sh` from the root folder of this repo to build the rootfs in a local repo. Don't forget to change the path related env vars. + +--- +Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) +--- + +# Manifests for rpm-ostree based Fedora variants + +This is the configuration needed to create +[rpm-ostree](https://coreos.github.io/rpm-ostree/) based variants of Fedora. +Each variant is described in a YAML +[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by +rpm-ostree to compose an ostree commit with the package requested. + +In the Fedora infrastructure, this happens via +[pungi](https://pagure.io/pungi-fedora) with +[Lorax](https://github.com/weldr/lorax) +([templates](https://pagure.io/fedora-lorax-templates)). + +## Fedora Silverblue + +- Website: https://silverblue.fedoraproject.org/ ([sources](https://github.com/fedora-silverblue/silverblue-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-silverblue/ ([sources](https://github.com/fedora-silverblue/silverblue-docs)) +- Issue tracker: https://github.com/fedora-silverblue/issue-tracker/issues + +## Fedora Kinoite + +- Website: https://kinoite.fedoraproject.org/ ([sources](https://pagure.io/fedora-kde/kinoite-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-kinoite/ ([sources](https://pagure.io/fedora-kde/kinoite-docs)) +- Issue tracker: https://pagure.io/fedora-kde/SIG/issues + +## Building + +Instructions to perform a local build of Silverblue: + +``` +# Clone the config +git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config + +# Prepare directories +mkdir -p repo cache +ostree --repo=repo init --mode=archive + +# Build (compose) the variant of your choice +sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml + +# Update summary file +ostree summary --repo=repo --update +``` + +## Testing + +Instructions to test the resulting build: + +- First, serve the ostree repo using an HTTP server. You can use any static file server. For example using : + + ``` + simple-http-server --index --ip 192.168.122.1 --port 8000 + ``` + +- Then, on an already installed Silverblue system: + +``` +# Add an ostree remote +sudo ostree remote add testremote http://192.168.122.1:8000/repo --no-gpg-verify + +# Pin the currently deployed (and probably working) version +sudo ostree admin pin 0 + +# List refs from variant remote +sudo ostree remote refs testremote + +# Switch to your variant +sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue + +# Reboot and test! +``` + +## Historical references + +Building and testing instructions: + +- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/ +- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/ +- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/ +- https://www.projectatomic.io/docs/compose-your-own-tree/ + For some background, see: - diff --git a/better-fonts-36.repo b/better-fonts-37.repo similarity index 90% rename from better-fonts-36.repo rename to better-fonts-37.repo index d355377..90740cc 100644 --- a/better-fonts-36.repo +++ b/better-fonts-37.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-36-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-37-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/compose.sh b/compose.sh index c68628d..9b93213 100755 --- a/compose.sh +++ b/compose.sh @@ -10,3 +10,5 @@ if [ ! -d $REPO/objects ]; then fi rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x13-gen1-sway-desktop.yaml +ostree summary --repo=$REPO --update + diff --git a/fedora-36-updates.repo b/fedora-37-updates.repo similarity index 55% rename from fedora-36-updates.repo rename to fedora-37-updates.repo index 563c4d5..c5b65df 100644 --- a/fedora-36-updates.repo +++ b/fedora-37-updates.repo @@ -1,6 +1,6 @@ -[fedora-36-updates] -name=Fedora 36 $basearch Updates -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f36&arch=$basearch +[fedora-37-updates] +name=Fedora 37 $basearch Updates +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f37&arch=$basearch enabled=1 gpgcheck=1 metadata_expire=1d diff --git a/fedora-36.repo b/fedora-37.repo similarity index 64% rename from fedora-36.repo rename to fedora-37.repo index 67918a5..7e41cb3 100644 --- a/fedora-36.repo +++ b/fedora-37.repo @@ -1,6 +1,6 @@ -[fedora-36] -name=Fedora 36 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch +[fedora-37] +name=Fedora 37 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-37&arch=$basearch enabled=1 gpgcheck=1 metadata_expire=1d diff --git a/greetd-36.repo b/greetd-37.repo similarity index 90% rename from greetd-36.repo rename to greetd-37.repo index 2152ba6..9decc39 100644 --- a/greetd-36.repo +++ b/greetd-37.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-36-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-37-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/post.sh b/post.sh index 39db86f..461b514 100755 --- a/post.sh +++ b/post.sh @@ -26,3 +26,6 @@ for x in /usr/sbin/glibc_post_upgrade.*; do ln -srf /usr/bin/true ${x} fi done + +# enable services +systemctl enable greetd diff --git a/rpmfusion-free-36.repo b/rpmfusion-free-37.repo similarity index 74% rename from rpmfusion-free-36.repo rename to rpmfusion-free-37.repo index 73c8297..f21c8d7 100644 --- a/rpmfusion-free-36.repo +++ b/rpmfusion-free-37.repo @@ -1,33 +1,32 @@ -[rpmfusion-free-36] -name=RPM Fusion for Fedora 36 - Free +[rpmfusion-free-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-37&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-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-debuginfo-36] -name=RPM Fusion for Fedora 36 - Free - Debug +[rpmfusion-free-debuginfo-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-37&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-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-source-36] -name=RPM Fusion for Fedora 36 - Free - Source +[rpmfusion-free-source-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-37&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-36 - +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 diff --git a/rpmfusion-free-updates-36.repo b/rpmfusion-free-updates-37.repo similarity index 66% rename from rpmfusion-free-updates-36.repo rename to rpmfusion-free-updates-37.repo index 4bb0d7c..6e1831b 100644 --- a/rpmfusion-free-updates-36.repo +++ b/rpmfusion-free-updates-37.repo @@ -1,30 +1,29 @@ -[rpmfusion-free-updates-36] -name=RPM Fusion for Fedora 36 - Free - Updates +[rpmfusion-free-updates-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-37&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 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-updates-debuginfo-36] -name=RPM Fusion for Fedora 36 - Free - Updates Debug +[rpmfusion-free-updates-debuginfo-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-37&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 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-updates-source-36] -name=RPM Fusion for Fedora 36 - Free - Updates Source +[rpmfusion-free-updates-source-37] +name=RPM Fusion for Fedora 37 - 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 +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-37&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 - +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml index f8a53d0..c96cf14 100644 --- a/x13-gen1-sway-desktop.yaml +++ b/x13-gen1-sway-desktop.yaml @@ -1,17 +1,17 @@ -ref: x13-gen1-sway-desktop-36 +ref: x13-gen1-sway-desktop-37 rojig: - name: x13-gen1-sway-desktop-36 - summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 36" + name: x13-gen1-sway-desktop-37 + summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 37" license: MIT -automatic_version_prefix: "36" -mutate-os-release: "36" +automatic_version_prefix: "37" +mutate-os-release: "37" repos: - - fedora-36 - - fedora-36-updates - - rpmfusion-free-36 - - rpmfusion-free-updates-36 + - fedora-37 + - fedora-37-updates + - rpmfusion-free-37 + - rpmfusion-free-updates-37 - copr:copr.fedorainfracloud.org:dawid:better_fonts - copr:copr.fedorainfracloud.org:alebastr:sway-extras @@ -121,7 +121,6 @@ packages: - 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 @@ -144,7 +143,7 @@ packages: - sil-mingzat-fonts - sil-nuosu-fonts - sil-padauk-fonts - - smc-meera-fonts + - rit-meera-new-fonts - terminus-fonts - thai-scalable-waree-fonts - ucs-miscfixed-opentype-fonts From 394063b9d245f554704cb10bb5c5b584a7b120f7 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Tue, 27 Dec 2022 23:16:55 +0100 Subject: [PATCH 109/113] add sway config to tree (etc) --- config/sway/bin/keyboard-layout-per-window.py | 42 ++++ config/sway/config | 1 + config/sway/config.d/10-variables.conf | 15 ++ config/sway/config.d/20-output.conf | 16 ++ config/sway/config.d/30-input.conf | 27 +++ config/sway/config.d/50-style.conf | 47 +++++ config/sway/config.d/60-app-windows.conf | 34 ++++ config/sway/config.d/90-bindings.conf | 150 ++++++++++++++ config/sway/config.d/91-swaysome.conf | 52 +++++ config/sway/config.d/99-startup.conf | 3 + config/waybar/config | 177 ++++++++-------- config/waybar/keyboard-layout.py | 36 ++++ config/waybar/style.css | 192 +++++------------- x13-gen1-sway-desktop.yaml | 14 +- 14 files changed, 573 insertions(+), 233 deletions(-) create mode 100755 config/sway/bin/keyboard-layout-per-window.py create mode 100644 config/sway/config create mode 100644 config/sway/config.d/10-variables.conf create mode 100644 config/sway/config.d/20-output.conf create mode 100644 config/sway/config.d/30-input.conf create mode 100644 config/sway/config.d/50-style.conf create mode 100644 config/sway/config.d/60-app-windows.conf create mode 100644 config/sway/config.d/90-bindings.conf create mode 100644 config/sway/config.d/91-swaysome.conf create mode 100644 config/sway/config.d/99-startup.conf create mode 100755 config/waybar/keyboard-layout.py diff --git a/config/sway/bin/keyboard-layout-per-window.py b/config/sway/bin/keyboard-layout-per-window.py new file mode 100755 index 0000000..15e5dfb --- /dev/null +++ b/config/sway/bin/keyboard-layout-per-window.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python + +# This script keeps track of active keyboard layouts per window. +# +# This script requires i3ipc-python package (install it from a system package +# manager or pip). +# +# https://github.com/swaywm/sway/pull/4504/files +import i3ipc + +sway = i3ipc.Connection() +prev_focused = sway.get_tree().find_focused().id +windows = {} + +def on_window_focus(ipc, event): + global windows, prev_focused + + # Save current layouts + layouts = {input.identifier: input.xkb_active_layout_index for input in sway.get_inputs()} + windows[prev_focused] = layouts + + # Restore layout of the newly focused window + if event.container.id in windows: + for (input_id, layout_index) in windows[event.container.id].items(): + if layout_index != layouts[input_id]: + sway.command(f'input "{input_id}" xkb_switch_layout {layout_index}') + + prev_focused = event.container.id + +def on_window_close(ipc, event): + global windows + if event.container.id in windows: + del(windows[event.container.id]) + +def on_window(ipc, event): + if event.change == "focus": + on_window_focus(ipc, event) + elif event.change == "close": + on_window_close(ipc, event) + +sway.on("window", on_window) +sway.main() diff --git a/config/sway/config b/config/sway/config new file mode 100644 index 0000000..a1fafba --- /dev/null +++ b/config/sway/config @@ -0,0 +1 @@ +include /etc/sway/config.d/* diff --git a/config/sway/config.d/10-variables.conf b/config/sway/config.d/10-variables.conf new file mode 100644 index 0000000..afc9aff --- /dev/null +++ b/config/sway/config.d/10-variables.conf @@ -0,0 +1,15 @@ +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term alacritty +# Your preferred application launcher +# Note: it's recommended that you pass the final command to sway +# set $menu wofi -c $HOME/.config/wofi/config -s $HOME/.config/wofi/style.css | xargs swaymsg exec -- +set $menu ~/src/wldash/target/release/wldash diff --git a/config/sway/config.d/20-output.conf b/config/sway/config.d/20-output.conf new file mode 100644 index 0000000..3a723ab --- /dev/null +++ b/config/sway/config.d/20-output.conf @@ -0,0 +1,16 @@ +### Output configuration +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs +# +output DP-1 bg ~/.config/sway/bkg2.jpg fill +output DP-1 scale 1.2 res 3840x2160 pos 0 0 +output DP-2 bg ~/.config/sway/bkg2.jpg fill +output DP-2 scale 1.2 res 3840x2160 pos 0 0 +output HDMI-A-1 bg ~/.config/sway/bkg2.jpg fill +output HDMI-A-1 scale 1.2 res 3840x2160 pos 0 0 +output eDP-1 bg ~/.config/sway/bkg.jpg fill +output eDP-1 scale 1.0 res 1920x1080 pos 640 1800 diff --git a/config/sway/config.d/30-input.conf b/config/sway/config.d/30-input.conf new file mode 100644 index 0000000..9dfbe9d --- /dev/null +++ b/config/sway/config.d/30-input.conf @@ -0,0 +1,27 @@ +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +input * xkb_layout "us,mk" +input * xkb_variant "typewriter" +input * xkb_options "grp:caps_toggle" + +# Pulse Audio controls +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume +bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle # mute sound +bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1b.0.analog-stereo toggle # mute mic + +# Sreen brightness controls +bindsym XF86MonBrightnessUp exec brightnessctl -q s +10% +bindsym XF86MonBrightnessDown exec brightnessctl -q s 10%- diff --git a/config/sway/config.d/50-style.conf b/config/sway/config.d/50-style.conf new file mode 100644 index 0000000..49f4ab4 --- /dev/null +++ b/config/sway/config.d/50-style.conf @@ -0,0 +1,47 @@ +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + swaybar_command waybar +} + +# Remove title from windows +default_border pixel 1 +default_floating_border normal +bindsym $mod+t border toggle + +hide_edge_borders smart + +# Background +set $bg #232425 +# Background active +set $ba #191919 +# Background inactive +set $bi #3f3f3f +# Foreground active +set $fa #eff1f5 +# Foreground inactive +set $fi #646464 +# Border active +set $bra #9a9a9a +# Border inactive +set $bri #000000 + +# class border backgr. text indicator child_border +client.focused $bra $bra $bg $bg $bra +client.focused_inactive $bra $ba $fa $bg $bri +client.unfocused $bri $bi $fi $bg $bri +#client.urgent $br $br $fg $bg $br #currently not implemented +#client.placeholder $br $br $fg $bg $br #currently not implemented +client.background $bg + +gaps inner 0 +gaps outer 0 +#smart_gaps on + +for_window [app_id=".*"] border normal diff --git a/config/sway/config.d/60-app-windows.conf b/config/sway/config.d/60-app-windows.conf new file mode 100644 index 0000000..e5221e2 --- /dev/null +++ b/config/sway/config.d/60-app-windows.conf @@ -0,0 +1,34 @@ +for_window [class="Firefox"] mark Browser +for_window [class="Firefox" window_role="Browser"] { + border normal 0 +} +# firefox floating menus +for_window [window_role="pop-up"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="pop-up"] floating enable +for_window [window_role="bubble"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="Preferences"] floating enable +for_window [window_type="dialog"] floating enable +for_window [window_type="menu"] floating enable +for_window [title="About Mozilla Firefox"] floating enabled +for_window [title="Password Required - Mozilla Firefox"] floating enabled +for_window [app_id="pinentry-qt"] { + move position center + floating enable +} +for_window [app_id="pavucontrol"] { + move position center + floating enable +} +for_window [app_id="wdisplays"] { + floating enable +} +for_window [app_id="com.nextcloud.desktopclient.nextcloud"] { + border normal 1 + floating enable +} + +for_window [app_id="avizo-service"] border pixel 0 +for_window [app_id="avizo-service"] sticky toggle +no_focus [app_id="avizo-service"] diff --git a/config/sway/config.d/90-bindings.conf b/config/sway/config.d/90-bindings.conf new file mode 100644 index 0000000..51af250 --- /dev/null +++ b/config/sway/config.d/90-bindings.conf @@ -0,0 +1,150 @@ +### Key bindings +# +# Basics: +# + # start a terminal + bindsym $mod+Return exec $term + + # kill focused window + bindsym $mod+Shift+q kill + + # start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # reload the configuration file + bindsym $mod+Shift+c reload + + # exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # _move_ the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # switch to workspace + bindsym $mod+1 workspace 1 + bindsym $mod+2 workspace 2 + bindsym $mod+3 workspace 3 + bindsym $mod+4 workspace 4 + bindsym $mod+5 workspace 5 + bindsym $mod+6 workspace 6 + bindsym $mod+7 workspace 7 + bindsym $mod+8 workspace 8 + bindsym $mod+9 workspace 9 + bindsym $mod+0 workspace 10 + # move focused container to workspace + bindsym $mod+Shift+1 move container to workspace 1 + bindsym $mod+Shift+2 move container to workspace 2 + bindsym $mod+Shift+3 move container to workspace 3 + bindsym $mod+Shift+4 move container to workspace 4 + bindsym $mod+Shift+5 move container to workspace 5 + bindsym $mod+Shift+6 move container to workspace 6 + bindsym $mod+Shift+7 move container to workspace 7 + bindsym $mod+Shift+8 move container to workspace 8 + bindsym $mod+Shift+9 move container to workspace 9 + bindsym $mod+Shift+0 move container to workspace 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show + + + +# Lock screen +bindsym $mod+z exec swaylock -c 000000 + +# Take full screen screenshot with PrtScr +bindsym Print exec grim -t png /tmp/screen.png +# Take area screenshot with Shift+PrtScr +bindsym Shift+Print exec grim -g "$(slurp)" /tmp/screen.png + +# +# Resizing containers: +# + bindsym $mod+r mode "resize" + + mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" + } + diff --git a/config/sway/config.d/91-swaysome.conf b/config/sway/config.d/91-swaysome.conf new file mode 100644 index 0000000..7f5308f --- /dev/null +++ b/config/sway/config.d/91-swaysome.conf @@ -0,0 +1,52 @@ +# Change focus between workspaces +unbindsym $mod+1 +unbindsym $mod+2 +unbindsym $mod+3 +unbindsym $mod+4 +unbindsym $mod+5 +unbindsym $mod+6 +unbindsym $mod+7 +unbindsym $mod+8 +unbindsym $mod+9 +unbindsym $mod+0 +bindsym $mod+1 exec "swaysome focus 1" +bindsym $mod+2 exec "swaysome focus 2" +bindsym $mod+3 exec "swaysome focus 3" +bindsym $mod+4 exec "swaysome focus 4" +bindsym $mod+5 exec "swaysome focus 5" +bindsym $mod+6 exec "swaysome focus 6" +bindsym $mod+7 exec "swaysome focus 7" +bindsym $mod+8 exec "swaysome focus 8" +bindsym $mod+9 exec "swaysome focus 9" +bindsym $mod+0 exec "swaysome focus 0" + +# Move containers between workspaces +unbindsym $mod+Shift+1 +unbindsym $mod+Shift+2 +unbindsym $mod+Shift+3 +unbindsym $mod+Shift+4 +unbindsym $mod+Shift+5 +unbindsym $mod+Shift+6 +unbindsym $mod+Shift+7 +unbindsym $mod+Shift+8 +unbindsym $mod+Shift+9 +unbindsym $mod+Shift+0 +bindsym $mod+Shift+1 exec "swaysome move 1" +bindsym $mod+Shift+2 exec "swaysome move 2" +bindsym $mod+Shift+3 exec "swaysome move 3" +bindsym $mod+Shift+4 exec "swaysome move 4" +bindsym $mod+Shift+5 exec "swaysome move 5" +bindsym $mod+Shift+6 exec "swaysome move 6" +bindsym $mod+Shift+7 exec "swaysome move 7" +bindsym $mod+Shift+8 exec "swaysome move 8" +bindsym $mod+Shift+9 exec "swaysome move 9" +bindsym $mod+Shift+0 exec "swaysome move 0" + +# Move focused container to next output +bindsym $mod+o exec "swaysome next_output" + +# Move focused container to previous output +bindsym $mod+Shift+o exec "swaysome prev_output" + +# Init workspaces for every screen +exec "swaysome init 1" diff --git a/config/sway/config.d/99-startup.conf b/config/sway/config.d/99-startup.conf new file mode 100644 index 0000000..12814dd --- /dev/null +++ b/config/sway/config.d/99-startup.conf @@ -0,0 +1,3 @@ +exec "/usr/local/bin/keyboard-layout-per-window.py" +exec "systemctl --user start sway-session.target" +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway diff --git a/config/waybar/config b/config/waybar/config index 8b81d45..2bc2738 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -1,95 +1,90 @@ { - "layer": "top", - "position": "bottom", - "height": 24, - "modules-left": ["sway/workspaces", "idle_inhibitor", "sway/mode"], - "modules-center": ["sway/window"], - "modules-right": [ "pulseaudio", "backlight", "network", "cpu", "memory", "battery#bat0", "battery#bat1", - "tray", "sway/language", "clock" ], - "sway/workspaces": { - "disable-scroll": true, - "all-outputs": true, - "format": "{index} {name}" + "layer": "top", // Waybar at top layer + "position": "bottom", // Waybar position (top|bottom|left|right) + "height": 30, + "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], + "modules-center": [], + "modules-right": ["temperature", "network", "battery", "pulseaudio", "backlight", "cpu", "memory", "custom/layout", "clock", "tray"], + // Module config + "sway/mode": { + "tooltip": true, + "format": "{}" + }, + "temperature": { + "thermal-zone": 1, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", + "critical-threshold": 80, + "format-critical": "🌡 {temperatureC}°C", + "format": "ī‹‹ {temperatureC}°C" + }, + "custom/vpn": { + }, + "network": { + "tooltip": false, + "interface": "wlp3s0*", + "format-wifi": "ī‡Ģ {essid} ({signalStrength}%)", + "format-ethernet": "{ifname}: {ipaddr}/{cidr}", + "format-linked": "{ifname} (No IP)", + "format-alt": "{ifname}: {ipaddr}", + "format-disconnected": "No internet" + }, + "battery": { + "tooltip": false, + "states": { + "good": 95, + "warning": 30, + "critical": 15 }, - "sway/mode": { - "format": "{}" + "format": "{icon} {capacity}%", + "format-alt": "{time} {icon} {power}", + "format-charging": "ī‡Ļ {capacity}%", + "format-icons": ["đŸĒĢ", "ī‰", "🔋"], + "format-plugged": "ī‡Ļ {capacity}%" + }, + "backlight": { + "device": "amdgpu_bl0", + "format": "{icon} {percent}%", + "format-icons": ["ī„‘", "ī†…"] + }, + "pulseaudio": { + "tooltip": true, + "scroll-step": 1.0, + "format": "{icon} {volume}%", + "format-bluetooth": "ī‚ą {volume}%", + "format-muted": "🔇", + "format-source": "{volume}%", + "format-source-muted": "🔇", + "format-icons": { + "headphones": "🎧", + "handsfree": "🎧", + "headset": "🎧", + "phone": "ī‚•", + "portable": "ī‚•", + "car": "ī†š", + "default": ["🔊"] }, - "sway/language": { - "format": "{}", - "max-length": 50 - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "tooltip-format": "{:%A\n%d %B %Y\n%H:%M}", - "format": "{:%a %d %b %H:%M}", - "format-alt": "{:%H:%M}" - }, - "cpu": { - "format": "{usage:2}% ī‹›" - }, - "memory": { - "format": "{}% īƒ‰" - }, - "battery#bat0": { - "bat": "BAT0", - "name": "BAT0", - "states": { - "warning": 20, - "critical": 10 - }, - "format": "{capacity}% {icon}", - "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] - }, - "battery#bat1": { - "bat": "BAT1", - "name": "BAT1", - "states": { - "warning": 20, - "critical": 10 - }, - "format": "{capacity}% {icon}", - "format-icons": ["ī‰„", "ī‰ƒ", "ī‰‚", "ī‰", "ī‰€"] - }, - "network": { - "interval": 1, - "max-width": 50, - // "interface": "wlp2s0", // (Optional) To force the use of this interface - "format-wifi": "ī‡Ģ", - "format-ethernet": "{bandwidthUpBits} {bandwidthDownBits} īƒ", - "format-disconnected": "⚠", - "tooltip-format-wifi": "ī‡Ģ {essid}: {frequency}Mhz ({signalStrength}%)\n{bandwidthUpBits}\n{bandwidthDownBits}", - "tooltip-format-ethernet": "īƒ {ifname}: {ipaddr}/{cidr}", - "tooltip-format-disconnected": "⚠ Disconnected" - }, - "pulseaudio": { - //"scroll-step": 1, - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}īŠ”", - "format-muted": "ī€Ļ", - "format-icons": { - "headphones": "ī€Ĩ", - "handsfree": "ī–", - "headset": "ī–", - "phone": "ī‚•", - "portable": "ī‚•", - "car": "ī†š", - "default": ["ī€§", "ī€¨"] - }, - "on-click": "pavucontrol" - }, - "backlight": { - "device": "intel_backlight", - "format": "{percent}% {icon}", - "format-icons": ["ī†…", "ī„‘"] - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "īŽ", - "deactivated": "ī°" - } - } + "on-click": "pavucontrol" + }, + "cpu": { + "interval": 5, + "tooltip": false, + "format": "ī„ˆ {usage}%" + }, + "memory": { + "format": "īƒ‰ {}%" + }, + "custom/layout": { + "exec": "/etc/xdg/waybar/keyboard-layout.py", + "return-type": "json", + "format": "| {}" + }, + "clock": { + "tooltip": false, + "format": "| {:%d.%m.%Y %H:%M}" + }, + "tray": { + "tooltip": false, + "icon-size": 18, + "spacing": 5 + } } diff --git a/config/waybar/keyboard-layout.py b/config/waybar/keyboard-layout.py new file mode 100755 index 0000000..92f132a --- /dev/null +++ b/config/waybar/keyboard-layout.py @@ -0,0 +1,36 @@ +#!/usr/bin/python +import i3ipc +import json + + +long_to_short = { + 'English (US)': 'en', + 'Macedonian': 'mk', +} + +def print_status(keyboard): + layout = keyboard.xkb_active_layout_name + short_code = long_to_short.get(layout, layout) + output = {"text": short_code, "tooltip": layout, "class": short_code} + print(json.dumps(output), flush=True) + +def find_keyboard(sway): + # *the* keyboard is the one with more than one layout + for input_dev in sway.get_inputs(): + if input_dev.type == 'keyboard' and len(input_dev.xkb_layout_names) > 1: + return input_dev + +def on_input(sway, event): + if event.change == "xkb_layout" and \ + event.input.identifier == sway.keyboard.identifier: + print_status(event.input) + +def main(): + sway = i3ipc.Connection() + sway.keyboard = find_keyboard(sway) + print_status(sway.keyboard) + + sway.on(i3ipc.Event.INPUT, on_input) + sway.main() + +main() diff --git a/config/waybar/style.css b/config/waybar/style.css index f9db8d2..1bd9166 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,14 +1,13 @@ * { border: none; border-radius: 0; - font-family: Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; + font-family: Consolas, "Material Design Icons"; + font-size: 1em; min-height: 0; } window#waybar { - background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); + background-color: rgba(11, 11, 11, 0.8); color: #ffffff; transition-property: background-color; transition-duration: .5s; @@ -18,6 +17,20 @@ window#waybar.hidden { opacity: 0.2; } +#window { + padding: 0 15px; +} + +window { + color: rgba(217, 216, 216, 1); + background: rgba(35, 31, 32, 0.00); +} + +window#waybar.solo { + color: rgba(217, 216, 216, 1); + background: rgba(35, 31, 32, 0.85); +} + /* window#waybar.empty { background-color: transparent; @@ -27,187 +40,84 @@ window#waybar.solo { } */ -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button { padding: 0 5px; background-color: transparent; - color: #ffffff; - border-bottom: 3px solid transparent; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - box-shadow: inherit; - border-bottom: 3px solid #ffffff; + border-bottom: 2px solid rgba(180, 14, 25, 0.5); + color: #999999; } #workspaces button.focused { - background-color: #64727D; - border-bottom: 3px solid #ffffff; + color: #ffffff; + background-color: #333333; + border-bottom: 2px solid #ff9600; } #workspaces button.urgent { background-color: #eb4d4b; } -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - +#clock, +#custom-vpn, +#battery, #cpu, #memory, -#temperature, #backlight, #network, #pulseaudio, -#custom-media, #tray, +#temperature, #mode, #idle_inhibitor { - padding: 0 10px; + padding: 0 5px; margin: 0 4px; + background-color: transparent; + border-bottom: 2px solid #bdbd45; color: #ffffff; } -#clock { - padding: 0 10px; - color: #ffffff; - background-color: #64727D; +#temperature { + border-bottom: 2px solid #42a832; +} +#mode { + background-color: #00ff96; + color: #000000; } -#battery .BAT0 { - margin-left: 9px; -} -#battery .BAT1 { - margin-right: 9px; +#pulseaudio, +#clock, +#tray, +#cpu { + border-bottom: transparent; } + #battery { - padding: 0 10px; - background-color: #ffffff; - color: #000000; + border-bottom: 2px solid #bff874; } #battery.charging { - color: #ffffff; - background-color: #26A65B; -} - -@keyframes blink { - to { - background-color: #ffffff; - color: #000000; - } + border-bottom: 2px solid #00ff96; } +#custom-vpn.down, +#temperature.critical, #battery.critical:not(.charging) { - background-color: #f53c3c; - color: #ffffff; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + border-bottom: 2px solid #dd2241; } label:focus { background-color: #000000; } -#cpu { - background-color: #2ecc71; - color: #000000; -} - -#memory { - background-color: #9b59b6; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #2980b9; -} - #network.disconnected { - background-color: #f53c3c; + border-bottom: 2px solid #dd2241; } -#pulseaudio { - background-color: #f1c40f; - color: #000000; +#pulseaudio.bluetooth { + border-bottom: 2px solid #1a8cff; } #pulseaudio.muted { - background-color: #90b1b1; - color: #2a5c45; + border-bottom: 2px solid #fff569; } - -#custom-media { - background-color: #66cc99; - color: #2a5c45; - min-width: 100px; -} - -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} - -#tray { - background-color: #2980b9; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { - background-color: #90b1b1; -} - -#mpd.paused { - background-color: #51a37a; -} -#custom-layout { - background-color: #ecf0f1; - color: #2d3436; - min-width: 2em; -} - diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml index c96cf14..4c37db3 100644 --- a/x13-gen1-sway-desktop.yaml +++ b/x13-gen1-sway-desktop.yaml @@ -356,4 +356,16 @@ add-files: - ["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"] + - ["config/sway/config", "/etc/sway/config"] + - ["config/sway/config.d/10-variables.conf", "/etc/sway/config.d/10-variables.conf"] + - ["config/sway/config.d/20-output.conf", "/etc/sway/config.d/20-output.conf"] + - ["config/sway/config.d/30-input.conf", "/etc/sway/config.d/30-input.conf"] + - ["config/sway/config.d/50-style.conf", "/etc/sway/config.d/50-style.conf"] + - ["config/sway/config.d/60-app-windows.conf", "/etc/sway/config.d/60-app-windows.conf"] + - ["config/sway/config.d/90-bindings.conf", "/etc/sway/config.d/90-bindings.conf"] + - ["config/sway/config.d/91-swaysome.conf", "/etc/sway/config.d/91-swaysome.conf"] + - ["config/sway/config.d/99-startup.conf", "/etc/sway/config.d/99-startup.conf"] + - ["config/sway/bin/keyboard-layout-per-window.py", "/usr/bin/keyboard-layout-per-window.py"] + - ["config/waybar/config", "/etc/xdg/waybar/config"] + - ["config/waybar/style.css", "/etc/xdg/waybar/style.css"] + - ["config/waybar/keyboard-layout.py", "/etc/xdg/waybar/keyboard-layout.py"] From 10f017a9ff32494ce822ab361054ce70ce4a4939 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 28 Dec 2022 14:48:37 +0100 Subject: [PATCH 110/113] remove RH cert from pitti's setup --- 2015-RH-IT-Root-CA.pem | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 2015-RH-IT-Root-CA.pem diff --git a/2015-RH-IT-Root-CA.pem b/2015-RH-IT-Root-CA.pem deleted file mode 100644 index f306f00..0000000 --- a/2015-RH-IT-Root-CA.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD -VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp -Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx -GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m -b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx -WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD -VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS -ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG -9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz -bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2 -c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo -GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES -X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK -BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R -4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz -bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB -CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e -LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak -oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj -S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf -4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel -RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3 ------END CERTIFICATE----- From 1ca878a6ecdd7115ab2d2a2c65649c8684be3310 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 28 Dec 2022 14:48:54 +0100 Subject: [PATCH 111/113] remove empty line at EOL --- compose.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/compose.sh b/compose.sh index 9b93213..ca99030 100755 --- a/compose.sh +++ b/compose.sh @@ -11,4 +11,3 @@ fi rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x13-gen1-sway-desktop.yaml ostree summary --repo=$REPO --update - From 23cd1ce2ee25600e5f3b946e580a36363f676f55 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 28 Dec 2022 15:56:56 +0100 Subject: [PATCH 112/113] add wldash + config --- config/sway/config.d/10-variables.conf | 2 +- config/wldash.yaml | 82 ++++++++++++++++++++++++++ x13-gen1-sway-desktop.yaml | 3 +- 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 config/wldash.yaml diff --git a/config/sway/config.d/10-variables.conf b/config/sway/config.d/10-variables.conf index afc9aff..6397e62 100644 --- a/config/sway/config.d/10-variables.conf +++ b/config/sway/config.d/10-variables.conf @@ -12,4 +12,4 @@ set $term alacritty # Your preferred application launcher # Note: it's recommended that you pass the final command to sway # set $menu wofi -c $HOME/.config/wofi/config -s $HOME/.config/wofi/style.css | xargs swaymsg exec -- -set $menu ~/src/wldash/target/release/wldash +set $menu wldash diff --git a/config/wldash.yaml b/config/wldash.yaml new file mode 100644 index 0000000..4667602 --- /dev/null +++ b/config/wldash.yaml @@ -0,0 +1,82 @@ +--- +outputMode: active +scale: 0.6 +background: + red: 0.0 + green: 0.0 + blue: 0.0 + opacity: 0.8999999761581421 +widget: + margin: + margins: + - 20 + - 20 + - 20 + - 20 + widget: + verticalLayout: + - horizontalLayout: + - margin: + margins: + - 0 + - 88 + - 0 + - 32 + widget: + verticalLayout: + - date: + font: ~ + font_size: 64.0 + - clock: + font: ~ + font_size: 256.0 + - verticalLayout: + - margin: + margins: + - 0 + - 0 + - 0 + - 8 + widget: + battery: + font: ~ + font_size: 24.0 + length: 0 + - margin: + margins: + - 0 + - 0 + - 0 + - 8 + widget: + backlight: + device: intel_backlight + font: ~ + font_size: 24.0 + length: 0 + - margin: + margins: + - 0 + - 0 + - 0 + - 8 + widget: + pulseAudio: + font: ~ + font_size: 24.0 + length: 0 + - calendar: + font_primary: ~ + font_secondary: ~ + font_size: 16.0 + sections: 3 + - launcher: + font: ~ + font_size: 32.0 + length: 0 + app_opener: "" + term_opener: "" + url_opener: "" +fonts: + sans: sans + mono: mono diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml index 4c37db3..7fa366c 100644 --- a/x13-gen1-sway-desktop.yaml +++ b/x13-gen1-sway-desktop.yaml @@ -190,7 +190,7 @@ packages: - wayland-devel - wdisplays - wl-clipboard - - wofi + - wldash - xdg-desktop-portal-wlr # virtualization - libguestfs-tools @@ -369,3 +369,4 @@ add-files: - ["config/waybar/config", "/etc/xdg/waybar/config"] - ["config/waybar/style.css", "/etc/xdg/waybar/style.css"] - ["config/waybar/keyboard-layout.py", "/etc/xdg/waybar/keyboard-layout.py"] + - ["config/wldash.yaml", "/usr/share/wldash/config.yaml"] From 2a8d2ada457011bdbf3edd4a93165f7fb6c4aeea Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 28 Dec 2022 22:44:49 +0100 Subject: [PATCH 113/113] remove unneeded sway services --- config/modprobe.d/i2c_i801-blacklist.conf | 1 - config/sway-service.desktop | 6 ------ config/systemd/sway-session.target | 6 ------ config/systemd/wayland-session.target | 16 ---------------- x13-gen1-sway-desktop.yaml | 4 ---- 5 files changed, 33 deletions(-) delete mode 100644 config/modprobe.d/i2c_i801-blacklist.conf delete mode 100644 config/sway-service.desktop delete mode 100644 config/systemd/sway-session.target delete mode 100644 config/systemd/wayland-session.target diff --git a/config/modprobe.d/i2c_i801-blacklist.conf b/config/modprobe.d/i2c_i801-blacklist.conf deleted file mode 100644 index 70f1f9b..0000000 --- a/config/modprobe.d/i2c_i801-blacklist.conf +++ /dev/null @@ -1 +0,0 @@ -blacklist i2c_i801 diff --git a/config/sway-service.desktop b/config/sway-service.desktop deleted file mode 100644 index 63f18af..0000000 --- a/config/sway-service.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# /usr/share/wayland-sessions/sway-service.desktop -[Desktop Entry] -Name=Sway Service -Comment=i3-compatible Wayland compositor as a systemd service -Exec=sway-service.sh -Type=Application diff --git a/config/systemd/sway-session.target b/config/systemd/sway-session.target deleted file mode 100644 index 87fe41d..0000000 --- a/config/systemd/sway-session.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=sway compositor session -Documentation=man:systemd.special(7) -BindsTo=graphical-session.target wayland-session.target -Wants=graphical-session-pre.target -After=graphical-session-pre.target diff --git a/config/systemd/wayland-session.target b/config/systemd/wayland-session.target deleted file mode 100644 index d0b2888..0000000 --- a/config/systemd/wayland-session.target +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# -# This file is inspired from systemd's `graphical-session.target` -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Current wayland user session -Documentation=man:systemd.special(7) -Requires=basic.target -RefuseManualStart=yes -StopWhenUnneeded=yes -BindsTo=graphical-session.target diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml index 7fa366c..bd9e0c4 100644 --- a/x13-gen1-sway-desktop.yaml +++ b/x13-gen1-sway-desktop.yaml @@ -350,10 +350,6 @@ add-files: - ["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/sway/config", "/etc/sway/config"]