Minor fixes from the desktop setup and a fix for the datacube update

binarypie · binarypie · commit 85aefcf0abab · 2026-01-14T13:58:48.000-08:00
diff --git a/dot_files/nvim/Justfile b/dot_files/nvim/Justfile
@@ -3,7 +3,7 @@
 
 container_name := "nvim-dev"
 local_image := "localhost/nvim-dev"
-remote_image := "ghcr.io/binarypie/nvim-dev:latest"
+remote_image := "ghcr.io/binarypie-dev/nvim-dev:latest"
 
 # Default recipe - show help
 default:
diff --git a/dot_files/quickshell/modules/sidebars/ApplicationView.qml b/dot_files/quickshell/modules/sidebars/ApplicationView.qml
@@ -22,9 +22,15 @@ ColumnLayout {
     // Track the query we're waiting for results from
     property string allAppsQueryId: ""
     property string searchQueryId: ""
+    property int retryCount: 0
+    property int maxRetries: 5
 
     // Load all apps on startup
     Component.onCompleted: {
+        loadAllApps()
+    }
+
+    function loadAllApps() {
         allAppsQueryId = Services.Datacube.queryAll("", 500)
     }
 
@@ -230,6 +236,8 @@ ColumnLayout {
 
         function onQueryCompleted(queryId, results) {
             if (queryId === root.allAppsQueryId) {
+                // Reset retry count on success
+                root.retryCount = 0
                 // Sort alphabetically by name
                 results.sort((a, b) => {
                     const nameA = (a.name || "").toLowerCase()
@@ -246,6 +254,22 @@ ColumnLayout {
 
         function onQueryFailed(queryId, error) {
             console.log("Datacube query failed:", queryId, error)
+            // If the allApps query failed, retry after a delay (service may have restarted)
+            if (queryId === root.allAppsQueryId && root.retryCount < root.maxRetries) {
+                root.retryCount++
+                console.log("Datacube: retrying allApps query (attempt", root.retryCount, "of", root.maxRetries, ")")
+                retryTimer.start()
+            }
+        }
+    }
+
+    // Retry timer for failed queries (datacube service may have restarted)
+    Timer {
+        id: retryTimer
+        interval: 1000 * root.retryCount  // Exponential backoff: 1s, 2s, 3s, etc.
+        repeat: false
+        onTriggered: {
+            root.loadAllApps()
         }
     }
 
@@ -275,12 +299,16 @@ ColumnLayout {
 
         // Check if terminal app - handle boolean or string "true"/"false"
         const isTerminal = metadata.terminal === true || metadata.terminal === "true"
+        const source = app?.source || "native"
 
         if (isTerminal) {
             // Terminal apps: launch with ghostty
             appLaunchProcess.command = ["ghostty", "-e", desktopId]
+        } else if (source === "flatpak") {
+            // Flatpak apps: use flatpak run
+            appLaunchProcess.command = ["flatpak", "run", desktopId]
         } else {
-            // GUI apps: use gtk4-launch with desktop_id
+            // Native apps: use gtk4-launch with desktop_id
             appLaunchProcess.command = ["gtk4-launch", desktopId]
         }
         // Launch detached so apps survive shell restart and run independently
@@ -296,11 +324,18 @@ ColumnLayout {
         command: ["true"]
     }
 
-    // Reset state when sidebar closes
+    // Handle sidebar state changes
     Connections {
         target: Root.GlobalStates
         function onSidebarLeftOpenChanged() {
-            if (!Root.GlobalStates.sidebarLeftOpen) {
+            if (Root.GlobalStates.sidebarLeftOpen) {
+                // Refresh apps if list is empty (datacube may have restarted)
+                if (root.allApps.length === 0) {
+                    root.retryCount = 0
+                    root.loadAllApps()
+                }
+            } else {
+                // Reset state when sidebar closes
                 searchInput.text = ""
                 searchResults = []
             }
diff --git a/dot_files/quickshell/services/Datacube.qml b/dot_files/quickshell/services/Datacube.qml
@@ -78,6 +78,7 @@ Singleton {
             exec: item.exec || "",
             provider: item.provider || "",
             score: item.score || 0,
+            source: item.source || "native",
             metadata: item.metadata || {},
             _raw: item
         }
diff --git a/system_files/shared/etc/greetd/config.toml b/system_files/shared/etc/greetd/config.toml
@@ -9,6 +9,7 @@ user = "greeter"
 
 [initial_session]
 # First boot wizard - runs once as root, then exits to show regreet
+# Check if regular users exist (UID >= 1000) - if so, skip wizard and remove this block
 # Set XDG_RUNTIME_DIR for quickshell/Qt to work properly as root
-command = "sh -c 'mkdir -p /run/user/0 && export XDG_RUNTIME_DIR=/run/user/0; /usr/sbin/cage -s -- /usr/sbin/quickshell -p /usr/share/hypercube/config/quickshell/welcome-mode.qml'"
+command = "sh -c 'if getent passwd | awk -F: \"\\$3 >= 1000 && \\$3 < 65534\" | grep -q .; then sed -i \"/^\\[initial_session\\]/,\\$d\" /etc/greetd/config.toml; exit 0; fi; mkdir -p /run/user/0 && export XDG_RUNTIME_DIR=/run/user/0; /usr/sbin/cage -s -- /usr/sbin/quickshell -p /usr/share/hypercube/config/quickshell/welcome-mode.qml'"
 user = "root"
diff --git a/system_files/shared/usr/share/ublue-os/just/60-custom.just b/system_files/shared/usr/share/ublue-os/just/60-custom.just
diff --git a/system_files/shared/usr/share/ublue-os/just/60-hypercube.just b/system_files/shared/usr/share/ublue-os/just/60-hypercube.just
@@ -0,0 +1,19 @@
+# vim: set ft=make :
+# Hypercube general commands
+
+# Show Hypercube developer environment status
+dx-status:
+    #!/usr/bin/bash
+    set -euo pipefail
+
+    echo "Hypercube DX Status"
+    echo "==================="
+    echo ""
+
+    echo "Container Runtimes:"
+    echo -n "  Podman: "
+    podman --version 2>/dev/null || echo "not found"
+    echo ""
+
+    echo "Distrobox Containers:"
+    distrobox list 2>/dev/null || echo "  (none)"
diff --git a/system_files/shared/usr/share/ublue-os/just/61-dx.just b/system_files/shared/usr/share/ublue-os/just/61-dx.just
diff --git a/system_files/shared/usr/share/ublue-os/just/61-nvim.just b/system_files/shared/usr/share/ublue-os/just/61-nvim.just
@@ -0,0 +1,60 @@
+# vim: set ft=make :
+# Hypercube Neovim development environment commands
+
+# Enter the nvim-dev container (creates if needed)
+nvim-dev:
+    #!/usr/bin/bash
+    set -euo pipefail
+
+    if ! distrobox list | grep -q "nvim-dev"; then
+        echo "Creating nvim-dev container (this pulls ~2GB image on first run)..."
+        distrobox assemble create --file /etc/distrobox/distrobox.ini
+    fi
+
+    distrobox enter nvim-dev
+
+# Export nvim to host for direct access
+nvim-export:
+    #!/usr/bin/bash
+    set -euo pipefail
+
+    if ! distrobox list | grep -q "nvim-dev"; then
+        echo "Creating nvim-dev container..."
+        distrobox assemble create --file /etc/distrobox/distrobox.ini
+    fi
+
+    echo "Exporting nvim to ~/.local/bin..."
+    distrobox enter nvim-dev -- distrobox-export --bin /home/linuxbrew/.linuxbrew/bin/nvim --export-path ~/.local/bin
+    echo ""
+    echo "Done! You can now run 'nvim' directly from the host."
+
+# Quick setup: create container + export nvim
+nvim-setup:
+    #!/usr/bin/bash
+    set -euo pipefail
+
+    echo "Setting up nvim-dev environment..."
+    echo ""
+
+    if ! distrobox list | grep -q "nvim-dev"; then
+        echo "Creating nvim-dev container (this pulls ~2GB image on first run)..."
+        distrobox assemble create --file /etc/distrobox/distrobox.ini
+    else
+        echo "Container nvim-dev already exists"
+    fi
+
+    echo ""
+    echo "Exporting nvim to ~/.local/bin..."
+    distrobox enter nvim-dev -- distrobox-export --bin /home/linuxbrew/.linuxbrew/bin/nvim --export-path ~/.local/bin
+
+    echo ""
+    echo "Setup complete! You can now run 'nvim' directly."
+
+# Upgrade nvim-dev container to latest image
+nvim-upgrade:
+    #!/usr/bin/bash
+    set -euo pipefail
+
+    echo "Upgrading nvim-dev to latest image..."
+    distrobox upgrade nvim-dev
+    echo "Done!"
diff --git a/system_files/shared/usr/share/ublue-os/justfile b/system_files/shared/usr/share/ublue-os/justfile
@@ -0,0 +1,28 @@
+# Hypercube - Developer Workstation
+# https://github.com/binarypie-dev/hypercube
+
+set allow-duplicate-recipes := true
+set ignore-comments := true
+
+_default:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/libformatting.sh
+    echo "$(Urllink "https://github.com/binarypie-dev/hypercube" "Hypercube Documentation")"
+    /usr/bin/ujust --list --list-heading $'Available commands:\n' --list-prefix $' - '
+
+# =============================================================================
+# Upstream ublue-os commands
+# =============================================================================
+import "/usr/share/ublue-os/just/00-default.just"
+import "/usr/share/ublue-os/just/10-update.just"
+import "/usr/share/ublue-os/just/15-luks.just"
+import "/usr/share/ublue-os/just/20-clean.just"
+import "/usr/share/ublue-os/just/30-distrobox.just"
+import "/usr/share/ublue-os/just/40-nvidia.just"
+import "/usr/share/ublue-os/just/50-akmods.just"
+
+# =============================================================================
+# Hypercube commands
+# =============================================================================
+import? "/usr/share/ublue-os/just/60-hypercube.just"
+import? "/usr/share/ublue-os/just/61-nvim.just"

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ Singleton {`
`78`	`78`	`exec: item.exec \|\| "",`
`79`	`79`	`provider: item.provider \|\| "",`
`80`	`80`	`score: item.score \|\| 0,`
	`81`	`+ source: item.source \|\| "native",`
`81`	`82`	`metadata: item.metadata \|\| {},`
`82`	`83`	`_raw: item`
`83`	`84`	`}`