From e5a3deb9ec4c16ccde4e70cb18a521d3b5f1e8af Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Tue, 15 Apr 2025 12:22:57 +0200
Subject: [PATCH] move output configuration out of general sway config, change
 wallpaper

---
 flake.lock                                      | 13 +++++++++++++
 flake.nix                                       |  5 +++++
 home/profiles/programs/desktop/sway/default.nix | 13 -------------
 home/suites/nixdesk/default.nix                 |  1 +
 home/suites/nixdesk/outputs.nix                 | 13 +++++++++++++
 sys/profiles/themes/dark.nix                    |  8 ++++----
 6 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 home/suites/nixdesk/outputs.nix

diff --git a/flake.lock b/flake.lock
index 8c5b39a..ef2938a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -908,6 +908,7 @@
         "sops-nix": "sops-nix",
         "stylix": "stylix",
         "vpn-confinement": "vpn-confinement",
+        "wallpaper": "wallpaper",
         "wayland-appusage": "wayland-appusage"
       }
     },
@@ -1196,6 +1197,18 @@
         "type": "github"
       }
     },
+    "wallpaper": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-Ka69DKAY7BAFSpKGkfuaPpeU2ghfeh5RXOP+RJ9NxSA=",
+        "type": "file",
+        "url": "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg"
+      }
+    },
     "wayland-appusage": {
       "inputs": {
         "crane": "crane",
diff --git a/flake.nix b/flake.nix
index 3e61de1..d14db28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,5 +69,10 @@
 
     wayland-appusage.url = "github:xunuwu/wayland-appusage";
     wayland-appusage.inputs.nixpkgs.follows = "nixpkgs";
+
+    wallpaper = {
+      url = "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg";
+      flake = false;
+    };
   };
 }
diff --git a/home/profiles/programs/desktop/sway/default.nix b/home/profiles/programs/desktop/sway/default.nix
index 9374d5f..81dd250 100644
--- a/home/profiles/programs/desktop/sway/default.nix
+++ b/home/profiles/programs/desktop/sway/default.nix
@@ -60,19 +60,6 @@
     '';
     config = {
       modifier = "Mod4";
-      output = {
-        "DP-3" = {
-          mode = "1920x1080@165Hz";
-          position = "1920 0";
-          allow_tearing = "yes";
-        };
-        "HDMI-A-1" = {
-          position = "0 0";
-        };
-      };
-      # output = {
-      #   "*".bg = "${config.xdg.userDirs.pictures}/wallpaper fill";
-      # };
       input."type:keyboard".xkb_layout = osConfig.services.xserver.xkb.layout;
       bars = []; # i use waybar instead
       window = {
diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix
index f766783..37733f3 100644
--- a/home/suites/nixdesk/default.nix
+++ b/home/suites/nixdesk/default.nix
@@ -6,6 +6,7 @@
 }: {
   imports = with homeProfiles; [
     ./defaults.nix
+    ./outputs.nix
 
     secrets.default
 
diff --git a/home/suites/nixdesk/outputs.nix b/home/suites/nixdesk/outputs.nix
new file mode 100644
index 0000000..1e3e5aa
--- /dev/null
+++ b/home/suites/nixdesk/outputs.nix
@@ -0,0 +1,13 @@
+{inputs, ...}: {
+  wayland.windowManager.sway.config.output = {
+    "DP-3" = {
+      mode = "1920x1080@165Hz";
+      position = "1920 0";
+      # allow_tearing = "yes";
+      bg = "${inputs.wallpaper.outPath} fill";
+    };
+    "HDMI-A-1" = {
+      position = "0 0";
+    };
+  };
+}
diff --git a/sys/profiles/themes/dark.nix b/sys/profiles/themes/dark.nix
index 3a18600..d824cef 100644
--- a/sys/profiles/themes/dark.nix
+++ b/sys/profiles/themes/dark.nix
@@ -7,10 +7,10 @@
     enable = true;
     autoEnable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/mountain.yaml";
-    image = pkgs.fetchurl {
-      url = "https://imgur.com/2HATcuP.png";
-      hash = "sha256-YsSg1nreefSD/Ij44ZrWMkdk6+rJ2YozcFXvCM/EZNM=";
-    };
+    # image = pkgs.fetchurl {
+    #   url = "https://imgur.com/2HATcuP.png";
+    #   hash = "sha256-YsSg1nreefSD/Ij44ZrWMkdk6+rJ2YozcFXvCM/EZNM=";
+    # };
     polarity = "dark";
     cursor = {
       package = pkgs.apple-cursor;