nate/OrionOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix remaining sky* references missed in Phase 7 rename

Browse Source 
- Dockerfile: WORKDIR /skyos → /orionos, ENTRYPOINT path, image name
- Makefile: skyos-default.png → orionos-default.png in install target
- iso/build-base.sh: all sky*/SkyOS → orion*/OrionOS
- iso/mac-install-notes.md: update install instructions for OrionOS
- themes/OrionOS: finish renaming sky* strings in gtkrc, gtk.css, index.theme

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
nmemmertandClaude Sonnet 4.6 committed 2026-07-23 13:45:00 -04:00
1 parent 61fa1194db
commit 33c2f3b66d
7 files changed
+46 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ install: all
# wallpaper # wallpaper
mkdir -p /usr/share/orionos/wallpapers mkdir -p /usr/share/orionos/wallpapers
bash themes/wallpapers/generate-default.sh || true bash themes/wallpapers/generate-default.sh || true
cp -f themes/wallpapers/skyos-default.png /usr/share/orionos/wallpapers/ 2>/dev/null || true cp -f themes/wallpapers/orionos-default.png /usr/share/orionos/wallpapers/ 2>/dev/null || true
@echo "" @echo ""
@echo "OrionOS installed. Add this to ~/.xinitrc to start:" @echo "OrionOS installed. Add this to ~/.xinitrc to start:"
@echo "" @echo ""
iso/build-base.sh
+25 -25
View File
@@ -1,15 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# SkyOS base system builder # OrionOS base system builder
# Builds a bootable ISO from an Arch Linux base with the SkyWM desktop. # Builds a bootable ISO from an Arch Linux base with the SkyWM desktop.
# Run this on an existing Arch Linux install or in a Docker container. # Run this on an existing Arch Linux install or in a Docker container.
# #
# Usage: sudo ./build-base.sh # Usage: sudo ./build-base.sh
# Output: skyos.iso # Output: orionos.iso
set -euo pipefail set -euo pipefail
WORK=/tmp/skyos-build WORK=/tmp/orionos-build
ISO_NAME=skyos.iso ISO_NAME=orionos.iso
SKYOS_PKGS=( SKYOS_PKGS=(
# base # base
base linux linux-firmware base linux linux-firmware
@@ -48,11 +48,11 @@ locale-gen
echo "LANG=en_US.UTF-8" > /etc/locale.conf echo "LANG=en_US.UTF-8" > /etc/locale.conf
# hostname # hostname
echo "skyos" > /etc/hostname echo "orionos" > /etc/hostname
cat > /etc/hosts <<EOF cat > /etc/hosts <<EOF
127.0.0.1 localhost 127.0.0.1 localhost
::1 localhost ::1 localhost
127.0.1.1 skyos.localdomain skyos 127.0.1.1 orionos.localdomain orionos
EOF EOF
# timezone # timezone
@@ -61,7 +61,7 @@ hwclock --systohc
# default user # default user
useradd -m -G wheel,audio,video,storage -s /bin/bash sky useradd -m -G wheel,audio,video,storage -s /bin/bash sky
echo "sky:skyos" | chpasswd echo "orion:orionos" | chpasswd
echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
# enable services # enable services
@@ -72,9 +72,9 @@ mkinitcpio -P
CHROOT CHROOT
echo ">>> Installing SkyWM & Deskbar binaries" echo ">>> Installing SkyWM & Deskbar binaries"
cp "$(dirname "$0")/../wm/skywm" "$WORK/usr/local/bin/skywm" cp "$(dirname "$0")/../wm/orionwm" "$WORK/usr/local/bin/orionwm"
cp "$(dirname "$0")/../deskbar/skydeskbar" "$WORK/usr/local/bin/skydeskbar" cp "$(dirname "$0")/../deskbar/oriondeskbar" "$WORK/usr/local/bin/oriondeskbar"
chmod 755 "$WORK/usr/local/bin/skywm" "$WORK/usr/local/bin/skydeskbar" chmod 755 "$WORK/usr/local/bin/orionwm" "$WORK/usr/local/bin/oriondeskbar"
echo ">>> Writing xinitrc" echo ">>> Writing xinitrc"
cat > "$WORK/home/sky/.xinitrc" <<'XINITRC' cat > "$WORK/home/sky/.xinitrc" <<'XINITRC'
@@ -83,15 +83,15 @@ cat > "$WORK/home/sky/.xinitrc" <<'XINITRC'
skywallpaper skywallpaper
# Apply GTK theme # Apply GTK theme
export GTK_THEME=SkyOS export GTK_THEME=OrionOS
export GTK2_RC_FILES="$HOME/.gtkrc-2.0" export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
cat > "$HOME/.gtkrc-2.0" <<EOF cat > "$HOME/.gtkrc-2.0" <<EOF
include "/usr/share/themes/SkyOS/gtk-2.0/gtkrc" include "/usr/share/themes/OrionOS/gtk-2.0/gtkrc"
EOF EOF
mkdir -p "$HOME/.config/gtk-3.0" mkdir -p "$HOME/.config/gtk-3.0"
cat > "$HOME/.config/gtk-3.0/settings.ini" <<EOF cat > "$HOME/.config/gtk-3.0/settings.ini" <<EOF
[Settings] [Settings]
gtk-theme-name=SkyOS gtk-theme-name=OrionOS
gtk-font-name=Sans 10 gtk-font-name=Sans 10
gtk-icon-theme-name=Adwaita gtk-icon-theme-name=Adwaita
gtk-cursor-theme-name=DMZ-White gtk-cursor-theme-name=DMZ-White
@@ -100,42 +100,42 @@ gtk-menu-images=false
EOF EOF
# Compositor (subtle shadows, fast fade) # Compositor (subtle shadows, fast fade)
picom --config /etc/skyos/picom.conf & picom --config /etc/orionos/picom.conf &
# Alt+F1 global hotkey for launcher (via xbindkeys) # Alt+F1 global hotkey for launcher (via xbindkeys)
xbindkeys & xbindkeys &
# Launch Deskbar # Launch Deskbar
skydeskbar & oriondeskbar &
# Launch window manager (last, takes over the session) # Launch window manager (last, takes over the session)
exec skywm exec orionwm
XINITRC XINITRC
chmod 755 "$WORK/home/sky/.xinitrc" chmod 755 "$WORK/home/sky/.xinitrc"
arch-chroot "$WORK" chown sky:sky /home/sky/.xinitrc arch-chroot "$WORK" chown sky:sky /home/sky/.xinitrc
echo ">>> Writing xbindkeys config (Alt+F1 = launcher)" echo ">>> Writing xbindkeys config (Alt+F1 = launcher)"
cat > "$WORK/home/sky/.xbindkeysrc" <<'XBK' cat > "$WORK/home/sky/.xbindkeysrc" <<'XBK'
"skylauncher" "orionlauncher"
Mod1 + F1 Mod1 + F1
XBK XBK
arch-chroot "$WORK" chown sky:sky /home/sky/.xbindkeysrc arch-chroot "$WORK" chown sky:sky /home/sky/.xbindkeysrc
echo ">>> Installing picom config" echo ">>> Installing picom config"
mkdir -p "$WORK/etc/skyos" mkdir -p "$WORK/etc/skyos"
cp "$(dirname "$0")/../themes/picom.conf" "$WORK/etc/skyos/picom.conf" cp "$(dirname "$0")/../themes/picom.conf" "$WORK/etc/orionos/picom.conf"
echo ">>> Installing GTK theme" echo ">>> Installing GTK theme"
mkdir -p "$WORK/usr/share/themes" mkdir -p "$WORK/usr/share/themes"
cp -r "$(dirname "$0")/../themes/SkyOS" "$WORK/usr/share/themes/" cp -r "$(dirname "$0")/../themes/OrionOS" "$WORK/usr/share/themes/"
echo ">>> Installing skywallpaper helper" echo ">>> Installing skywallpaper helper"
cp "$(dirname "$0")/../themes/skywallpaper" "$WORK/usr/local/bin/skywallpaper" cp "$(dirname "$0")/../themes/skywallpaper" "$WORK/usr/local/bin/skywallpaper"
chmod 755 "$WORK/usr/local/bin/skywallpaper" chmod 755 "$WORK/usr/local/bin/skywallpaper"
echo ">>> Generating default wallpaper" echo ">>> Generating default wallpaper"
mkdir -p "$WORK/usr/share/skyos/wallpapers" mkdir -p "$WORK/usr/share/orionos/wallpapers"
(cd "$WORK/usr/share/skyos/wallpapers" && bash "$(dirname "$0")/../themes/wallpapers/generate-default.sh") || true (cd "$WORK/usr/share/orionos/wallpapers" && bash "$(dirname "$0")/../themes/wallpapers/generate-default.sh") || true
echo ">>> Installing rEFInd bootloader config for Intel Macs" echo ">>> Installing rEFInd bootloader config for Intel Macs"
mkdir -p "$WORK/boot/EFI/refind" mkdir -p "$WORK/boot/EFI/refind"
@@ -143,12 +143,12 @@ cat > "$WORK/boot/EFI/refind/refind.conf" <<'REFIND'
timeout 5 timeout 5
use_graphics_for linux use_graphics_for linux
scanfor manual scanfor manual
menuentry "SkyOS" { menuentry "OrionOS" {
icon /EFI/refind/icons/os_linux.png icon /EFI/refind/icons/os_linux.png
volume "SkyOS" volume "OrionOS"
loader /boot/vmlinuz-linux loader /boot/vmlinuz-linux
initrd /boot/initramfs-linux.img initrd /boot/initramfs-linux.img
options "root=LABEL=SkyOS rw quiet splash" options "root=LABEL=OrionOS rw quiet splash"
} }
REFIND REFIND
@@ -156,7 +156,7 @@ echo ">>> Creating ISO"
# mkarchiso requires archiso package # mkarchiso requires archiso package
if command -v mkarchiso &>/dev/null; then if command -v mkarchiso &>/dev/null; then
# Minimal archiso profile pointing to our chroot # Minimal archiso profile pointing to our chroot
mkarchiso -v -w /tmp/skyos-iso-work -o . "$WORK" mkarchiso -v -w /tmp/orionos-iso-work -o . "$WORK"
mv *.iso "$ISO_NAME" mv *.iso "$ISO_NAME"
else else
echo "WARNING: archiso not installed. To build the ISO:" echo "WARNING: archiso not installed. To build the ISO:"
iso/docker/Dockerfile
+8 -8
View File
@@ -1,10 +1,10 @@
# SkyOS ISO builder # OrionOS ISO builder
# Uses official Arch Linux as the base — provides pacman, pacstrap, archiso. # Uses official Arch Linux as the base — provides pacman, pacstrap, archiso.
# Build context: the repo root (OS/) # Build context: the repo root (OS/)
# #
# Build: docker build -t skyos-builder -f iso/docker/Dockerfile . # Build: docker build -t orionos-builder -f iso/docker/Dockerfile .
# Run: docker run --privileged -v $(pwd)/dist:/dist skyos-builder # Run: docker run --privileged -v $(pwd)/dist:/dist orionos-builder
# Output: dist/skyos.iso # Output: dist/orionos.iso
FROM archlinux:latest FROM archlinux:latest
@@ -41,11 +41,11 @@ RUN su builder -c " \
RUN echo "=== archiso initcpio hooks ===" && \ RUN echo "=== archiso initcpio hooks ===" && \
ls /usr/lib/initcpio/hooks/ 2>/dev/null || echo "(none found)" ls /usr/lib/initcpio/hooks/ 2>/dev/null || echo "(none found)"
# ── copy the entire SkyOS source tree ──────────────────────────────── # ── copy the entire OrionOS source tree ──────────────────────────────
WORKDIR /skyos WORKDIR /orionos
COPY . . COPY . .
# ── build the SkyOS binaries inside the container ──────────────────── # ── build the OrionOS binaries inside the container ───────────────────
# pkg-config finds X11/Xft headers automatically on Arch — no overrides needed # pkg-config finds X11/Xft headers automatically on Arch — no overrides needed
RUN make RUN make
@@ -54,4 +54,4 @@ RUN bash themes/wallpapers/generate-default.sh || true
# ── run the ISO build script ────────────────────────────────────────── # ── run the ISO build script ──────────────────────────────────────────
# --privileged is required for loop device mounts inside the container # --privileged is required for loop device mounts inside the container
ENTRYPOINT ["/skyos/iso/docker/entrypoint.sh"] ENTRYPOINT ["/orionos/iso/docker/entrypoint.sh"]
iso/mac-install-notes.md
+5 -5
View File
@@ -1,17 +1,17 @@
# Installing SkyOS on an Intel Mac # Installing OrionOS on an Intel Mac
## Before you start ## Before you start
- Intel Mac (any MacBook/MacBook Pro with Intel CPU — 2006–2020) - Intel Mac (any MacBook/MacBook Pro with Intel CPU — 2006–2020)
- USB drive ≥ 4 GB - USB drive ≥ 4 GB
- The SkyOS ISO - The OrionOS ISO
## Step 1 — Boot from USB ## Step 1 — Boot from USB
Intel Macs use EFI + rEFInd (included in the ISO) to boot Linux. Intel Macs use EFI + rEFInd (included in the ISO) to boot Linux.
1. Hold **Option (⌥)** at startup to see the boot picker. 1. Hold **Option (⌥)** at startup to see the boot picker.
2. Select the SkyOS USB drive (shows as "EFI Boot"). 2. Select the OrionOS USB drive (shows as "EFI Boot").
## Step 2 — Partition the disk ## Step 2 — Partition the disk
@@ -27,7 +27,7 @@ Format:
```bash ```bash
mkfs.fat -F32 /dev/sda1 mkfs.fat -F32 /dev/sda1
mkswap /dev/sda2 mkswap /dev/sda2
mkfs.ext4 -L SkyOS /dev/sda3 mkfs.ext4 -L OrionOS /dev/sda3
``` ```
## Step 3 — Install ## Step 3 — Install
@@ -56,7 +56,7 @@ points it at the right initramfs.
## Step 5 — First boot ## Step 5 — First boot
Log in as `sky` (password: `skyos` — change it!), then: Log in as `sky` (password: `orionos` — change it!), then:
```bash ```bash
startx startx
themes/OrionOS/gtk-2.0/gtkrc
+2 -2
View File
@@ -1,4 +1,4 @@
# SkyOS GTK2 Theme — dark navy palette (legacy GTK2 apps) # OrionOS GTK2 Theme — dark navy palette (legacy GTK2 apps)
gtk-color-scheme = "bg_color:#1E2436\nfg_color:#D8E4F4\nbase_color:#0E1424\ntext_color:#D8E4F4\nselected_bg_color:#1E4D78\nselected_fg_color:#F0F6FF\ntooltip_bg_color:#0C1020\ntooltip_fg_color:#D8E4F4" gtk-color-scheme = "bg_color:#1E2436\nfg_color:#D8E4F4\nbase_color:#0E1424\ntext_color:#D8E4F4\nselected_bg_color:#1E4D78\nselected_fg_color:#F0F6FF\ntooltip_bg_color:#0C1020\ntooltip_fg_color:#D8E4F4"
@@ -63,7 +63,7 @@ style "entry" {
} }
class "GtkEntry" style "entry" class "GtkEntry" style "entry"
gtk-theme-name = "SkyOS" gtk-theme-name = "OrionOS"
gtk-icon-theme-name = "Adwaita" gtk-icon-theme-name = "Adwaita"
gtk-font-name = "Sans 10" gtk-font-name = "Sans 10"
gtk-cursor-theme-name = "DMZ-White" gtk-cursor-theme-name = "DMZ-White"
themes/OrionOS/gtk-3.0/gtk.css
+1 -1
View File
@@ -1,4 +1,4 @@
/* SkyOS GTK3 Theme — dark navy palette matching skywm/skydeskbar */ /* OrionOS GTK3 Theme — dark navy palette matching orionwm/oriondeskbar */
@define-color bg_color #1E2436; @define-color bg_color #1E2436;
@define-color bg_dark #161C2A; @define-color bg_dark #161C2A;
themes/OrionOS/index.theme
+4 -4
View File
@@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Type=X-GNOME-Metatheme Type=X-GNOME-Metatheme
Name=SkyOS Name=OrionOS
Comment=BeOS/SkyOS-inspired warm tan desktop theme Comment=BeOS/OrionOS-inspired warm tan desktop theme
Encoding=UTF-8 Encoding=UTF-8
[X-GNOME-Metatheme] [X-GNOME-Metatheme]
GtkTheme=SkyOS GtkTheme=OrionOS
MetacityTheme=SkyOS MetacityTheme=OrionOS
IconTheme=Adwaita IconTheme=Adwaita
CursorTheme=DMZ-White CursorTheme=DMZ-White
ButtonLayout=close:minimize,maximize ButtonLayout=close:minimize,maximize