From d4ad00d79657724edfb839e1421355b67d0b9a34 Mon Sep 17 00:00:00 2001 From: oxmc7769 Date: Thu, 12 Mar 2026 06:20:21 -0700 Subject: [PATCH] New basegit status! --- configs/build_amd64 | 5 +++++ configs/build_arm64 | 5 +++++ exports/iso/03-install-live/01-run.sh | 11 +++++++++++ .../{03-network => 02-network}/01-run.sh | 0 .../{03-network => 02-network}/files/resolv.conf | 0 .../{04-finalise => 03-finalise}/01-run.sh | 9 +++++++++ .../squashfs/{05-export => 04-export}/01-run.sh | 9 +++------ exports/squashfs/05-install-calamares/01-run.sh | 4 ++-- exports/squashfs/06-export-livefs/01-run.sh | 8 +++----- stage2/01-sys-tweaks/00-packages | 4 ++-- stage2/01-sys-tweaks/01-run.sh | 3 +++ stage2/02-net-tweaks/00-packages | 2 +- stage3/00-install-packages/00-packages | 5 +++-- stage3/00-install-packages/01-packages-amd64 | 2 +- stage3/00-install-packages/01-packages-nr | 3 +-- stage3/00-install-packages/01-packages-rpi-only | 1 - stage3/00-install-packages/01-run.sh | 2 +- stage3/01-install-desktop/00-packages | 2 -- stage3/01-install-desktop/00-packages-nr | 2 +- stage3/01-install-desktop/01-packages-nr | 1 + stage3/02-setup-system/00-packages | 3 ++- stage3/02-setup-system/00-run.sh | 2 +- stage3/02-setup-system/files/gnome-extensions | 16 +++++++++++++++- ...etup => gnome-initial-setup-default-settings} | 2 +- 24 files changed, 71 insertions(+), 30 deletions(-) rename exports/squashfs/{03-network => 02-network}/01-run.sh (100%) rename exports/squashfs/{03-network => 02-network}/files/resolv.conf (100%) rename exports/squashfs/{04-finalise => 03-finalise}/01-run.sh (89%) rename exports/squashfs/{05-export => 04-export}/01-run.sh (86%) create mode 100644 stage3/01-install-desktop/01-packages-nr rename stage3/02-setup-system/files/{gnome-initial-setup => gnome-initial-setup-default-settings} (75%) diff --git a/configs/build_amd64 b/configs/build_amd64 index 6126360..8f2d573 100644 --- a/configs/build_amd64 +++ b/configs/build_amd64 @@ -9,3 +9,8 @@ LIVEINSTALL=1 # Set LIVEBOOT=1 to install live-boot packages and regenerate the initrd with # squashfs/overlay support — required for booting rootfs.squashfs from an ISO via live-boot. LIVEBOOT=1 + +# Live session user credentials (written to /etc/live/config.conf) +LIVE_USERNAME="vesper" +LIVE_USER_FULLNAME="VesperOS Live User" +LIVE_USER_PASSWORD="vesper" diff --git a/configs/build_arm64 b/configs/build_arm64 index 21dba59..3528680 100644 --- a/configs/build_arm64 +++ b/configs/build_arm64 @@ -1,2 +1,7 @@ # This builds VesperOS for arm64 ARCH=arm64 + +# Live session user credentials (written to /etc/live/config.conf) +LIVE_USERNAME="vesper" +LIVE_USER_FULLNAME="VesperOS Live User" +LIVE_USER_PASSWORD="vesper" diff --git a/exports/iso/03-install-live/01-run.sh b/exports/iso/03-install-live/01-run.sh index 0d70c57..74c3d9d 100755 --- a/exports/iso/03-install-live/01-run.sh +++ b/exports/iso/03-install-live/01-run.sh @@ -13,4 +13,15 @@ apt-get install -y \ live-boot-initramfs-tools \ live-config \ live-config-systemd + +apt-get install --no-install-recommends -y calamares calamares-settings-vesperos EOF + +# Write live-config user settings +mkdir -p "${ROOTFS_DIR}/etc/live" +cat > "${ROOTFS_DIR}/etc/live/config.conf" << EOF +LIVE_USERNAME="${LIVE_USERNAME:-user}" +LIVE_USER_FULLNAME="${LIVE_USER_FULLNAME:-Live User}" +LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev bluetooth" +LIVE_USER_PASSWORD="${LIVE_USER_PASSWORD:-live}" +EOF \ No newline at end of file diff --git a/exports/squashfs/03-network/01-run.sh b/exports/squashfs/02-network/01-run.sh similarity index 100% rename from exports/squashfs/03-network/01-run.sh rename to exports/squashfs/02-network/01-run.sh diff --git a/exports/squashfs/03-network/files/resolv.conf b/exports/squashfs/02-network/files/resolv.conf similarity index 100% rename from exports/squashfs/03-network/files/resolv.conf rename to exports/squashfs/02-network/files/resolv.conf diff --git a/exports/squashfs/04-finalise/01-run.sh b/exports/squashfs/03-finalise/01-run.sh similarity index 89% rename from exports/squashfs/04-finalise/01-run.sh rename to exports/squashfs/03-finalise/01-run.sh index c47ed53..a34d558 100755 --- a/exports/squashfs/04-finalise/01-run.sh +++ b/exports/squashfs/03-finalise/01-run.sh @@ -15,6 +15,15 @@ apt-get install -y \ live-config-systemd EOF + # Write live-config user settings + mkdir -p "${ROOTFS_DIR}/etc/live" + cat > "${ROOTFS_DIR}/etc/live/config.conf" << EOF +LIVE_USERNAME="${LIVE_USERNAME:-user}" +LIVE_USER_FULLNAME="${LIVE_USER_FULLNAME:-Live User}" +LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev bluetooth" +LIVE_USER_PASSWORD="${LIVE_USER_PASSWORD:-live}" +EOF + # Rewrite fstab for the live environment. # live-boot manages root via overlayfs — build-time disk entries cause fsck failures at boot. cat > "${ROOTFS_DIR}/etc/fstab" << 'FSTABEOF' diff --git a/exports/squashfs/05-export/01-run.sh b/exports/squashfs/04-export/01-run.sh similarity index 86% rename from exports/squashfs/05-export/01-run.sh rename to exports/squashfs/04-export/01-run.sh index 4a4fa6c..b969dcb 100755 --- a/exports/squashfs/05-export/01-run.sh +++ b/exports/squashfs/04-export/01-run.sh @@ -64,9 +64,6 @@ none | *) ;; esac -# Copy fixed-name artifacts for gen-installmedia compatibility -# rootfs.squashfs is always uncompressed regardless of DEPLOY_COMPRESSION -cp "${SQUASHFS_FILE}" "${DEPLOY_DIR}/rootfs.squashfs" -[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/rootfs.vmlinuz" -[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/rootfs.initrd.img" -echo "gen-installmedia artifacts written to ${DEPLOY_DIR}/rootfs.{squashfs,vmlinuz,initrd.img}" +cp "${SQUASHFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.squashfs" +[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.vmlinuz" +[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.initrd.img" diff --git a/exports/squashfs/05-install-calamares/01-run.sh b/exports/squashfs/05-install-calamares/01-run.sh index 0353799..075b309 100755 --- a/exports/squashfs/05-install-calamares/01-run.sh +++ b/exports/squashfs/05-install-calamares/01-run.sh @@ -3,5 +3,5 @@ [ "${LIVEINSTALL}" != "1" ] && exit 0 on_chroot << EOF -apt-get install -y calamares calamares-settings-debian -EOF +apt-get install --no-install-recommends -y calamares calamares-settings-vesperos +EOF \ No newline at end of file diff --git a/exports/squashfs/06-export-livefs/01-run.sh b/exports/squashfs/06-export-livefs/01-run.sh index 68a938e..b67b965 100755 --- a/exports/squashfs/06-export-livefs/01-run.sh +++ b/exports/squashfs/06-export-livefs/01-run.sh @@ -16,8 +16,6 @@ mkdir -p "${DEPLOY_DIR}" VMLINUZ=$(find "${ROOTFS_DIR}/boot" -maxdepth 1 -name "vmlinuz-*" | sort | tail -1) INITRD=$(find "${ROOTFS_DIR}/boot" -maxdepth 1 -name "initrd.img-*" | sort | tail -1) -cp "${LIVEFS_FILE}" "${DEPLOY_DIR}/livefs.squashfs" -[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/livefs.vmlinuz" -[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/livefs.initrd.img" - -echo "gen-installmedia livefs artifacts written to ${DEPLOY_DIR}/livefs.{squashfs,vmlinuz,initrd.img}" +cp "${LIVEFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.squashfs" +[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.vmlinuz" +[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.initrd.img" diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 6eefc56..9750ec9 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -1,4 +1,4 @@ -ssh less fbset sudo psmisc strace ed ncdu zsh zsh-common +ssh fbset sudo psmisc strace ed ncdu zsh zsh-common console-setup keyboard-configuration debconf-utils parted build-essential manpages-dev bash-completion gdb pkg-config btrfs-progs @@ -9,7 +9,7 @@ avahi-daemon bluez bluez-firmware lua5.1 luajit -ca-certificates curl +curl usbutils dosfstools apt-listchanges diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index b61601f..8aba059 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -35,8 +35,11 @@ EOF on_chroot << EOF usermod --pass='*' root +#usermod --shell /bin/zsh root EOF +#sed -i 's|^SHELL=.*|SHELL=/bin/zsh|' "${ROOTFS_DIR}/etc/default/useradd" + rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key* sed -i 's/^FONTFACE=.*/FONTFACE=""/;s/^FONTSIZE=.*/FONTSIZE=""/' "${ROOTFS_DIR}/etc/default/console-setup" diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages index cedf05f..ff3ac65 100644 --- a/stage2/02-net-tweaks/00-packages +++ b/stage2/02-net-tweaks/00-packages @@ -1,3 +1,3 @@ -wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-realtek firmware-mediatek firmware-marvell-prestera- +wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-iwlwifi firmware-realtek firmware-mediatek firmware-marvell-prestera- network-manager net-tools diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index 5d2648c..8bf8d7b 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -1,6 +1,6 @@ gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav gtk2-engines alsa-utils -desktop-base +plymouth desktop-base git gvfs rfkill @@ -10,4 +10,5 @@ obconf python3-pyqt5 python3-qtawesome python3-opengl vulkan-tools mesa-vulkan-drivers -libopengl0 \ No newline at end of file +libopengl0 +command-not-found \ No newline at end of file diff --git a/stage3/00-install-packages/01-packages-amd64 b/stage3/00-install-packages/01-packages-amd64 index 5fd57ac..e7b065e 100644 --- a/stage3/00-install-packages/01-packages-amd64 +++ b/stage3/00-install-packages/01-packages-amd64 @@ -1 +1 @@ -firefox-esr +firefox-esr \ No newline at end of file diff --git a/stage3/00-install-packages/01-packages-nr b/stage3/00-install-packages/01-packages-nr index 1314154..f529fec 100644 --- a/stage3/00-install-packages/01-packages-nr +++ b/stage3/00-install-packages/01-packages-nr @@ -1,6 +1,5 @@ -#xserver-xorg xinit menu-xdg yad zenity xdg-utils gvfs-backends gvfs-fuse gdm3 gnome-themes-extra-data gnome-icon-theme -gnome-keyring +gnome-keyring \ No newline at end of file diff --git a/stage3/00-install-packages/01-packages-rpi-only b/stage3/00-install-packages/01-packages-rpi-only index 37719e6..fc509ec 100644 --- a/stage3/00-install-packages/01-packages-rpi-only +++ b/stage3/00-install-packages/01-packages-rpi-only @@ -1,6 +1,5 @@ firefox rpi-firefox-mods libwidevinecdm0 gldriver-test rpd-wayland-core -#rpd-x-core rpd-theme rpd-utilities rpd-preferences \ No newline at end of file diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh index 97ac57d..c0aa94f 100755 --- a/stage3/00-install-packages/01-run.sh +++ b/stage3/00-install-packages/01-run.sh @@ -2,4 +2,4 @@ on_chroot <<- EOF apt-mark auto python3-pyqt5 python3-qtawesome python3-opengl -EOF +EOF \ No newline at end of file diff --git a/stage3/01-install-desktop/00-packages b/stage3/01-install-desktop/00-packages index 9111bd8..8afce8a 100644 --- a/stage3/01-install-desktop/00-packages +++ b/stage3/01-install-desktop/00-packages @@ -2,7 +2,5 @@ python3-pip python3-numpy tree libgl1-mesa-dri libgles1 -#xcompmgr ffmpeg vlc -plymouth diff --git a/stage3/01-install-desktop/00-packages-nr b/stage3/01-install-desktop/00-packages-nr index 4826e86..ef585cb 100644 --- a/stage3/01-install-desktop/00-packages-nr +++ b/stage3/01-install-desktop/00-packages-nr @@ -1 +1 @@ -gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-online-accounts gnome-initial-setup gnome-tweaks gnome-shell-extension-no-annoyance gnome-shell-extension-manager gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng gnome-shell-extensions-extra +gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-online-accounts gnome-initial-setup gnome-tweaks gnome-shell-extension-manager gnome-shell-extension-user-theme gnome-shell-extension-zorin-taskbar gnome-shell-extension-no-annoyance gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng diff --git a/stage3/01-install-desktop/01-packages-nr b/stage3/01-install-desktop/01-packages-nr new file mode 100644 index 0000000..87630d1 --- /dev/null +++ b/stage3/01-install-desktop/01-packages-nr @@ -0,0 +1 @@ +wallpapers-chillcraft \ No newline at end of file diff --git a/stage3/02-setup-system/00-packages b/stage3/02-setup-system/00-packages index 8fcfb8b..da317d4 100644 --- a/stage3/02-setup-system/00-packages +++ b/stage3/02-setup-system/00-packages @@ -1 +1,2 @@ -command-not-found \ No newline at end of file +zorin-exec-guard-app-db +zorin-exec-guard \ No newline at end of file diff --git a/stage3/02-setup-system/00-run.sh b/stage3/02-setup-system/00-run.sh index a393340..1d9091d 100755 --- a/stage3/02-setup-system/00-run.sh +++ b/stage3/02-setup-system/00-run.sh @@ -36,7 +36,7 @@ install -m 644 files/loveimage.png "${ROOTFS_DIR}/usr/local/share/backgrounds/lo install -m 644 files/neon-forest.png "${ROOTFS_DIR}/usr/local/share/backgrounds/neon-forest.png" # Set default settings (gnome-initial-setup) -install -m 644 files/gnome-initial-setup "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d/00-default-settings" +install -m 644 files/gnome-initial-setup-default-settings "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d/00-default-settings" # Set default gnome settings install -m 644 files/gnome-default-settings "${ROOTFS_DIR}/etc/dconf/db/local.d/00-default-settings" diff --git a/stage3/02-setup-system/files/gnome-extensions b/stage3/02-setup-system/files/gnome-extensions index 31bd9c1..e7ca2a6 100644 --- a/stage3/02-setup-system/files/gnome-extensions +++ b/stage3/02-setup-system/files/gnome-extensions @@ -1,2 +1,16 @@ [org/gnome/shell] -enabled-extensions=['dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-themes@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx'] +enabled-extensions=['zorin-taskbar@zorinos.com', 'ding@rastersoft.com', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx'] +favorite-apps=['org.gnome.Settings.desktop', 'firefox-esr.desktop', 'org.gnome.Nautilus.desktop'] + +[org/gnome/shell/extensions/zorin-taskbar] +panel-sizes='{"0":48}' +panel-positions='{"0":"BOTTOM"}' +panel-lengths='{"0":100}' +panel-anchors='{"0":"MIDDLE"}' +panel-element-positions='{"0":[{"element":"showDesktopButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}' +trans-use-custom-opacity=true +trans-panel-opacity=0.85 +trans-use-dynamic-opacity=true +trans-dynamic-behavior='MAXIMIZED_WINDOWS' +trans-dynamic-anim-target=0.95 +global-border-radius=6 \ No newline at end of file diff --git a/stage3/02-setup-system/files/gnome-initial-setup b/stage3/02-setup-system/files/gnome-initial-setup-default-settings similarity index 75% rename from stage3/02-setup-system/files/gnome-initial-setup rename to stage3/02-setup-system/files/gnome-initial-setup-default-settings index 737067a..0899659 100644 --- a/stage3/02-setup-system/files/gnome-initial-setup +++ b/stage3/02-setup-system/files/gnome-initial-setup-default-settings @@ -1,4 +1,4 @@ -# This file changes the wallpaper in the gnome-initial-setup session +# This changes/sets the defaults for gnome-initial-setup's session [org/gnome/desktop/background] picture-uri='file:///usr/local/share/backgrounds/loveimage.png'