Merge branch 'main' into pull-upstream-merge-conflict

.github/pull.yml

@@ -1,6 +1,12 @@
 version: "1"
 rules:
-  - base: main
+  - base: bluefin-main
     upstream: ublue-os:main
+    mergeMethod: hardreset
+    mergeUnstable: false
+  - base: main
+    upstream: bluefin-main
     mergeMethod: merge
     mergeUnstable: false
+label: ":arrow_heading_down: pull"
+conflictLabel: "merge-conflict"

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
-        base_name: [bluefin, bluefin-dx]
+        base_name: [kfin, kfin-dx]
         major_version: [38, 39]
         include:
           - major_version: 38
@@ -108,7 +108,7 @@ jobs:
       - name: Get Current Fedora Version
         id: labels
         run: |
-          ver=$(skopeo inspect docker://ghcr.io/ublue-os/silverblue-${{ matrix.image_flavor }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
+          ver=$(skopeo inspect docker://ghcr.io/ublue-os/kinoite-${{ matrix.image_flavor }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
           echo "VERSION=$ver" >> $GITHUB_OUTPUT
 
       # Build metadata
@@ -121,7 +121,7 @@ jobs:
           labels: |
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
-            org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology 
+            org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4
 

Containerfile

@@ -1,13 +1,13 @@
-ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}"
+ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
-ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
+ARG TARGET_BASE="${TARGET_BASE:-kfin}"
 
 ## bluefin image section
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS kfin
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG IMAGE_VENDOR="${IMAGE_VENDOR}"
@@ -65,7 +65,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp
     wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     /tmp/build.sh && \
     /tmp/image-info.sh && \
-    pip install --prefix=/usr yafti && \
     mkdir -p /usr/etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
     cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \
@@ -89,14 +88,14 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp
     rm -f /usr/share/applications/nvtop.desktop && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
-    sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release && \
+    sed -i '/^PRETTY_NAME/s/Kinoite/Kfin/' /usr/lib/os-release && \
     rm -rf /tmp/* /var/* && \
     ostree container commit && \
     mkdir -p /var/tmp && \
     chmod -R 1777 /var/tmp
 
-## bluefin-dx developer edition image section
-FROM bluefin AS bluefin-dx
+## kfin-dx developer edition image section
+FROM kfin AS kfin-dx
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG IMAGE_VENDOR="${IMAGE_VENDOR}"

boot_menu.yml

@@ -1,16 +1,15 @@
 ublue_variants:
-  - label: ublue-os/bluefin
+  - label: ublue-os/kfin
     ks: /kickstart/ublue-os.ks
     flavors:
-      - label: bluefin
-        info: Bluefin
-  - label: ublue-os/bluefin-nvidia
+      - label: kfin
+        info: Kfin
+  - label: ublue-os/kfin-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     subvariants:
       - label: latest driver
       - label: 470xx driver
         suffix: -470
     flavors:
-      - label: bluefin-nvidia
-        info: Bluefin
-
+      - label: kfin-nvidia
+        info: Kfin

cosign.pub

@@ -1,4 +1,5 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA
-cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHRog2E22NMpznp2daP7YGVjsV3N9
+UjeQwYq4VIOE7oMQ0OX57TRGlWKxW1PsahD27R/YeKmp+9hmG7HljFgo/A==
 -----END PUBLIC KEY-----
+

just/custom.just

@@ -43,14 +43,14 @@ brew-shell:
   if grep -q "linuxbrew" $HOME/.zprofile
   then
     echo "Brew configuration already present in .zprofile"
-  else 
+  else
     echo "Adding Brew configuration to .zprofile"
     echo 'eval "$(/var/home/linuxbrew/.linuxbrew/bin/brew shellenv)"' >> $HOME/.zprofile
   fi
   if grep -q "linuxbrew" $HOME/.bash_profile
   then
     echo "Brew configuration already present in .bash_profile"
-  else 
+  else
     echo "Adding Brew configuration to .bash_profile"
     echo 'eval "$(/var/home/linuxbrew/.linuxbrew/bin/brew shellenv)"' >> $HOME/.bash_profile
   fi
@@ -123,40 +123,9 @@ distrobox-universal:
 
 # Switch to the fish shell
 fish:
-  sudo usermod $USER --shell /usr/bin/fish 
+  sudo usermod $USER --shell /usr/bin/fish
   printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
 
-# Install recommended GNOME extensions
-gnome-extensions:
-  pip install --upgrade gnome-extensions-cli
-  gext install [email protected]
-  gext install [email protected]
-  gext install [email protected]
-  gext install [email protected]
-
-# Enable or Disable Gnome-VRR
-gnome-vrr:
-  #!/usr/bin/env bash
-  if gsettings get org.gnome.mutter experimental-features | grep -q "variable-refresh-rate"
-  then
-    CURRENT_STATE="Enabled"
-  else
-    CURRENT_STATE="Disabled"
-  fi
-  echo "Gnome-VRR is currently ${CURRENT_STATE}"
-  echo "Enable or Disable Gnome-VRR"
-  OPTION=$(gum choose Enable Disable)
-  if [ "$OPTION" = "Enable" ]
-  then
-    echo "Enabling Gnome-VRR"
-    gsettings set org.gnome.mutter experimental-features "['variable-refresh-rate','scale-monitor-framebuffer']"
-  elif [ "$OPTION" = "Disable" ]
-  then
-    echo "Disabling Gnome-VRR"
-    gsettings set org.gnome.mutter experimental-features "['scale-monitor-framebuffer']"
-  fi
-  echo "To apply the changes make sure you logout and restart your session"
-
 # Install JetBrains Toolbox | https://www.jetbrains.com/toolbox-app/
 jetbrains-toolbox:
   #!/usr/bin/env bash
@@ -206,7 +175,7 @@ podmansh:
   loginctl enable-linger $(whoami)
 
   podman pull ghcr.io/ublue-os/ubuntu-toolbox:latest
-  
+
   systemctl --user daemon-reload
   systemctl --user stop podmansh.service
   systemctl --user start podmansh.service
@@ -248,17 +217,11 @@ pytorch:
   --no-browser --allow-root"
 
 # Run Tensorflow
-tensorflow: 
+tensorflow:
   echo 'Follow the prompts and check the tutorial: https://www.tensorflow.org/tutorials/quickstart/beginner'
   podman pull docker.io/tensorflow/tensorflow:latest
   podman run -it -p 8888:8888 docker.io/tensorflow/tensorflow:latest-jupyter  # Start Jupyter server
 
-# Install a better on-screen-keyboard and gesture improvements
-touch:
-  pip install --upgrade gnome-extensions-cli
-  gext install [email protected]
-  gext install gestureImprovements@gestures
-
 # A preview of what the update system would look like in the future
 update-ng:
   echo 'Upgrading system...'
@@ -273,13 +236,9 @@ distrobox-git:
   echo 'Installing latest git snapshot of Distrobox'
   curl -s https://raw.githubusercontent.com/89luca89/distrobox/main/install | sh -s -- --next --prefix ~/.local
 
-# Run the yafti setup tool
-yafti:
-  yafti /etc/yafti.yml --force
-
 # Switch to the zsh shell
 zsh:
-  sudo usermod $USER --shell /usr/bin/zsh 
+  sudo usermod $USER --shell /usr/bin/zsh
   printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
 
 # Enable docker on the system

packages.json

@@ -11,18 +11,12 @@
 				"fish",
 				"glow",
 				"gum",
-				"gnome-shell-extension-appindicator",
-				"gnome-shell-extension-blur-my-shell",
-				"gnome-shell-extension-dash-to-dock",
-				"gnome-shell-extension-gsconnect",
-				"gnome-shell-extension-tailscale-status",
 				"input-remapper",
 				"libgda-sqlite",
 				"libgda",
 				"libratbag-ratbagd",
 				"libxcrypt-compat",
 				"mesa-libGLU",
-				"nautilus-gsconnect",
 				"pulseaudio-utils",
 				"python3-pip",
 				"samba-dcerpc",
@@ -31,14 +25,14 @@
 				"samba-winbind-modules",
 				"samba",
 				"solaar",
+				"easyeffects",
 				"stress-ng",
 				"tailscale",
 				"tmux",
 				"ublue-update",
 				"wireguard-tools",
 				"xprop",
-				"yaru-theme",
-				"wl-clipboard", 
+				"wl-clipboard",
 				"zsh"
 			],
 			"bluefin-dx": [
@@ -124,9 +118,6 @@
 			"bluefin": [
 				"firefox-langpacks",
 				"firefox",
-				"gnome-extensions-app",
-				"gnome-software-rpm-ostree",
-				"gnome-tour",
 				"ublue-os-update-services"
 			],
 			"bluefin-dx": []
@@ -148,7 +139,7 @@
 	"39": {
 		"include": {
 			"bluefin": [
-				"input-leap"	
+				"input-leap"
 			],
 			"bluefin-dx": [],
 			"bluefin-framework": []

usr/etc/flatpak/system/remove

@@ -1,2 +0,0 @@
-org.gnome.Cheese
-org.gnome.eog