Skip to content

Commit 711de1c

Browse files
committed
GDM and build fixes
1 parent 7036a53 commit 711de1c

File tree

6 files changed

+25
-78
lines changed

6 files changed

+25
-78
lines changed

Justfile

Lines changed: 7 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export image_name := env("IMAGE_NAME", "hypercube")
77
export base_image := env("BASE_IMAGE", "ghcr.io/ublue-os/bluefin-dx")
88
export base_image_nvidia := env("BASE_IMAGE_NVIDIA", "ghcr.io/ublue-os/bluefin-dx-nvidia")
99
export default_tag := env("DEFAULT_TAG", "stable-daily")
10-
export rechunker_image := "ghcr.io/hhd-dev/rechunk:v1.0.3"
1110

1211
# Runtime detection
1312
export SUDO := if `id -u` == "0" { "" } else { "sudo" }
@@ -23,7 +22,7 @@ default:
2322

2423
# Build container image
2524
[group('Build')]
26-
build flavor="main" ghcr="0" rechunk="0":
25+
build flavor="main" ghcr="0":
2726
#!/usr/bin/env bash
2827
set -euo pipefail
2928

@@ -67,91 +66,24 @@ build flavor="main" ghcr="0" rechunk="0":
6766
.
6867
fi
6968

70-
# Rechunk if requested
71-
if [[ "{{ rechunk }}" == "1" ]]; then
72-
just rechunk "{{ image_name }}" "${TAG}"
73-
just load-rechunk "{{ image_name }}" "${TAG}"
74-
fi
75-
7669
echo ""
7770
echo "========================================"
7871
echo "Build complete: ${IMAGE_FULL}"
7972
echo "========================================"
8073

81-
# Build with rechunking enabled (recommended for production)
82-
[group('Build')]
83-
build-rechunk flavor="main":
84-
@just build {{ flavor }} 0 1
85-
86-
# Build for GHCR push (rootful, with rechunking)
74+
# Build for GHCR push (rootful)
8775
[group('Build')]
8876
build-ghcr flavor="main":
89-
@just build {{ flavor }} 1 1
77+
@just build {{ flavor }} 1
9078

9179
# Build both flavors
9280
[group('Build')]
9381
build-all:
9482
@echo "Building main flavor..."
95-
@just build-rechunk main
83+
@just build main
9684
@echo ""
9785
@echo "Building nvidia flavor..."
98-
@just build-rechunk nvidia
99-
100-
# Rechunk image for optimized OCI layers
101-
[group('Build')]
102-
[private]
103-
rechunk image tag:
104-
#!/usr/bin/env bash
105-
set -euo pipefail
106-
107-
IMAGE_FULL="localhost/{{ image }}:{{ tag }}"
108-
OUTPUT_DIR="${PWD}/_rechunk_output"
109-
110-
echo "Rechunking: ${IMAGE_FULL}"
111-
112-
rm -rf "${OUTPUT_DIR}"
113-
mkdir -p "${OUTPUT_DIR}"
114-
115-
# Run rechunker container
116-
{{ PODMAN }} run --rm \
117-
--privileged \
118-
--security-opt label=disable \
119-
-v "${OUTPUT_DIR}:/output" \
120-
-v /var/lib/containers:/var/lib/containers \
121-
{{ rechunker_image }} \
122-
"${IMAGE_FULL}" \
123-
/output
124-
125-
echo "Rechunk output saved to: ${OUTPUT_DIR}"
126-
127-
# Load rechunked image into podman
128-
[group('Build')]
129-
[private]
130-
load-rechunk image tag:
131-
#!/usr/bin/env bash
132-
set -euo pipefail
133-
134-
OUTPUT_DIR="${PWD}/_rechunk_output"
135-
IMAGE_FULL="{{ image }}:{{ tag }}"
136-
137-
if [[ ! -d "${OUTPUT_DIR}" ]]; then
138-
echo "Error: Rechunk output not found at ${OUTPUT_DIR}"
139-
exit 1
140-
fi
141-
142-
echo "Loading rechunked image..."
143-
144-
# Load the OCI image
145-
{{ PODMAN }} load -i "${OUTPUT_DIR}/oci-archive.tar"
146-
147-
# Tag it properly
148-
LOADED_IMAGE=$({{ PODMAN }} images --format "{{`{{.ID}}`}}" | head -1)
149-
{{ PODMAN }} tag "${LOADED_IMAGE}" "${IMAGE_FULL}"
150-
151-
# Cleanup
152-
rm -rf "${OUTPUT_DIR}"
153-
154-
echo "Loaded: ${IMAGE_FULL}"
86+
@just build nvidia
15587

15688
# Run container interactively for testing
15789
[group('Build')]
@@ -212,7 +144,7 @@ build-iso flavor="main": _titanoboa-setup
212144
# Check if image exists
213145
ID=$({{ PODMAN }} images --filter reference="${IMAGE_FULL}" --format '{{`{{.ID}}`}}')
214146
if [[ -z "$ID" ]]; then
215-
echo "Error: Image ${IMAGE_FULL} not found. Run 'just build-rechunk {{ flavor }}' first."
147+
echo "Error: Image ${IMAGE_FULL} not found. Run 'just build {{ flavor }}' first."
216148
exit 1
217149
fi
218150

@@ -352,7 +284,7 @@ verify-container image tag:
352284
clean:
353285
#!/usr/bin/bash
354286
set -eoux pipefail
355-
rm -rf _build* _titanoboa _rechunk_output
287+
rm -rf _build* _titanoboa
356288
rm -f previous.manifest.json changelog.md output.env
357289
rm -rf output/
358290
rm -f *.iso

build_files/hypercube/01-hypercube-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ dnf5 -y install \
2727
xdg-desktop-portal-hyprland
2828

2929
### CLI Tools (skip packages already in bluefin-dx)
30+
# Note: starship is already installed in bluefin-dx
3031
dnf5 -y install \
3132
fd-find \
32-
qt6ct \
33-
starship
33+
qt6ct
3434

3535
### Lazygit from COPR
3636
dnf5 -y copr enable atim/lazygit

build_files/hypercube/99-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ REQUIRED_PACKAGES=(
1616
"ghostty"
1717
"neovim"
1818
"lazygit"
19-
"starship"
2019
)
2120

2221
for pkg in "${REQUIRED_PACKAGES[@]}"; do
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
[org/gnome/login-screen]
22
logo='/usr/share/pixmaps/hypercube-logo.png'
3+
4+
[org/gnome/desktop/interface]
5+
color-scheme='prefer-dark'
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Hypercube Dark Mode Settings
2+
# Forces dark mode system-wide for GNOME/GTK applications
3+
4+
[org/gnome/desktop/interface]
5+
color-scheme='prefer-dark'
6+
gtk-theme='Tokyonight-Dark-BL'
7+
icon-theme='Tokyonight-Dark'
8+
cursor-theme='Adwaita'
9+
10+
[org/gnome/desktop/wm/preferences]
11+
theme='Tokyonight-Dark-BL'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
user-db:user
2+
system-db:local

0 commit comments

Comments
 (0)