Ubuntu 25.10 Compatibility

install/desktop.sh

@@ -4,4 +4,4 @@
 for installer in ~/.local/share/omakub/install/desktop/*.sh; do source $installer; done
 
 # Logout to pickup changes
-gum confirm "Ready to reboot for all settings to take effect?" && sudo reboot
+gum confirm "Ready to reboot for all settings to take effect?" && sudo reboot || true

install/desktop/app-obsidian.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
 # Obsidian is a multi-platform note taking application. See https://obsidian.md
-gum spin --spinner meter --title "Obsidian installation about to start. It may take up to 20 minutes on some systems!" -- sleep 3
-flatpak install -y flathub md.obsidian.Obsidian
+cd /tmp
+OBSIDIAN_VERSION=$(curl -s https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest | grep -Po '"tag_name": "v\K[^"]*')
+wget -O obsidian.deb "https://github.com/obsidianmd/obsidian-releases/releases/latest/download/obsidian_${OBSIDIAN_VERSION}_amd64.deb"
+sudo apt install -y ./obsidian.deb
+rm obsidian.deb
+cd -

install/desktop/app-pinta.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# FIXME: Get this out of snap
-sudo snap install pinta
+# Pinta is a simple drawing and image editing program. See https://www.pinta-project.com/
+flatpak install -y flathub com.github.PintaProject.Pinta

install/desktop/app-signal.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-wget -qO- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor >signal-desktop-keyring.gpg
-cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg >/dev/null
-echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' |
-	sudo tee /etc/apt/sources.list.d/signal-xenial.list
-rm signal-desktop-keyring.gpg
+if [ ! -f /etc/apt/sources.list.d/signal-desktop.sources ]; then
+  [ -f /usr/share/keyrings/signal-desktop-keyring.gpg ] && sudo rm /usr/share/keyrings/signal-desktop-keyring.gpg
+  wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg;
+  cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg > /dev/null
+  wget -O signal-desktop.sources https://updates.signal.org/static/desktop/apt/signal-desktop.sources;
+  cat signal-desktop.sources | sudo tee /etc/apt/sources.list.d/signal-desktop.sources > /dev/null
+  rm signal-desktop-keyring.gpg signal-desktop.sources
+fi
+
 sudo apt update
 sudo apt install -y signal-desktop

install/desktop/app-typora.sh

@@ -1,20 +1,15 @@
 #!/bin/bash
 
-# Temporarily switch away from using Typora repo which is broken.
-#
-# wget -qO - https://typora.io/linux/public-key.asc | sudo tee /etc/apt/trusted.gpg.d/typora.asc >/dev/null || true
-#
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo apt update -y
-# sudo apt install -y typora
+# Typora is a markdown editor and reader. See https://typora.io/
+if [ ! -f /etc/apt/sources.list.d/typora.list ]; then
+  [ -f /etc/apt/keyrings/typora.gpg ] && sudo rm /etc/apt/keyrings/typora.gpg
+  sudo mkdir -p /etc/apt/keyrings
+  curl -fsSL https://downloads.typora.io/typora.gpg | sudo tee /etc/apt/keyrings/typora.gpg > /dev/null
+  echo "deb [signed-by=/etc/apt/keyrings/typora.gpg] https://downloads.typora.io/linux ./" | sudo tee /etc/apt/sources.list.d/typora.list
+fi
 
-# Install with db
-cd /tmp
-wget -O typora.deb "https://downloads.typora.io/linux/typora_1.10.8_amd64.deb"
-sudo apt install -y /tmp/typora.deb
-rm typora.deb
-cd -
+sudo apt update
+sudo apt install typora -y
 
 # Add iA Typora theme
 mkdir -p ~/.config/Typora/themes

install/desktop/app-vscode.sh

@@ -1,17 +1,20 @@
 #!/bin/bash
 
-cd /tmp
-wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
-sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
-rm -f packages.microsoft.gpg
-cd -
+if [ ! -f /etc/apt/keyrings/packages.microsoft.gpg ] || [ ! -f /usr/share/keyrings/microsoft.gpg ]; then
+  [ -f /etc/apt/keyrings/packages.microsoft.gpg ] && sudo rm /etc/apt/keyrings/packages.microsoft.gpg
+  cd /tmp
+  wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
+  sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+  echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
+  rm -f packages.microsoft.gpg
+  cd -
+fi
 
-sudo apt update -y
+sudo apt update
 sudo apt install -y code
 
 mkdir -p ~/.config/Code/User
 cp ~/.local/share/omakub/configs/vscode.json ~/.config/Code/User/settings.json
 
 # Install default supported themes
-code --install-extension enkia.tokyo-night
+code --install-extension enkia.tokyo-night

install/desktop/optional/app-1password.sh

@@ -1,20 +1,8 @@
 #!/bin/bash
 
 # Install 1password and 1password-cli single script
-curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
-
-# Add apt repository
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" |
-sudo tee /etc/apt/sources.list.d/1password.list
-
-# Add the debsig-verify policy
-sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
-curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
-sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
-sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
-curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
-
-# Install 1Password & 1password-cli
-sudo apt update && sudo apt install -y 1password 1password-cli
+cd /tmp
+wget https://downloads.1password.com/linux/debian/amd64/stable/1password-latest.deb -O 1password.deb
+sudo apt install ./1password.deb -y
+rm 1password.deb
+cd -

install/desktop/optional/app-brave.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-sudo curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" | sudo tee /etc/apt/sources.list.d/brave-browser-release.list
-sudo apt update -y
+if [ ! -f /etc/apt/sources.list.d/brave-browser-release.list ]; then
+  [ -f /usr/share/keyrings/brave-browser-archive-keyring.gpg ] && sudo rm /usr/share/keyrings/brave-browser-archive-keyring.gpg
+  sudo curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
+  echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" | sudo tee /etc/apt/sources.list.d/brave-browser-release.list
+if
+
+sudo apt update
 sudo apt install -y brave-browser

install/desktop/optional/app-spotify.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 # Stream music using https://spotify.com
-curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] https://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
-sudo apt update -y
+if [ ! -f /etc/apt/sources.list.d/spotify.list ]; then
+  [ -f /etc/apt/trusted.gpg.d/spotify.gpg ] && sudo rm /etc/apt/trusted.gpg.d/spotify.gpg
+  curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg
+  echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] https://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
+fi
+
+sudo apt update
 sudo apt install -y spotify-client

install/desktop/optional/app-windsurf.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 
-curl -fsSL "https://windsurf-stable.codeiumdata.com/wVxQEIWkwPUEAGf3/windsurf.gpg" | sudo gpg --dearmor -o /usr/share/keyrings/windsurf-stable-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/windsurf-stable-archive-keyring.gpg arch=amd64] https://windsurf-stable.codeiumdata.com/wVxQEIWkwPUEAGf3/apt stable main" | sudo tee /etc/apt/sources.list.d/windsurf.list >/dev/null
+if [ ! -f /etc/apt/sources.list.d/windsurf.list ]; then
+    [ -f /usr/share/keyrings/windsurf-stable-archive-keyring.gpg ] && sudo rm /usr/share/keyrings/windsurf-stable-archive-keyring.gpg
+    curl -fsSL "https://windsurf-stable.codeiumdata.com/wVxQEIWkwPUEAGf3/windsurf.gpg" | sudo gpg --dearmor -o /usr/share/keyrings/windsurf-stable-archive-keyring.gpg
+    echo "deb [signed-by=/usr/share/keyrings/windsurf-stable-archive-keyring.gpg arch=amd64] https://windsurf-stable.codeiumdata.com/wVxQEIWkwPUEAGf3/apt stable main" | sudo tee /etc/apt/sources.list.d/windsurf.list >/dev/null
+fi
 
-sudo apt update -y
+sudo apt update
 sudo apt install -y windsurf

install/desktop/set-alacritty-default.sh

@@ -1,73 +1,4 @@
 #!/usr/bin/env sh
 
 # Make alacritty default terminal emulator
-sudo update-alternatives --set x-terminal-emulator /usr/bin/alacritty
-
-# Adding alacritty to nautilus contextual menu requires the python wrapper for the libraries
-sudo apt install -y python3-nautilus
-mkdir -p ~/.local/share/nautilus-python/extensions/
-
-cat > ~/.local/share/nautilus-python/extensions/open-alacritty.py <<TECHNICALLYNOTACONFIGSOHEREDOCCEDITIS
-import os
-from urllib.parse import unquote
-from gi.repository import Nautilus, GObject
-from typing import List
-
-class OpenTerminalExtension(GObject.GObject, Nautilus.MenuProvider):
-    def _open_terminal(self, file: Nautilus.FileInfo) -> None:
-        filename = unquote(file.get_uri()[7:])
-
-        os.chdir(filename)
-        os.system("alacritty")
-
-    def menu_activate_cb(
-        self,
-        menu: Nautilus.MenuItem,
-        file: Nautilus.FileInfo,
-    ) -> None:
-        self._open_terminal(file)
-
-    def menu_background_activate_cb(
-        self,
-        menu: Nautilus.MenuItem,
-        file: Nautilus.FileInfo,
-    ) -> None:
-        self._open_terminal(file)
-
-    def get_file_items(
-        self,
-        files: List[Nautilus.FileInfo],
-    ) -> List[Nautilus.MenuItem]:
-        if len(files) != 1:
-            return []
-
-        file = files[0]
-        if not file.is_directory() or file.get_uri_scheme() != "file":
-            return []
-
-        item = Nautilus.MenuItem(
-            name="NautilusPython::openterminal_file_item",
-            label="Open in Alacritty",
-            tip="Open Alacritty In %s" % file.get_name(),
-        )
-        item.connect("activate", self.menu_activate_cb, file)
-
-        return [
-            item,
-        ]
-
-    def get_background_items(
-        self,
-        current_folder: Nautilus.FileInfo,
-    ) -> List[Nautilus.MenuItem]:
-        item = Nautilus.MenuItem(
-            name="NautilusPython::openterminal_file_item2",
-            label="Open in Alacritty",
-            tip="Open Alacritty In %s" % current_folder.get_name(),
-        )
-        item.connect("activate", self.menu_background_activate_cb, current_folder)
-
-        return [
-            item,
-        ]
-TECHNICALLYNOTACONFIGSOHEREDOCCEDITIS
+sudo update-alternatives --set x-terminal-emulator /usr/bin/alacritty

install/desktop/set-gnome-extensions.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sudo apt install -y gnome-shell-extension-manager pipx
+sudo apt install -y gnome-shell-extension-manager gir1.2-gtop-2.0 gir1.2-clutter-1.0
 pipx install gnome-extensions-cli --system-site-packages
 
 # Turn off default Ubuntu extensions

install/desktop/ulauncher.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 
-gpg --keyserver keyserver.ubuntu.com --recv 0xfaf1020699503176
-gpg --export 0xfaf1020699503176 | sudo tee /usr/share/keyrings/ulauncher-archive-keyring.gpg >/dev/null
-echo "deb [signed-by=/usr/share/keyrings/ulauncher-archive-keyring.gpg] http://ppa.launchpad.net/agornostal/ulauncher/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/ulauncher-noble.list
-
-sudo apt update -y
-sudo apt install -y ulauncher
+sudo add-apt-repository universe -y
+sudo add-apt-repository ppa:agornostal/ulauncher -y
+sudo apt update
+sudo apt install ulauncher -y
 
 # Start ulauncher to have it populate config before we overwrite
 mkdir -p ~/.config/autostart/

install/terminal/app-github-cli.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg &&
-	sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg &&
-	echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list >/dev/null &&
-	sudo apt update &&
-	sudo apt install gh -y
+if [ ! -f /etc/apt/sources.list.d/github-cli.list ]; then
+    [ -f /usr/share/keyrings/githubcli-archive-keyring.gpg ] && sudo rm /usr/share/keyrings/githubcli-archive-keyring.gpg
+    curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg status=none
+    sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list >/dev/null
+fi
+
+sudo apt update
+sudo apt install gh -y

install/terminal/apps-terminal.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sudo apt install -y fzf ripgrep bat eza zoxide plocate apache2-utils fd-find tldr
+sudo apt install -y fzf ripgrep bat eza zoxide plocate apache2-utils fd-find

install/terminal/docker.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 
 # Add the official Docker repo
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo wget -qO /etc/apt/keyrings/docker.asc https://download.docker.com/linux/ubuntu/gpg
-sudo chmod a+r /etc/apt/keyrings/docker.asc
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-sudo apt update
+if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
+    [ -f /etc/apt/keyrings/docker.asc ] && sudo rm /etc/apt/keyrings/docker.asc
+    sudo install -m 0755 -d /etc/apt/keyrings
+    sudo wget -qO /etc/apt/keyrings/docker.asc https://download.docker.com/linux/ubuntu/gpg
+    sudo chmod a+r /etc/apt/keyrings/docker.asc
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+fi
 
 # Install Docker engine and standard plugins
+sudo apt update
 sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
 
 # Give this user privileged Docker access

install/terminal/libraries.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sudo apt install -y \
-  build-essential pkg-config autoconf bison clang rustc \
+  build-essential pkg-config autoconf bison clang rustc pipx \
   libssl-dev libreadline-dev zlib1g-dev libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev libjemalloc2 \
-  libvips imagemagick libmagickwand-dev mupdf mupdf-tools gir1.2-gtop-2.0 gir1.2-clutter-1.0 \
+  libvips imagemagick libmagickwand-dev mupdf mupdf-tools \
   redis-tools sqlite3 libsqlite3-0 libmysqlclient-dev libpq-dev postgresql-client postgresql-client-common

install/terminal/required/app-gum.sh

@@ -2,7 +2,7 @@
 
 # Gum is used for the Omakub commands for tailoring Omakub after the initial install
 cd /tmp
-GUM_VERSION="0.14.3" # Use known good version
+GUM_VERSION="0.17.0"
 wget -qO gum.deb "https://github.com/charmbracelet/gum/releases/download/v${GUM_VERSION}/gum_${GUM_VERSION}_amd64.deb"
 sudo apt-get install -y --allow-downgrades ./gum.deb
 rm gum.deb

install/terminal/tldr.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Install tldr for simplified man pages. See https://tldr.sh/
+pipx install tldr

migrations/1761481687.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Force upgrade to gum 0.17.0 to fix issues with older versions
+cd /tmp
+GUM_VERSION="0.17.0"
+wget -qO gum.deb "https://github.com/charmbracelet/gum/releases/download/v${GUM_VERSION}/gum_${GUM_VERSION}_amd64.deb"
+sudo apt-get install -y --allow-downgrades ./gum.deb
+rm gum.deb
+cd -

uninstall/app-1password.sh

@@ -4,4 +4,4 @@ sudo rm /etc/apt/sources.list.d/1password.list
 sudo rm /usr/share/keyrings/1password-archive-keyring.gpg
 sudo rm /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
 sudo rm -r /etc/debsig/policies/AC2D62742012EA22/
-sudo apt-get remove --purge -y 1password 1password-cli
+sudo apt remove --purge -y 1password 1password-cli

uninstall/app-neovim.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-sudo apt purge -y neovim neovim-runtime
+sudo rm /usr/local/bin/nvim
+sudo rm -r /usr/local/share/nvim/
 rm ~/.local/share/applications/Neovim.desktop
 rm -rf ~/.config/nvim
 rm -rf ~/.local/share/nvim

uninstall/app-obsidian.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-flatpak uninstall -y flathub md.obsidian.Obsidian
+sudo apt remove --purge -y obsidian

uninstall/app-pinta.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sudo snap remove pinta
+flatpak uninstall -y flathub com.github.PintaProject.Pinta