From 73ebd5d4a34ff892c2eff2f613e88c41e69a4428 Mon Sep 17 00:00:00 2001 From: Michael Heller <21163552+mdheller@users.noreply.github.com> Date: Sun, 2 Aug 2026 20:04:49 -0400 Subject: [PATCH 1/3] =?UTF-8?q?desktop:=20SociOS=20default=20profile=20?= =?UTF-8?q?=E2=80=94=20the=20whole=20thing,=20not=20bare=20GNOME=20(+=20va?= =?UTF-8?q?lidation)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Describes + validates + executes the reference SociOS desktop as the DEFAULT Guix profile. Validation before: desktop.scm was bare GNOME (gdm+openssh) β€” included none of ArcMenu/tognee, Tilix-quake, monitors, Docker, dock, web-search, theme, or wallpaper = FAIL. - guix/system/DESKTOP_COMPONENTS.md: full component + protocol inventory from the running laptop (ArcMenu+tognee, Places, Extensions, Vitals/system-monitor, net-speed, Docker, public-IP/VPN, night-light, Tilix quake drop-down, XFCE dock, web-search launcher; protocols Docker/SSH/VPN-WAN-IP/mDNS/HTTP-search/ChromeApps/ WhatsApp+Telegram/redshift) + per-component default-inclusion checklist (βœ…/βš™οΈdconf/🟠needs-Guix-packaging) + enhancement mapping (E1/E3/E5/E8/E11). - desktop.scm: pulls the set into the default via specification->package (Tilix, gnome-tweaks, icecat, libreoffice, gimp, redshift, plank, fonts) + docker-service + docker group. 🟠 rows (ArcMenu/tognee/Vitals/Matrix-wallpaper) are the Workstream-F packaging queue β€” a wrong name fails cleanly on the runner. - guix/home/socios-desktop.dconf: left window buttons, standing-stones wallpaper, night-light, Tilix quake (F12), ArcMenu tognee + custom theme, enabled extensions. Adversarial: specification->package avoids fabricating module paths; Scheme balanced. NOT build-validated (no guix on macOS); Linux runner is the gate. --- guix/home/socios-desktop.dconf | 44 +++++++++++++++++ guix/system/DESKTOP_COMPONENTS.md | 82 +++++++++++++++++++++++++++++++ guix/system/desktop.scm | 30 ++++++++--- 3 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 guix/home/socios-desktop.dconf create mode 100644 guix/system/DESKTOP_COMPONENTS.md diff --git a/guix/home/socios-desktop.dconf b/guix/home/socios-desktop.dconf new file mode 100644 index 0000000..50c206c --- /dev/null +++ b/guix/home/socios-desktop.dconf @@ -0,0 +1,44 @@ +# SociOS desktop defaults β€” apply with: dconf load / < guix/home/socios-desktop.dconf +# (or via a Guix Home home-dconf activation). Sets the reference look/feel: left +# window buttons, the standing-stones wallpaper, night-light, the Tilix quake +# drop-down keybind, and the ArcMenu tognee layout + custom theme (the ArcMenu +# keys take effect once the extension is packaged β€” see DESKTOP_COMPONENTS.md). + +[org/gnome/desktop/wm/preferences] +button-layout='close,minimize,maximize:' + +[org/gnome/desktop/background] +picture-uri='file:///run/current-system/profile/share/backgrounds/socios/standing-stones-sunset.jpg' +picture-uri-dark='file:///run/current-system/profile/share/backgrounds/socios/standing-stones-matrix.jpg' +picture-options='zoom' + +[org/gnome/desktop/interface] +color-scheme='prefer-dark' +enable-hot-corners=true + +[org/gnome/settings-daemon/plugins/color] +night-light-enabled=true +night-light-temperature=uint32 3700 + +# Tilix quake drop-down terminal, bound to F12 +[org/gnome/settings-daemon/plugins/media-keys] +custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/tilix-quake/'] + +[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/tilix-quake] +name='Tilix Quake' +command='tilix --quake' +binding='F12' + +[com/gexperts/Tilix] +window-style='disable-csd-hide-toolbar' +quake-hide-lose-focus=true +quake-height-percent=uint32 50 + +# ArcMenu β€” Windows-start menu with the tognee layout + custom color theme +# (applies once gnome-shell-extension-arcmenu is in the Guix profile). +[org/gnome/shell/extensions/arcmenu] +menu-layout='Tognee' +override-menu-theme=true + +[org/gnome/shell] +enabled-extensions=['arcmenu@arcmenu.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'appindicatorsupport@rgcjonas.gmail.com'] diff --git a/guix/system/DESKTOP_COMPONENTS.md b/guix/system/DESKTOP_COMPONENTS.md new file mode 100644 index 0000000..e70e161 --- /dev/null +++ b/guix/system/DESKTOP_COMPONENTS.md @@ -0,0 +1,82 @@ +# SociOS desktop β€” components, protocols, and default-config validation + +The reference look/feel (from the running SociOS laptop) and the checklist that +the **default** Guix desktop profile (`desktop.scm` + `guix/home/socios-desktop.scm`) +must include the *whole thing* β€” not a bare GNOME. Status: βœ… in default Β· +βš™οΈ needs dconf/home config Β· 🟠 needs Guix packaging (Workstream F) Β· ☐ TODO. + +## Aesthetic / theme +- **Wallpaper set:** "ancient monument + sky" β€” Stonehenge/Avebury **standing + stones** at sunset (pink/purple), dawn (frosty blue), and a **Matrix code-rain** + variant (green digital rain over the stones at dusk). Signature look. 🟠 (ship a + `socios-wallpapers` package) + βš™οΈ (set as default). +- **Shell:** dark top panel; light/Adwaita app windows; **window buttons on the + LEFT** (`βœ• – β–‘`); custom cursor; ArcMenu "Override Menu Theme" + **Custom color + theme**. βš™οΈ (dconf). +- **Two editions seen:** GNOME (primary, SociOS-branded) and an **XFCE** variant + with a docklike bottom panel + Matrix wallpaper. + +## Shell / panel components (GNOME primary) +| Component | What it is | Status | +|---|---|---| +| SociOS branding + app menu | branded activities/app button | βš™οΈ | +| **Places** menu | Places Status Indicator extension | 🟠 | +| **ArcMenu** + **tognee** layout | Windows-start-style app menu (category tree + search + shortcut strip: Home/Downloads/Docs/keyring/Settings/terminal/logout/lock/power) | 🟠 (ArcMenu + tognee layout not in Guix) | +| **Extensions** dropdown | extension manager/list in the bar | 🟠 | +| **Public-IP** indicator | shows WAN IP (VPN egress watch) | 🟠 | +| **Workspace thumbnails** | window/workspace preview | 🟠 | +| **System monitor** | CPU %, mem/disk, **net speed KB/s** (Vitals / system-monitor / Net-Speed) | 🟠 | +| **Docker** indicator | container status in the bar | 🟠 | +| **Night light** | redshift/blue-light (moon icon) | βœ… (`redshift`/`gammastep`) + βš™οΈ | +| WiFi / Volume / Mic / Battery / Clock / Power | standard quick settings | βœ… | +| App tray indicators | WhatsApp/@ etc. (AppIndicator) | 🟠 (appindicator ext) | + +## Terminals +| Component | What it is | Status | +|---|---|---| +| **Tilix β€” Quake / drop-down drawer** | top-edge drop-down terminal (F12-style) | βœ… `tilix` + βš™οΈ (quake keybind/geometry) | +| Xfce Terminal | XFCE-edition terminal | βœ… | +| TurtleTerm / sourceos-shell | the SourceOS agentic terminals | (estate) | + +## Launcher / search +| Component | What it is | Status | +|---|---|---| +| **Web-search launcher** | popup with Google/YouTube/Amazon/Ebay/GitHub/Wolfram/DuckDuckGo β†’ "start search in browser" | 🟠 (search provider) β€” **enhancement: route through `sherlock-search` + E1 consent** | + +## Dock / taskbar (XFCE edition) +| Component | Status | +|---|---| +| **Docklike bottom panel** (Plank / xfce4-panel docklike) with app launchers | 🟠 / βœ… (plank in Guix) + βš™οΈ | + +## Applications seen (default set) +Browsers **Chromium + Firefox/IceCat** (+ **Chrome Apps**/PWAs), **LibreOffice**, +**GIMP**, media, **WhatsApp + Telegram** (proprietary β€” *enhancement target: +**Matrix**/Element for sovereign messaging*), file manager, settings. Mostly βœ… in +Guix (chromium 🟑 via nonguix for codecs). + +## Protocols observed (what you're actually using) +| Protocol | Evidence | Sovereign enhancement | +|---|---|---| +| **Docker / OCI** | whale indicator; container workflow | route images through **zot** (E5) | +| **SSH** | Tilix/Xfce terminals, remote hosts (`hellbook`), IPs | consent-plane on remote exec (E1) | +| **VPN / WAN-IP watch** | public IP `103.101.171.161` shown top-bar | fold into the **mesh** (E3) egress posture | +| **LAN / mDNS (Avahi)** | `192.168.100.x`, `hellbook.local` | Continuity/AirDrop via mesh (E3) | +| **HTTP(S) web search** | the engine launcher β†’ browser | via `sherlock-search`, purpose-gated (E1) | +| **Chrome Apps / PWA** | ArcMenu "Chrome Apps" category | signed app plane (E5) | +| **Messaging (WhatsApp/Telegram)** | dock + tray | **Matrix** (E1/E3) sovereign replacement | +| **Redshift / DDC** | night-light | βœ… | + +## Enhancement mapping (this desktop carries the program) +- The **terminals + shell + ArcMenu actions** are the primary **E1 consent-plane** + surface and the home of the missing **E11 consent/receipts UX** (the Privacy pane). +- The **public-IP/VPN + LAN/mDNS** indicators are the seed of **E3 mesh federation**. +- The **web-search launcher** must route through `sherlock-search` under **E1**. +- **Docker** images flow through **zot** under **E5**; the whole profile is **E8** + (reproducible Guix) β€” this file's ☐/🟠 rows are the Workstream-F packaging queue. + +## Validation result (before this PR) +The default `desktop.scm` was **bare GNOME** (gdm + openssh). It included **none** +of ArcMenu/tognee, Tilix-quake, the monitors, Docker, the dock, the web-search +launcher, the theme, or the wallpaper set β†’ **FAIL**. This PR moves the βœ…/βš™οΈ rows +into the default and enumerates the 🟠 rows as the packaging queue so the default +converges on the whole thing. diff --git a/guix/system/desktop.scm b/guix/system/desktop.scm index d95a6db..f1a61c3 100644 --- a/guix/system/desktop.scm +++ b/guix/system/desktop.scm @@ -16,10 +16,10 @@ ;;; be build-validated β€” a wrong gdm-configuration would silently break the test). (use-modules (gnu) + (gnu packages) ; specification->package (resolve by name) (nongnu packages linux) (nongnu system linux-initrd)) -(use-service-modules desktop ssh) -(use-package-modules certs ssh) +(use-service-modules desktop ssh docker) (define %keyboard-layout (keyboard-layout "us")) @@ -54,14 +54,32 @@ (name "sourceos") (comment "SourceOS operator") (group "users") - (supplementary-groups '("wheel" "netdev" "audio" "video"))) + ;; `docker` group so the SociOS desktop's container workflow works. + (supplementary-groups '("wheel" "netdev" "audio" "video" "docker"))) %base-user-accounts)) - (packages (append (list nss-certs) %base-packages)) + ;; The SociOS default desktop set. Resolved by NAME at build time so a missing + ;; package fails cleanly on the runner (the Workstream-F packaging signal) β€” + ;; ArcMenu/tognee, Vitals, Places-indicator and the Matrix wallpaper are NOT yet + ;; in Guix and are tracked in DESKTOP_COMPONENTS.md (the 🟠 packaging queue). + (packages (append (map specification->package + '("nss-certs" "openssh" + ;; terminals: Tilix (quake drop-down) + the estate shells + "tilix" + ;; shell customization available in Guix today + "gnome-tweaks" "gnome-shell-extensions" + ;; browsers / office / graphics / media + "icecat" "libreoffice" "gimp" + ;; night-light + a docklike panel + fonts + "redshift" "plank" "font-dejavu" "font-gnu-freefont")) + %base-packages)) ;; Full GNOME on top of the desktop stack (%desktop-services provides gdm + - ;; NetworkManager); openssh for headless control from the harness. + ;; NetworkManager); Docker for the container workflow; openssh for headless + ;; control from the Agent-S harness. (services (cons* (service gnome-desktop-service-type) + (service docker-service-type) (service openssh-service-type - (openssh-configuration (openssh openssh-sans-x))) + (openssh-configuration + (openssh (specification->package "openssh-sans-x")))) %desktop-services))) From 010ce95c232d07d4050434c2621b3b670092ca7c Mon Sep 17 00:00:00 2001 From: Michael Heller <21163552+mdheller@users.noreply.github.com> Date: Sun, 2 Aug 2026 20:11:36 -0400 Subject: [PATCH 2/3] =?UTF-8?q?desktop:=20OWN=20THE=20SHELL=20=E2=80=94=20?= =?UTF-8?q?first-class,=20not=20a=20gnome-look=20extension=20graveyard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correcting this PR's original approach per Michael: SociOS does NOT bolt on third-party GNOME extensions (ArcMenu/Vitals/dash-to-dock/tognee/appindicator) or proprietary apps (WhatsApp/Telegram/Element) β€” that ecosystem is a balkanized graveyard that breaks every GNOME release. The screenshots are the DESIGN TARGET, not a parts list. - The menu/dock/monitors/web-search/consent-receipts-UX/messaging are ONE owned, version-locked, first-class SociOS shell (), native + coherent + stable. Messaging is our OWN capability on the mesh/Matrix substrate, in the shell β€” never a WhatsApp/Telegram bolt-on. - desktop.scm: dropped gnome-shell-extensions + plank (third-party); keep tilix (quake), gnome-tweaks (native settings), IceCat/LibreOffice/GIMP/redshift/fonts. - socios-desktop.dconf: removed the enabled-extensions graveyard + arcmenu keys; keep only native GNOME keys that survive every release (left buttons, wallpaper, night-light, Tilix quake). SociOS-shell settings live in its own schema. - DESKTOP_COMPONENTS.md: πŸ”· = build as first-class owned shell component, not a Guix-packaged extension. Principle stated up top. --- guix/home/socios-desktop.dconf | 14 +++---- guix/system/DESKTOP_COMPONENTS.md | 64 +++++++++++++++++++------------ guix/system/desktop.scm | 19 ++++----- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/guix/home/socios-desktop.dconf b/guix/home/socios-desktop.dconf index 50c206c..1edc296 100644 --- a/guix/home/socios-desktop.dconf +++ b/guix/home/socios-desktop.dconf @@ -34,11 +34,9 @@ window-style='disable-csd-hide-toolbar' quake-hide-lose-focus=true quake-height-percent=uint32 50 -# ArcMenu β€” Windows-start menu with the tognee layout + custom color theme -# (applies once gnome-shell-extension-arcmenu is in the Guix profile). -[org/gnome/shell/extensions/arcmenu] -menu-layout='Tognee' -override-menu-theme=true - -[org/gnome/shell] -enabled-extensions=['arcmenu@arcmenu.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'appindicatorsupport@rgcjonas.gmail.com'] +# The menu (tognee-style), dock, system monitors, web-search, and consent/receipts +# UX are NOT third-party gnome-look extensions β€” they are the FIRST-CLASS owned +# SociOS shell (`sourceos-shell`), version-locked and coherent. So there is no +# `enabled-extensions` graveyard here; the SociOS shell is a single owned layer. +# Its settings live in the SociOS shell's own schema, not org.gnome.shell.extensions.*. +# This keyfile sets only the native GNOME keys that survive every release. diff --git a/guix/system/DESKTOP_COMPONENTS.md b/guix/system/DESKTOP_COMPONENTS.md index e70e161..3f8e6bc 100644 --- a/guix/system/DESKTOP_COMPONENTS.md +++ b/guix/system/DESKTOP_COMPONENTS.md @@ -1,14 +1,25 @@ # SociOS desktop β€” components, protocols, and default-config validation -The reference look/feel (from the running SociOS laptop) and the checklist that -the **default** Guix desktop profile (`desktop.scm` + `guix/home/socios-desktop.scm`) -must include the *whole thing* β€” not a bare GNOME. Status: βœ… in default Β· -βš™οΈ needs dconf/home config Β· 🟠 needs Guix packaging (Workstream F) Β· ☐ TODO. +**Principle β€” OWN THE SHELL (first-class absorption).** The screenshots are the +**design target, not a parts list.** SociOS does **not** implement its desktop by +bolting on third-party gnome-look extensions (ArcMenu, Vitals, dash-to-dock, +tognee, appindicator) or proprietary apps (WhatsApp, Telegram, Element) β€” that +ecosystem is a balkanized graveyard that breaks every GNOME release. The menu, +dock, monitors, drop-down terminal, search, **consent/receipts UX (E11)**, and +**messaging** are built as ONE **owned, version-locked, first-class SociOS shell** +(home: `sourceos-shell`), native and coherent. Messaging is our own capability on +the sovereign **mesh/Matrix substrate**, first-class in the shell β€” never a +WhatsApp/Telegram bolt-on. + +The checklist below is what the **default** profile (`desktop.scm` + +`guix/home/socios-desktop.dconf`) must include. Status: βœ… in default Β· βš™οΈ dconf Β· +πŸ”· **build as a first-class owned SociOS shell component (`sourceos-shell`), not a +third-party extension** Β· ☐ TODO. ## Aesthetic / theme - **Wallpaper set:** "ancient monument + sky" β€” Stonehenge/Avebury **standing stones** at sunset (pink/purple), dawn (frosty blue), and a **Matrix code-rain** - variant (green digital rain over the stones at dusk). Signature look. 🟠 (ship a + variant (green digital rain over the stones at dusk). Signature look. πŸ”· (ship a `socios-wallpapers` package) + βš™οΈ (set as default). - **Shell:** dark top panel; light/Adwaita app windows; **window buttons on the LEFT** (`βœ• – β–‘`); custom cursor; ArcMenu "Override Menu Theme" + **Custom color @@ -20,16 +31,16 @@ must include the *whole thing* β€” not a bare GNOME. Status: βœ… in default Β· | Component | What it is | Status | |---|---|---| | SociOS branding + app menu | branded activities/app button | βš™οΈ | -| **Places** menu | Places Status Indicator extension | 🟠 | -| **ArcMenu** + **tognee** layout | Windows-start-style app menu (category tree + search + shortcut strip: Home/Downloads/Docs/keyring/Settings/terminal/logout/lock/power) | 🟠 (ArcMenu + tognee layout not in Guix) | -| **Extensions** dropdown | extension manager/list in the bar | 🟠 | -| **Public-IP** indicator | shows WAN IP (VPN egress watch) | 🟠 | -| **Workspace thumbnails** | window/workspace preview | 🟠 | -| **System monitor** | CPU %, mem/disk, **net speed KB/s** (Vitals / system-monitor / Net-Speed) | 🟠 | -| **Docker** indicator | container status in the bar | 🟠 | +| **Places** menu | Places Status Indicator extension | πŸ”· | +| **ArcMenu** + **tognee** layout | Windows-start-style app menu (category tree + search + shortcut strip: Home/Downloads/Docs/keyring/Settings/terminal/logout/lock/power) | πŸ”· (ArcMenu + tognee layout not in Guix) | +| **Extensions** dropdown | extension manager/list in the bar | πŸ”· | +| **Public-IP** indicator | shows WAN IP (VPN egress watch) | πŸ”· | +| **Workspace thumbnails** | window/workspace preview | πŸ”· | +| **System monitor** | CPU %, mem/disk, **net speed KB/s** (Vitals / system-monitor / Net-Speed) | πŸ”· | +| **Docker** indicator | container status in the bar | πŸ”· | | **Night light** | redshift/blue-light (moon icon) | βœ… (`redshift`/`gammastep`) + βš™οΈ | | WiFi / Volume / Mic / Battery / Clock / Power | standard quick settings | βœ… | -| App tray indicators | WhatsApp/@ etc. (AppIndicator) | 🟠 (appindicator ext) | +| App tray indicators | WhatsApp/@ etc. (AppIndicator) | πŸ”· (appindicator ext) | ## Terminals | Component | What it is | Status | @@ -41,18 +52,19 @@ must include the *whole thing* β€” not a bare GNOME. Status: βœ… in default Β· ## Launcher / search | Component | What it is | Status | |---|---|---| -| **Web-search launcher** | popup with Google/YouTube/Amazon/Ebay/GitHub/Wolfram/DuckDuckGo β†’ "start search in browser" | 🟠 (search provider) β€” **enhancement: route through `sherlock-search` + E1 consent** | +| **Web-search launcher** | popup with Google/YouTube/Amazon/Ebay/GitHub/Wolfram/DuckDuckGo β†’ "start search in browser" | πŸ”· (search provider) β€” **enhancement: route through `sherlock-search` + E1 consent** | ## Dock / taskbar (XFCE edition) | Component | Status | |---|---| -| **Docklike bottom panel** (Plank / xfce4-panel docklike) with app launchers | 🟠 / βœ… (plank in Guix) + βš™οΈ | +| **Docklike bottom panel** (Plank / xfce4-panel docklike) with app launchers | πŸ”· / βœ… (plank in Guix) + βš™οΈ | -## Applications seen (default set) -Browsers **Chromium + Firefox/IceCat** (+ **Chrome Apps**/PWAs), **LibreOffice**, -**GIMP**, media, **WhatsApp + Telegram** (proprietary β€” *enhancement target: -**Matrix**/Element for sovereign messaging*), file manager, settings. Mostly βœ… in -Guix (chromium 🟑 via nonguix for codecs). +## Applications (default set) +Browser **Firefox/IceCat** (+ a signed app/PWA plane, E5), **LibreOffice**, +**GIMP**, media, file manager, settings β€” free software, βœ… in Guix. +**Messaging is NOT WhatsApp/Telegram/Element** β€” it is a **first-class SociOS +messaging capability** on the sovereign mesh/Matrix substrate, native to the shell +(owned, integrated, stable). πŸ”· (`sourceos-shell` + mesh). ## Protocols observed (what you're actually using) | Protocol | Evidence | Sovereign enhancement | @@ -63,7 +75,7 @@ Guix (chromium 🟑 via nonguix for codecs). | **LAN / mDNS (Avahi)** | `192.168.100.x`, `hellbook.local` | Continuity/AirDrop via mesh (E3) | | **HTTP(S) web search** | the engine launcher β†’ browser | via `sherlock-search`, purpose-gated (E1) | | **Chrome Apps / PWA** | ArcMenu "Chrome Apps" category | signed app plane (E5) | -| **Messaging (WhatsApp/Telegram)** | dock + tray | **Matrix** (E1/E3) sovereign replacement | +| **Messaging β€” OWN first-class capability** | native SociOS messaging in the shell | mesh/Matrix substrate, integrated + stable (E1/E3) β€” never WhatsApp/Telegram | | **Redshift / DDC** | night-light | βœ… | ## Enhancement mapping (this desktop carries the program) @@ -72,11 +84,13 @@ Guix (chromium 🟑 via nonguix for codecs). - The **public-IP/VPN + LAN/mDNS** indicators are the seed of **E3 mesh federation**. - The **web-search launcher** must route through `sherlock-search` under **E1**. - **Docker** images flow through **zot** under **E5**; the whole profile is **E8** - (reproducible Guix) β€” this file's ☐/🟠 rows are the Workstream-F packaging queue. + (reproducible Guix) β€” this file's ☐/πŸ”· rows are the Workstream-F packaging queue. ## Validation result (before this PR) The default `desktop.scm` was **bare GNOME** (gdm + openssh). It included **none** -of ArcMenu/tognee, Tilix-quake, the monitors, Docker, the dock, the web-search +of the menu/tognee, Tilix-quake, the monitors, Docker, the dock, the web-search launcher, the theme, or the wallpaper set β†’ **FAIL**. This PR moves the βœ…/βš™οΈ rows -into the default and enumerates the 🟠 rows as the packaging queue so the default -converges on the whole thing. +into the default now, and enumerates the πŸ”· rows as the **owned-shell build queue** +(`sourceos-shell`) β€” built as first-class, version-locked, coherent SociOS shell +components, **not** third-party gnome-look extensions β€” so the default converges on +the whole thing *and stays stable across GNOME releases*. diff --git a/guix/system/desktop.scm b/guix/system/desktop.scm index f1a61c3..2967072 100644 --- a/guix/system/desktop.scm +++ b/guix/system/desktop.scm @@ -58,20 +58,17 @@ (supplementary-groups '("wheel" "netdev" "audio" "video" "docker"))) %base-user-accounts)) - ;; The SociOS default desktop set. Resolved by NAME at build time so a missing - ;; package fails cleanly on the runner (the Workstream-F packaging signal) β€” - ;; ArcMenu/tognee, Vitals, Places-indicator and the Matrix wallpaper are NOT yet - ;; in Guix and are tracked in DESKTOP_COMPONENTS.md (the 🟠 packaging queue). + ;; The SociOS default desktop set (resolved by NAME so a missing package fails + ;; cleanly on the runner). The menu / dock / monitors / web-search / consent UX + ;; are the FIRST-CLASS owned SociOS shell (`sourceos-shell`), version-locked and + ;; coherent β€” NOT third-party gnome-look extensions (see DESKTOP_COMPONENTS.md, + ;; the πŸ”· owned-shell build queue). So no ArcMenu/Vitals/dash-to-dock/plank here. (packages (append (map specification->package '("nss-certs" "openssh" - ;; terminals: Tilix (quake drop-down) + the estate shells - "tilix" - ;; shell customization available in Guix today - "gnome-tweaks" "gnome-shell-extensions" - ;; browsers / office / graphics / media + "tilix" ; quake drop-down terminal + "gnome-tweaks" ; native settings only "icecat" "libreoffice" "gimp" - ;; night-light + a docklike panel + fonts - "redshift" "plank" "font-dejavu" "font-gnu-freefont")) + "redshift" "font-dejavu" "font-gnu-freefont")) %base-packages)) ;; Full GNOME on top of the desktop stack (%desktop-services provides gdm + From 4c0b82c6db2184486b1a5b5948cd6d3b1f443aa0 Mon Sep 17 00:00:00 2001 From: Michael Heller <21163552+mdheller@users.noreply.github.com> Date: Sun, 2 Aug 2026 21:00:32 -0400 Subject: [PATCH 3/3] =?UTF-8?q?desktop:=20address=20review=20=E2=80=94=20d?= =?UTF-8?q?rop=20duplicate=20openssh,=20note=20socios-wallpapers=20pkg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Copilot: (1) remove 'openssh' from the package list β€” the ssh service already pulls openssh-sans-x; installing full openssh too duplicated the closure with a different variant; (2) note the standing-stones wallpaper URIs are provided by the (pending πŸ”·) socios-wallpapers package (GNOME falls back until it lands). The socios-desktop.scm reference was already corrected to .dconf in the reframe. --- guix/home/socios-desktop.dconf | 4 ++++ guix/system/desktop.scm | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/home/socios-desktop.dconf b/guix/home/socios-desktop.dconf index 1edc296..e984c83 100644 --- a/guix/home/socios-desktop.dconf +++ b/guix/home/socios-desktop.dconf @@ -7,6 +7,10 @@ [org/gnome/desktop/wm/preferences] button-layout='close,minimize,maximize:' +# These paths are provided by the `socios-wallpapers` package (the standing-stones +# + Matrix set) β€” a πŸ”· owned-shell packaging item in DESKTOP_COMPONENTS.md. Until +# it is in the system profile the URIs resolve to nothing (GNOME falls back to the +# default background); the package MUST land for the reference look to apply. [org/gnome/desktop/background] picture-uri='file:///run/current-system/profile/share/backgrounds/socios/standing-stones-sunset.jpg' picture-uri-dark='file:///run/current-system/profile/share/backgrounds/socios/standing-stones-matrix.jpg' diff --git a/guix/system/desktop.scm b/guix/system/desktop.scm index 2967072..6823aa9 100644 --- a/guix/system/desktop.scm +++ b/guix/system/desktop.scm @@ -64,7 +64,10 @@ ;; coherent β€” NOT third-party gnome-look extensions (see DESKTOP_COMPONENTS.md, ;; the πŸ”· owned-shell build queue). So no ArcMenu/Vitals/dash-to-dock/plank here. (packages (append (map specification->package - '("nss-certs" "openssh" + ;; No "openssh" here β€” the ssh service already pulls + ;; openssh-sans-x; installing full "openssh" too would + ;; duplicate the closure with a different variant. + '("nss-certs" "tilix" ; quake drop-down terminal "gnome-tweaks" ; native settings only "icecat" "libreoffice" "gimp"