Merge pull request #224 from naturallaw777/copilot/update-wallpaper-installation

[WIP] Update wallpaper installation to only include ultrawide version
2026-04-13 17:26:00 -05:00
parent 40dd601e21 fc5432398f
commit df88f7c30a
2 changed files with 3 additions and 312 deletions
--- a/assets/wallpapers/sovran-wallpaper-08-tagline-only.svg
+++ b/assets/wallpapers/sovran-wallpaper-08-tagline-only.svg
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 1920 1080"
-   width="1920"
-   height="1080"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="sovran-wallpaper-08-tagline-only.svg"
-   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
-   inkscape:export-filename="sovran-wallpaper-08-tagline-only.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-     id="namedview21"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.751728"
-     inkscape:cx="961.11892"
-     inkscape:cy="539.42383"
-     inkscape:window-width="3440"
-     inkscape:window-height="1363"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21" /><defs
-     id="defs14"><linearGradient
-       id="bg"
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="1"><stop
-         offset="0%"
-         stop-color="#040706"
-         id="stop1" /><stop
-         offset="50%"
-         stop-color="#06100c"
-         id="stop2" /><stop
-         offset="100%"
-         stop-color="#050706"
-         id="stop3" /></linearGradient><radialGradient
-       id="softGlow"
-       cx="0"
-       cy="0"
-       r="165"
-       fx="0"
-       fy="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(860,540)"><stop
-         offset="0%"
-         stop-color="#28d978"
-         stop-opacity="0.045"
-         id="stop4" /><stop
-         offset="100%"
-         stop-color="#28d978"
-         stop-opacity="0"
-         id="stop5" /></radialGradient><linearGradient
-       id="tileBg"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(165.8963,55.399973)"><stop
-         offset="0%"
-         stop-color="#153126"
-         id="stop6" /><stop
-         offset="55%"
-         stop-color="#0F241B"
-         id="stop7" /><stop
-         offset="100%"
-         stop-color="#091C14"
-         id="stop8" /></linearGradient><linearGradient
-       id="outerArc"
-       x1="58.258057"
-       y1="37.382242"
-       x2="253.55416"
-       y2="232.67835"
-       gradientTransform="matrix(0.95265793,0,0,1.0496947,165.8963,55.399973)"
-       gradientUnits="userSpaceOnUse"><stop
-         offset="0%"
-         stop-color="#42F39A"
-         id="stop9" /><stop
-         offset="45%"
-         stop-color="#28D978"
-         id="stop10" /><stop
-         offset="100%"
-         stop-color="#1AA45D"
-         id="stop11" /></linearGradient><linearGradient
-       id="innerArc"
-       x1="101.37266"
-       y1="83.308029"
-       x2="201.10966"
-       y2="197.29317"
-       gradientTransform="matrix(0.95624465,0,0,1.0457575,165.8963,55.399973)"
-       gradientUnits="userSpaceOnUse"><stop
-         offset="0%"
-         stop-color="#27C86F"
-         id="stop12" /><stop
-         offset="100%"
-         stop-color="#157E49"
-         id="stop13" /></linearGradient><filter
-       id="tileShadow"
-       x="-0.14545455"
-       y="-0.14545455"
-       width="1.2909091"
-       height="1.3363636"><feOffset
-         dy="12"
-         id="feOffset13" /><feGaussianBlur
-         stdDeviation="16"
-         result="blur"
-         id="feGaussianBlur13" /><feColorMatrix
-         type="matrix"
-         values="         0 0 0 0 0         0 0 0 0 0         0 0 0 0 0         0 0 0 .24 0"
-         id="feColorMatrix13" /><feMerge
-         id="feMerge14"><feMergeNode
-           in="blur"
-           id="feMergeNode13" /><feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode14" /></feMerge></filter><linearGradient
-       id="bg-3"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="256"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(373.27538,27.379415)"><stop
-         offset="0%"
-         stop-color="#153126"
-         id="stop1-6" /><stop
-         offset="55%"
-         stop-color="#0F241B"
-         id="stop2-7" /><stop
-         offset="100%"
-         stop-color="#091C14"
-         id="stop3-5" /></linearGradient><linearGradient
-       id="outerArc-3"
-       x1="70"
-       y1="40"
-       x2="190"
-       y2="210"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(373.27538,27.379415)"><stop
-         offset="0%"
-         stop-color="#42F39A"
-         id="stop4-5" /><stop
-         offset="45%"
-         stop-color="#28D978"
-         id="stop5-6" /><stop
-         offset="100%"
-         stop-color="#1AA45D"
-         id="stop6-2" /></linearGradient><linearGradient
-       id="innerArc-9"
-       x1="90"
-       y1="60"
-       x2="180"
-       y2="190"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(373.27538,27.379415)"><stop
-         offset="0%"
-         stop-color="#27C86F"
-         id="stop7-1" /><stop
-         offset="100%"
-         stop-color="#157E49"
-         id="stop8-2" /></linearGradient><filter
-       id="innerShade"
-       x="-0.049180328"
-       y="-0.049180328"
-       width="1.0983607"
-       height="1.1065574"><feOffset
-         dx="0"
-         dy="2"
-         id="feOffset8" /><feGaussianBlur
-         stdDeviation="5"
-         result="blur"
-         id="feGaussianBlur8" /><feComposite
-         in="blur"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         id="feComposite8" /><feColorMatrix
-         type="matrix"
-         values="         0 0 0 0 0         0 0 0 0 0         0 0 0 0 0         0 0 0 .18 0"
-         id="feColorMatrix8" /></filter></defs><rect
-     width="1920"
-     height="1080"
-     fill="url(#bg)"
-     id="rect14" /><!-- shared center --><circle
-     cx="587"
-     cy="513"
-     r="245"
-     fill="none"
-     stroke="rgba(242,255,247,0.045)"
-     stroke-width="1"
-     id="circle15" /><circle
-     cx="587"
-     cy="513"
-     r="305"
-     fill="none"
-     stroke="rgba(66,243,154,0.055)"
-     stroke-width="2"
-     stroke-dasharray="3, 20"
-     id="circle16" /><text
-     x="772"
-     y="498"
-     fill="#c3cbc6"
-     font-family="Inter, ui-sans-serif, system-ui, '-apple-system', BlinkMacSystemFont, 'Segoe UI', sans-serif"
-     font-size="32px"
-     font-weight="500"
-     letter-spacing="6"
-     id="text20">PRIVACY. SOVEREIGNTY. BITCOIN.</text><rect
-     x="772"
-     y="540"
-     width="430"
-     height="2"
-     rx="1"
-     fill="rgba(242,255,247,0.08)"
-     id="rect20"
-     style="fill:#cccccc" /><rect
-     x="772"
-     y="540"
-     width="188"
-     height="2"
-     rx="1"
-     fill="#42f39a"
-     id="rect21" /><g
-     id="g1"
-     transform="translate(459.72462,383.62059)"><rect
-       width="256"
-       height="256"
-       rx="48"
-       ry="48"
-       fill="url(#bg)"
-       id="rect8"
-       style="fill:url(#bg-3)"
-       x="0"
-       y="0" /><rect
-       x="1.5"
-       y="1.5"
-       width="253"
-       height="253"
-       rx="46.5"
-       ry="46.5"
-       fill="none"
-       stroke="rgba(255,255,255,0.08)"
-       id="rect9" /><rect
-       x="6"
-       y="6"
-       width="244"
-       height="244"
-       rx="42"
-       ry="42"
-       fill="none"
-       filter="url(#innerShade)"
-       id="rect10" /><path
-       d="M 128,32 A 96,96 0 1 1 58,196"
-       fill="none"
-       stroke="url(#outerArc)"
-       stroke-width="12"
-       stroke-linecap="round"
-       id="path10"
-       style="stroke:url(#outerArc-3)" /><path
-       d="M 128,56 A 72,72 0 1 1 76,178"
-       fill="none"
-       stroke="url(#innerArc)"
-       stroke-width="10"
-       stroke-linecap="round"
-       id="path11"
-       style="stroke:url(#innerArc-9)" /><circle
-       cx="128"
-       cy="128"
-       r="8"
-       fill="#f2fff7"
-       id="circle11" /><circle
-       cx="128"
-       cy="128"
-       r="18"
-       fill="none"
-       stroke="#7bffc0"
-       stroke-opacity="0.14"
-       stroke-width="4"
-       id="circle12" /></g></svg>
--- a/modules/core/sovran_systemsos-desktop.nix
+++ b/modules/core/sovran_systemsos-desktop.nix
@@ -12,10 +12,6 @@ let
    installPhase = ''
      mkdir -p $out/share/backgrounds/sovran

