Merge pull request #66 from ohaukeboe/merge-upstream

Pull from upstream

.github/workflows/build-bluefin-toolbox.yml

@@ -85,7 +85,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.2.0
+      - uses: sigstore/cosign-installer@v3.3.0
         if: github.event_name != 'pull_request'
 
       - name: Sign container image

.github/workflows/build-fedora-toolbox.yml

@@ -85,7 +85,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.2.0
+      - uses: sigstore/cosign-installer@v3.3.0
         if: github.event_name != 'pull_request'
 
       - name: Sign container image

.github/workflows/build-ubuntu-toolbox.yml

@@ -85,7 +85,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.2.0
+      - uses: sigstore/cosign-installer@v3.3.0
         if: github.event_name != 'pull_request'
 
       - name: Sign container image

.github/workflows/build-wolfi-toolbox.yml

@@ -85,7 +85,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.2.0
+      - uses: sigstore/cosign-installer@v3.3.0
         if: github.event_name != 'pull_request'
 
       - name: Sign container image

.github/workflows/build.yml

@@ -187,7 +187,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.2.0
+      - uses: sigstore/cosign-installer@v3.3.0
         if: github.event_name != 'pull_request'
 
       - name: Sign container image

Containerfile

@@ -128,18 +128,14 @@ RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/dow
     chmod +x ./kind && \
     mv ./kind /usr/bin/kind
 
-# Install DevPod
-RUN rpm-ostree install https://github.com/loft-sh/devpod/releases/download/v0.3.7/DevPod_linux_x86_64.rpm && \
-    wget https://github.com/loft-sh/devpod/releases/download/v0.3.7/devpod-linux-amd64 -O /tmp/devpod && \
-    install -c -m 0755 /tmp/devpod /usr/bin
-
 # Install kns/kctx and add completions for Bash
 RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr/bin/kubectx && \
     wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens -O /usr/bin/kubens && \
     chmod +x /usr/bin/kubectx /usr/bin/kubens
 
 # Set up services
-RUN systemctl enable podman.socket && \
+RUN systemctl enable docker.service && \
+    systemctl enable podman.socket && \
     systemctl disable pmie.service && \
     systemctl disable pmlogger.service
 

packages.json

@@ -8,6 +8,8 @@
 				"fish",
 				"glow",
 				"gum",
+				"hplip",
+				"ifuse",
 				"input-remapper",
 				"libgda-sqlite",
 				"libgda",
@@ -49,6 +51,8 @@
 				"code",
 				"containerd.io",
 				"dbus-x11",
+                                "devpod",
+				"distrobuilder",
 				"docker-ce",
 				"docker-ce-cli",
 				"docker-buildx-plugin",
@@ -102,7 +106,9 @@
 	},
 	"38": {
 		"include": {
-			"bluefin": [],
+			"bluefin": [
+				"gnome-shell-extension-tailscale-status"
+			],
 			"bluefin-dx": [],
 			"bluefin-framework": []
 		},
@@ -115,16 +121,14 @@
 	},
 	"39": {
 		"include": {
-			"bluefin": [
-				"input-leap"
-			],
+			"bluefin": [],
 			"bluefin-dx": [],
 			"bluefin-framework": []
 		},
 		"exclude": {
 			"bluefin": [
 				"podman-docker",
-     "gnome-terminal-nautilus"
+				"gnome-terminal-nautilus"
 			],
 			"bluefin-dx": [],
 			"bluefin-framework": []

usr/bin/xdg-terminal-exec

@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
 
 if command -v /usr/bin/prompt > /dev/null; then
-  /usr/bin/prompt -- "$@"
+  if test -z "$@"; then
+    /usr/bin/prompt --new-window
+  else
+    /usr/bin/prompt -- "$@"
+  fi
 elif grep '^org\.gnome\.Prompt$' <<< $(/usr/bin/flatpak list --app --columns=application); then
-  /usr/bin/flatpak run org.gnome.Prompt -- "$@"
+  if test -z "$@"; then
+    /usr/bin/flatpak run org.gnome.Prompt --new-window
+  else
+    /usr/bin/flatpak run org.gnome.Prompt -- "$@"
+  fi
 else
   /usr/bin/gnome-terminal -- "$@"
 fi

usr/etc/dconf/db/local.d/01-ublue

@@ -1,6 +1,20 @@
 [org/gnome/shell] 
 favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'ubuntu.desktop', 'yelp.desktop']
-enabled-extensions = ['[email protected]', '[email protected]', 'blur-my-shell@aunetx', '[email protected]', 'logomenu@aryan_k']
+enabled-extensions = ['[email protected]', '[email protected]', 'blur-my-shell@aunetx', '[email protected]', 'logomenu@aryan_k', '[email protected]']
+
+[org/gnome/desktop/app-folders]
+folder-children=['Utilities', 'Distrobox', 'Wine', 'YaST', 'Pardus']
+
+[org/gnome/desktop/app-folders/folders/Distrobox]
+categories=['Distrobox']
+name='Distrobox'
+translate=false
+
+[org/gnome/desktop/app-folders/folders/Wine]
+apps=['winetricks.desktop']
+categories=['X-Wine', 'wine-wine']
+name='Wine'
+translate=false
 
 [org/gnome/desktop/background]
 picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml'
@@ -52,6 +66,11 @@ customize-alphas=true
 max-alpha=0.8
 min-alpha=0.5
 
+[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
+binding='<Control><Alt>t'
+command='xdg-terminal-exec'
+name='Prompt'
+
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
 binding='<Control><Alt>u'
 command='xdg-terminal-exec -- distrobox enter ubuntu'
@@ -95,7 +114,7 @@ download-updates-notify=false
 
 [com/github/stunkymonkey/nautilus-open-any-terminal]
 terminal='prompt'
-keybindings=['<Ctrl><Alt>t']
+keybindings=''
 new-tab=false
 flatpak='off'
 
@@ -104,3 +123,7 @@ menu-button-icon-image=1
 menu-button-terminal='xdg-terminal-exec'
 menu-button-system-monitor='flatpak run io.missioncenter.MissionCenter'
 menu-button-extensions-app='com.mattjakeman.ExtensionManager.desktop'
+
+[org/gnome/Prompt]
+restore-session=false
+restore-window-size=false