From a85586b88d31c6a06174d1a6aa91acb9bc143355 Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Tue, 25 Mar 2025 22:43:23 +0800
Subject: [PATCH] update maomaowm input (wlroots-0.19)

---
 flake.lock                                 | 19 ++++++-----
 flake.nix                                  |  5 +--
 home/programs/desktop/maomaowm/default.nix | 39 ++++++++++++----------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 951ee4e..9753163 100644
--- a/flake.lock
+++ b/flake.lock
@@ -529,17 +529,18 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1742791827,
-        "narHash": "sha256-R3Z3N/2sRXyIWkfCbCrAzmgJOE0mPoQwBprfiacOuSs=",
-        "ref": "refs/heads/main",
-        "rev": "982827cb8e624e59ec3aaf4a888e55b812f689c4",
-        "revCount": 187,
-        "type": "git",
-        "url": "file:///home/eden/Repos/maomaowm-test"
+        "lastModified": 1742902339,
+        "narHash": "sha256-6cCVa6LsQr7PgkPsA5px4Bm8ox4MBZUq1AlMyGfYHLU=",
+        "owner": "DreamMaoMao",
+        "repo": "maomaowm",
+        "rev": "2dcfdf84e3f217c46a33478e5ebd80d5fdb95285",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "file:///home/eden/Repos/maomaowm-test"
+        "owner": "DreamMaoMao",
+        "ref": "wlroots-0.19",
+        "repo": "maomaowm",
+        "type": "github"
       }
     },
     "mmsg": {
diff --git a/flake.nix b/flake.nix
index ab5c89a..f4e9cab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,7 +74,8 @@
     nh.url = "github:viperML/nh";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     agenix.url = "github:ryantm/agenix";
-    # maomaowm.url = "github:DreamMaoMao/maomaowm";
-    maomaowm.url = "git+file:///home/eden/Repos/maomaowm-test";
+    # maomaowm.url = "github:DreamMaoMao/maomaowm/wlroots-0.19";
+    maomaowm.url = "git+file:///home/eden/Repos/maomaowm-orig";
+    maomaowm.inputs.nixpkgs.follows = "nixpkgs";
   };
 }
diff --git a/home/programs/desktop/maomaowm/default.nix b/home/programs/desktop/maomaowm/default.nix
index 68a2564..5c0a7c8 100644
--- a/home/programs/desktop/maomaowm/default.nix
+++ b/home/programs/desktop/maomaowm/default.nix
@@ -88,15 +88,15 @@
 
       # tags rule
       # layout support: tile,scroller,grid,monocle,spiral,dwindle
-      tags=id:1,layout_name:tile
-      tags=id:2,layout_name:tile
-      tags=id:3,layout_name:tile
-      tags=id:4,layout_name:tile
-      tags=id:5,layout_name:tile
-      tags=id:6,layout_name:tile
-      tags=id:7,layout_name:tile
-      tags=id:8,layout_name:tile
-      tags=id:9,layout_name:tile
+      tags=id:1,layout_name:scroller
+      tags=id:2,layout_name:scroller
+      tags=id:3,layout_name:scroller
+      tags=id:4,layout_name:scroller
+      tags=id:5,layout_name:scroller
+      tags=id:6,layout_name:scroller
+      tags=id:7,layout_name:scroller
+      tags=id:8,layout_name:scroller
+      tags=id:9,layout_name:scroller
 
       # Window Rules
       # appid: type-string if match it or title, the rule match   
@@ -126,7 +126,11 @@
       # windowrule=animation_type_open:zoom,appid:wofi
       # windowrule=globalkeybinding:ctrl+alt-o,appid:com.obsproject.Studio
       # windowrule=globalkeybinding:ctrl+alt-n,appid:com.obsproject.Studio
-
+      windowrule=isfloating:1,appid:yad
+      windowrule=globalkeybinding:ctrl+alt-a,appid:com.obsproject.Studio
+      windowrule=globalkeybinding:ctrl+alt-s,appid:com.obsproject.Studio
+      windowrule=scroller_proportion:1.0,appid:kitty
+      windowrule=scroller_proportion:1.0,appid:firefox
 
       # open in specific tag
       # windowrule=tags:4,appid:Google-chrome
@@ -148,8 +152,8 @@
       # 7:flip and rotate 270 degrees counter-clockwise
 
       # example
-      monitorrule=eDP-1,0.55,1,tile,0,1.6,1000,0
-      monitorrule=HDMI-A-1,0.55,1,tile,1,1.6,0,0
+      monitorrule=eDP-1,0.55,1,scroller,0,1.6,1000,0
+      monitorrule=HDMI-A-1,0.55,1,scroller,1,1.6,0,0
 
       # Key Bindings
       # The mod key is not case sensitive, 
@@ -208,8 +212,8 @@
 
 
       # switch layout
-      bind=CTRL+SUPER,i,setlayout,tile
-      bind=CTRL+SUPER,l,setlayout,scroller
+      bind=CTRL+SUPER,t,setlayout,tile
+      bind=CTRL+SUPER,s,setlayout,scroller
       bind=SUPER,n,switch_layout
 
 
@@ -266,8 +270,8 @@
       # monitor switch
       bind=SUPER+CTRL,h,focusmon,left
       bind=SUPER+CTRL,l,focusmon,right
-      bind=SUPER+CTRL,bracketleft,tagmon,left
-      bind=SUPER+CTRL,bracketright,tagmon,right
+      bind=SUPER+CTRL+SHIFT,H,tagmon,left
+      bind=SUPER+CTRL+SHIFT,L,tagmon,right
 
       # gaps
       bind=ALT+SHIFT,X,incgaps,1
@@ -310,10 +314,9 @@
         wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 &
         killall .waybar-wrapped
         waybar -c ~/.config/maomao/waybar/config.jsonc -s ~/.config/maomao/waybar/style.css &
-        killall .fcitx5-wrapped
         killall .nm-applet-wrap
         killall .blueman-applet
-        fcitx5 -d &
+        fcitx5 -d -r &
         nm-applet &
         blueman-applet &
       ''