-      rsvg-convert -w 1920 -h 1080 \
-        $src/sovran-wallpaper-08-tagline-only.svg \
-        -o $out/share/backgrounds/sovran/sovran-standard.png
-
      rsvg-convert -w 3440 -h 1440 \
        $src/sovran-wallpaper-12-ultrawide-3440x1440.svg \
        -o $out/share/backgrounds/sovran/sovran-ultrawide.png
@@ -41,23 +37,9 @@ let
    # Fresh install — no user-db exists yet, apply full Sovran theme below

    BG_DIR="/run/current-system/sw/share/backgrounds/sovran"
-    STANDARD="$BG_DIR/sovran-standard.png"
    ULTRAWIDE="$BG_DIR/sovran-ultrawide.png"

-    WIDTH=$(${pkgs.dbus}/bin/dbus-send \
-      --session \
-      --print-reply \
-      --dest=org.gnome.Mutter.DisplayConfig \
-      /org/gnome/Mutter/DisplayConfig \
-      org.gnome.Mutter.DisplayConfig.GetCurrentState \
-      2>/dev/null \
-      | grep -oP 'uint32 \K[0-9]+' \
-      | head -1)
-
-    CHOSEN="$STANDARD"
-    if [ -n "$WIDTH" ] && [ "$WIDTH" -ge 2560 ] && [ -f "$ULTRAWIDE" ]; then
-      CHOSEN="$ULTRAWIDE"
-    fi
+    CHOSEN="$ULTRAWIDE"

    ${pkgs.dconf}/bin/dconf load / << EOF
 [org/gnome/desktop/background]
@@ -198,8 +180,8 @@ in
    settings = {

      "org/gnome/desktop/background" = {
-        picture-uri = "file:///run/current-system/sw/share/backgrounds/sovran/sovran-standard.png";
-        picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/sovran/sovran-standard.png";
+        picture-uri = "file:///run/current-system/sw/share/backgrounds/sovran/sovran-ultrawide.png";
+        picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/sovran/sovran-ultrawide.png";
        picture-options = "zoom";
        primary-color = "#000000";
        secondary-color = "#000000";