From 6be54986323fc272844622eea94911bd8d157bf1 Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Sun, 13 Apr 2025 23:53:02 +0800
Subject: [PATCH] update niri, maomaowm

---
 flake.lock                                     | 15 +++++++--------
 flake.nix                                      |  5 ++---
 home/programs/desktop/niri/autostart.nix       |  1 -
 home/programs/desktop/niri/override-config.nix | 11 +++++++++--
 home/tweaks/wallpaper.nix                      | 12 ++++++------
 os/programs/default.nix                        |  1 +
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 19ff6b2..c75fc75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -582,16 +582,15 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743821376,
-        "narHash": "sha256-IEiro5RTX3vcbJLi0W69RldDkeEkpzPkaQkPgxxHZBo=",
+        "lastModified": 1744511702,
+        "narHash": "sha256-LEKRZCqj7ERuKk+HI9F2UX7u8KQbBJwrfDFFMHEqiqA=",
         "owner": "DreamMaoMao",
         "repo": "maomaowm",
-        "rev": "60a561f3dfe4acd210f6330d9f7171add6317840",
+        "rev": "d636ef97ac0d6dc68267ef9a5d813af112f0fc6d",
         "type": "github"
       },
       "original": {
         "owner": "DreamMaoMao",
-        "ref": "wlroots-0.19",
         "repo": "maomaowm",
         "type": "github"
       }
@@ -703,17 +702,17 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1743928003,
-        "narHash": "sha256-zplmZv+QgVXzk7O3j5CWmvAPydxhbsVfkZ0DjUGMPlc=",
+        "lastModified": 1744451806,
+        "narHash": "sha256-cZTekG7OJUvNmdG/nT7z4ock/hbqcjf+E21DlEpzaqY=",
         "owner": "YalTeR",
         "repo": "niri",
-        "rev": "4ca7812e4fd51632995f9fccaad8f4607977abff",
+        "rev": "35623ea34582d6dfb0946a56981053f6fe8ed8b1",
         "type": "github"
       },
       "original": {
         "owner": "YalTeR",
         "repo": "niri",
-        "rev": "4ca7812e4fd51632995f9fccaad8f4607977abff",
+        "rev": "35623ea34582d6dfb0946a56981053f6fe8ed8b1",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 8a4d6c7..f1bc914 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,7 @@
     };
     flake-parts.url = "github:hercules-ci/flake-parts";
     niri-unstable = {
-      url = "github:YalTeR/niri/4ca7812e4fd51632995f9fccaad8f4607977abff";
+      url = "github:YalTeR/niri/35623ea34582d6dfb0946a56981053f6fe8ed8b1";
       flake = false;
     };
     niri = {
@@ -81,7 +81,6 @@
     nh.url = "github:viperML/nh";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     agenix.url = "github:ryantm/agenix";
-    maomaowm.url = "github:DreamMaoMao/maomaowm/wlroots-0.19";
-    # maomaowm.url = "git+file:///home/eden/Repos/maomaowm-orig";
+    maomaowm.url = "github:DreamMaoMao/maomaowm";
   };
 }
diff --git a/home/programs/desktop/niri/autostart.nix b/home/programs/desktop/niri/autostart.nix
index 05ac46d..31d3729 100644
--- a/home/programs/desktop/niri/autostart.nix
+++ b/home/programs/desktop/niri/autostart.nix
@@ -29,7 +29,6 @@ let
         swww-daemon &
         clash-meta -d ~/.config/clash &
         wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 &
-        waycorner &
       '';
   };
   niri-blur-wallpaper = pkgs.writers.writePython3Bin "niri-blur-wallpaper" { doCheck = false; } ''
diff --git a/home/programs/desktop/niri/override-config.nix b/home/programs/desktop/niri/override-config.nix
index 1108ca9..2aa0df5 100644
--- a/home/programs/desktop/niri/override-config.nix
+++ b/home/programs/desktop/niri/override-config.nix
@@ -4,9 +4,16 @@ let
     # kdl
     '''';
   finalNiriConfig =
+    with config.lib.stylix.colors.withHashtag;
     builtins.replaceStrings
-      [ "output \"${config.lib.monitors.mainMonitorName}\" {" ]
-      [ "output \"${config.lib.monitors.mainMonitorName}\" {\nfocus-at-startup" ]
+      [
+        "output \"${config.lib.monitors.mainMonitorName}\" {"
+        # "background-color \"${base01}\""
+      ]
+      [
+        "output \"${config.lib.monitors.mainMonitorName}\" {\nfocus-at-startup"
+        # "background-color \"${base01}\"\n    backdrop-color \"${base02}\""
+      ]
       config.programs.niri.finalConfig
     + "\n"
     + extraConfig;
diff --git a/home/tweaks/wallpaper.nix b/home/tweaks/wallpaper.nix
index c87c61a..75b4ea1 100644
--- a/home/tweaks/wallpaper.nix
+++ b/home/tweaks/wallpaper.nix
@@ -17,10 +17,9 @@
       effects = {
         hydrogen = {
           enable = true;
-          options = {
-            extraArguments = "--shadow-arguments '80x50+0+0' --background \"${config.lib.stylix.colors.withHashtag.base02}\"";
-          };
+          options.extraArguments = "--shadow-arguments '80x50+0+0'";
         };
+        vignette.enable = true;
       };
     }
     {
@@ -48,10 +47,11 @@
       baseImageName = "bangqiaoyan-girl-sky";
       path = "${pkgs.wallpapers}/bangqiaoyan-girl-sky.jpg";
       convertMethod = "gonord";
-      effects = {
-        hydrogen.enable = true;
-        vignette.enable = true;
+      effects.hydrogen = {
+        enable = true;
+        options.extraArguments = "--background \"${config.lib.stylix.colors.withHashtag.base02}\"";
       };
+
     }
     {
       name = "morncolour-pink-landscape.png";
diff --git a/os/programs/default.nix b/os/programs/default.nix
index 1cb664d..02bdef8 100644
--- a/os/programs/default.nix
+++ b/os/programs/default.nix
@@ -7,5 +7,6 @@
     ./swhkd.nix
     ./maomaowm.nix
     ./hellwm.nix
+    ./miracle-wm.nix
   ];
 }