From a3bf414dc750fa0151805bf39c05946680225274 Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Thu, 5 Sep 2024 23:05:37 -0700 Subject: [PATCH] fix: yeet pantheon --- .github/workflows/build-katsu.yml | 1 - README.md | 1 - katsu/modules/pantheon/base-disk-aarch64.yaml | 48 ---- katsu/modules/pantheon/base-disk-x86_64.yaml | 47 ---- katsu/modules/pantheon/pantheon-live.sh | 225 ------------------ katsu/modules/pantheon/pantheon-live.yaml | 26 -- katsu/modules/pantheon/pantheon.yaml | 31 --- 7 files changed, 379 deletions(-) delete mode 100644 katsu/modules/pantheon/base-disk-aarch64.yaml delete mode 100644 katsu/modules/pantheon/base-disk-x86_64.yaml delete mode 100644 katsu/modules/pantheon/pantheon-live.sh delete mode 100644 katsu/modules/pantheon/pantheon-live.yaml delete mode 100644 katsu/modules/pantheon/pantheon.yaml diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 79cf8044..0b733ba6 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -134,7 +134,6 @@ jobs: - flagship/flagship-live - gnome/gnome-live - kde/kde-live - #- pantheon/pantheon-live - xfce/xfce-live runs-on: ${{ matrix.arch == 'x86_64' && matrix.variant == 'kde/kde-live' && 'x86-64-lg' || matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: diff --git a/README.md b/README.md index e3434ea7..dc2abf00 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,5 @@ The image itself is similar to the vanilla Fedora image, but includes the Ultram ### Notes -- Pantheon is not currently being built - Chromebook images are shown as failing due to me not setting them up to build yet - diff --git a/katsu/modules/pantheon/base-disk-aarch64.yaml b/katsu/modules/pantheon/base-disk-aarch64.yaml deleted file mode 100644 index cfa4e6d5..00000000 --- a/katsu/modules/pantheon/base-disk-aarch64.yaml +++ /dev/null @@ -1,48 +0,0 @@ -builder: dnf -distro: Ultramarine Linux 41 (Pantheon Edition) - -# users: -# - username: ultramarine -# # plaintext password: ultramarine -# password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3" -# groups: -# - wheel - -import: - - ../base/base.yaml - - ../base/base-disk.yaml - - pantheon.yaml - -scripts: - post: - - id: grub - name: Set up GRUB - file: ../base/grub-setup.sh - -disk: - size: 9GB - partitions: - - label: EFI - type: esp - size: 512MB - filesystem: efi - mountpoint: /boot/efi - - - label: boot - type: xbootldr - size: 1GB - filesystem: ext4 - mountpoint: /boot - - - label: root - flags: - - grow-fs - type: root - # size: 2.5MB - filesystem: ext4 - mountpoint: / - -dnf: - releasever: 41 - exec: dnf4 - arch: aarch64 diff --git a/katsu/modules/pantheon/base-disk-x86_64.yaml b/katsu/modules/pantheon/base-disk-x86_64.yaml deleted file mode 100644 index 15d25a7e..00000000 --- a/katsu/modules/pantheon/base-disk-x86_64.yaml +++ /dev/null @@ -1,47 +0,0 @@ -builder: dnf -distro: Ultramarine Linux 41 (Pantheon Edition) - -# users: -# - username: ultramarine -# # plaintext password: ultramarine -# password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3" -# groups: -# - wheel - -import: - - ../base/base.yaml - - ../base/base-disk.yaml - - pantheon.yaml - -scripts: - post: - - id: grub - name: Set up GRUB - file: ../base/grub-setup.sh - -disk: - size: 9GB - partitions: - - label: EFI - type: esp - size: 512MB - filesystem: efi - mountpoint: /boot/efi - - - label: boot - type: xbootldr - size: 1GB - filesystem: ext4 - mountpoint: /boot - - - label: root - flags: - - grow-fs - type: root - # size: 2.5MB - filesystem: ext4 - mountpoint: / - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/pantheon/pantheon-live.sh b/katsu/modules/pantheon/pantheon-live.sh deleted file mode 100644 index 2153962a..00000000 --- a/katsu/modules/pantheon/pantheon-live.sh +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/bash -x -systemctl disable -f gdm.service -systemctl enable -f lightdm.service -# create /etc/sysconfig/desktop (needed for installation) - -cat > /etc/sysconfig/desktop < /usr/share/glib-2.0/schemas/io.elementary.desktop.gschema.override << EOF -[net.launchpad.plank.dock.settings:Pantheon] -# TODO: insert apps missing from official Fedora repositories once available -# - appcenter -# - io.elementary.mail -# - io.elementary.tasks -dock-items=['gala-multitaskingview.dockitem','firefox.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] -hide-delay=250 -hide-mode='window-dodge' -show-dock-item=false -theme='Gtk+' - -[org.freedesktop.ibus.general.hotkey:Pantheon] -triggers=['space'] - -[org.freedesktop.ibus.panel:Pantheon] -show=1 - -[org.gnome.desktop.background:Pantheon] -picture-options='zoom' -picture-uri='file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-l.png' -primary-color='#000000' - -[org.gnome.desktop.datetime:Pantheon] -automatic-timezone=true - -[org.gnome.desktop.default-applications.terminal:Pantheon] -exec='io.elementary.terminal' - -[org.gnome.desktop.input-sources:Pantheon] -xkb-options=['grp:alt_shift_toggle'] - -[org.gnome.desktop.interface:Pantheon] -cursor-theme='elementary' -document-font-name='Open Sans 10' -font-antialiasing='grayscale' -font-hinting='slight' -font-name='Inter 9' -gtk-theme='io.elementary.stylesheet.blueberry' -icon-theme='elementary' -# Roboto Mono is no longer available on Fedora, use Monospace instead -#monospace-font-name='Roboto Mono 10' -monospace-font-name='Monospace 10' - -[org.gnome.desktop.peripherals.touchpad:Pantheon] -natural-scroll=true -tap-to-click=true - -[org.gnome.desktop.privacy:Pantheon] -remove-old-temp-files=true -remove-old-trash-files=true - -[org.gnome.desktop.session:Pantheon] -idle-delay=900 - -[org.gnome.desktop.sound:Pantheon] -theme-name='elementary' - -[org.gnome.desktop.wm.keybindings:Pantheon] -# defaults to Up, replaced by toggle below, so we need to clear it here -maximize=[] -move-to-workspace-1=['1','1'] -move-to-workspace-2=['2','2'] -move-to-workspace-3=['3','3'] -move-to-workspace-4=['4','4'] -move-to-workspace-5=['5','5'] -move-to-workspace-6=['6','6'] -move-to-workspace-7=['7','7'] -move-to-workspace-8=['8','8'] -move-to-workspace-9=['9','9'] -move-to-workspace-left=['Left'] -move-to-workspace-right=['Right'] -panel-main-menu=['space','F2'] -panel-run-dialog=[] -# Gala shows workspaces overview instead of desktop -show-desktop=['Down','s'] -switch-applications=[] -switch-applications-backward=[] -# See lp:1291788 for details about switch-input-source* -switch-input-source=[] -switch-input-source-backward=[] -switch-to-workspace-left=['Left'] -switch-to-workspace-right=['Right'] -switch-to-workspace-up=[] -switch-to-workspace-down=[] -switch-to-workspace-1=['1'] -switch-to-workspace-2=['2'] -switch-to-workspace-3=['3'] -switch-to-workspace-4=['4'] -switch-to-workspace-5=['5'] -switch-to-workspace-6=['6'] -switch-to-workspace-7=['7'] -switch-to-workspace-8=['8'] -switch-to-workspace-9=['9'] -switch-windows=['Tab'] -switch-windows-backward=['Tab'] -toggle-maximized=['Up'] -# defaults to Down used above, so we need to override it -unmaximize=['F5'] - -[org.gnome.desktop.wm.preferences:Pantheon] -# Make sure that all applications with CSD show their "Menu" button; -# otherwise, parts of the GUI of some GNOME applications is inaccessible. -#button-layout='close:maximize' -button-layout='close:menu,maximize' -mouse-button-modifier='' -resize-with-right-button=true -theme='elementary' - -# Drop overrides for Epiphany - it's not the default browser on Fedora, -# and epiphany in Feodra does not have the elementary OS downstream patches. -#[org.gnome.Epiphany.ui:Pantheon] -#expand-tabs-bar=false -#tabs-bar-visibility-policy='always' -# -#[org.gnome.Epiphany.web:Pantheon] -#cookies-policy='no-third-party' -#enable-adblock=false -#enable-smooth-scrolling=true - -[org.gnome.mutter:Pantheon] -auto-maximize=false -overlay-key='Super_L' -center-new-windows=true -workspaces-only-on-primary=true - -[org.gnome.mutter.keybindings:Pantheon] -toggle-tiled-left=['Left'] -toggle-tiled-right=['Right'] - -[org.gnome.nm-applet:Pantheon] -disable-connected-notifications=true -show-applet=false - -[org.gnome.settings-daemon.peripherals.touchpad:Pantheon] -horiz-scroll-enabled=true -natural-scroll=true -scroll-method='two-finger-scrolling' - -[org.gnome.settings-daemon.plugins.color:Pantheon] -night-light-temperature=4500 - -[org.gnome.settings-daemon.plugins.power:Pantheon] -idle-dim=false - -[org.gnome.settings-daemon.plugins.xsettings:Pantheon] -overrides={'Gtk/DialogsUseHeader': <0>, 'Gtk/EnablePrimaryPaste': <0>, 'Gtk/ShellShowsAppMenu': <0>, 'Gtk/DecorationLayout': <'close:menu,maximize'>} - -[org.gtk.Settings.FileChooser:Pantheon] -sort-directories-first=true - -[org.onboard:Pantheon] -theme='/usr/share/onboard/themes/Nightshade.theme' - -EOF - -glib-compile-schemas /usr/share/glib-2.0/schemas/ - -cat >> /var/lib/livesys/livesys-session-extra << EOF - -## set up lightdm autologin -sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -# -# set Pantheon as default session, otherwise login will fail -sed -i 's/^#user-session=.*/user-session=pantheon/' /etc/lightdm/lightdm.conf - -# set the default wallpaper -gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-l.png -mkdir -p /home/liveuser/.local/share/applications - -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop - -# and mark it as executable -chmod +x /home/liveuser/Desktop/liveinst.desktop - -# allow anaconda to use system icon theme -sed -i -e 's/settings.set_property("gtk-icon-theme-name", "Adwaita")//' /usr/lib64/python3.11/site-packages/pyanaconda/ui/gui/__init__.py - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser - -EOF - -ELEMENTARY_APPS=( - "io.elementary.calculator/$(uname -m)/stable" - "io.elementary.calendar/$(uname -m)/stable" - "io.elementary.capnet-assist/$(uname -m)/stable" - "io.elementary.camera/$(uname -m)/stable" - "io.elementary.mail/$(uname -m)/daily" - "io.elementary.music/$(uname -m)/stable" - "io.elementary.videos/$(uname -m)/stable" - "org.gnome.Evince/$(uname -m)/stable" -) - -arch=$(uname -m) -# Elementary's Flatpak remote only supports x86_64... even though it's 2023 -if [[ $arch == "x86_64" ]]; then -# join them all together with a space -FLATPAKS=$(printf "%s " "${ELEMENTARY_APPS[@]}") - -# install flatpaks - -flatpak install -y appcenter $FLATPAKS -fi \ No newline at end of file diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml deleted file mode 100644 index e3493ad0..00000000 --- a/katsu/modules/pantheon/pantheon-live.yaml +++ /dev/null @@ -1,26 +0,0 @@ -builder: dnf - -import: - - ../base/base.yaml - - ../live/live.yaml - - pantheon.yaml -out_file: ultramarine-pantheon-41-live.iso - -scripts: - post: - - id: pantheon-live - name: Set up Pantheon Live - file: ./pantheon-live.sh - -distro: Ultramarine Linux 41 (Pantheon Edition) - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -iso: - volume_id: UM-Pa-Live - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/pantheon/pantheon.yaml b/katsu/modules/pantheon/pantheon.yaml deleted file mode 100644 index 56a0bf25..00000000 --- a/katsu/modules/pantheon/pantheon.yaml +++ /dev/null @@ -1,31 +0,0 @@ -builder: dnf - -dnf: - releasever: 41 - exec: dnf4 - exclude: - - gnome-tour - - gnome-shell - - setroubleshoot - arch_exclude: - x86_64: - - elementary-calculator - - elementary-calendar - - elementary-capnet-assist - - elementary-camera - - elementary-mail - - elementary-music - - elementary-videos - - evince # yes, this application is shipped in appcenter - packages: - - "@ultramarine-pantheon-product-environment" - # - elementary-greeter - - lightdm - - seahorse - # - appcenter - - xdg-user-dirs-gtk - - xdg-desktop-portal-gtk - - xdg-desktop-portal-xapp - - ultramarine-backgrounds-gnome - - rsms-inter-fonts - - ultramarine-repos-appcenter