diff --git a/home/programs/wayland/hyprland/binds.nix b/home/programs/wayland/hyprland/binds.nix
index a51827c0..f9d9f8d4 100644
--- a/home/programs/wayland/hyprland/binds.nix
+++ b/home/programs/wayland/hyprland/binds.nix
@@ -29,9 +29,7 @@ in {
     ];
 
     # binds
-    bind = let
-      monocle = "dwindle:no_gaps_when_only";
-    in
+    bind =
       [
         # compositor commands
         "$mod SHIFT, E, exec, pkill Hyprland"
@@ -45,9 +43,6 @@ in {
         "$mod, P, pseudo,"
         "$mod ALT, ,resizeactive,"
 
-        # toggle "monocle" (no_gaps_when_only)
-        "$mod, M, exec, hyprctl keyword ${monocle} $(($(hyprctl getoption ${monocle} -j | jaq -r '.int') ^ 1))"
-
         # utility
         # terminal
         "$mod, Return, exec, run-as-service foot"
diff --git a/home/programs/wayland/hyprland/default.nix b/home/programs/wayland/hyprland/default.nix
index 489924a5..b0fc74ed 100644
--- a/home/programs/wayland/hyprland/default.nix
+++ b/home/programs/wayland/hyprland/default.nix
@@ -10,6 +10,7 @@ in {
     ./binds.nix
     ./rules.nix
     ./settings.nix
+    ./smartgaps.nix
   ];
 
   home.packages = [
diff --git a/home/programs/wayland/hyprland/smartgaps.nix b/home/programs/wayland/hyprland/smartgaps.nix
new file mode 100644
index 00000000..fd91275e
--- /dev/null
+++ b/home/programs/wayland/hyprland/smartgaps.nix
@@ -0,0 +1,55 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.wayland.windowManager.hyprland.settings.general) gaps_in gaps_out border_size;
+  inherit (config.wayland.windowManager.hyprland.settings.decoration) rounding;
+  inherit (builtins) concatStringsSep;
+
+  toggleSmartGaps = let
+    workspaceSelectors = ["w[t1]" "w[tg1]" "f[1]"];
+    forEach = f: concatStringsSep "\n" (map f workspaceSelectors);
+  in
+    pkgs.writeShellScript "toggleSmartGaps" ''
+      hyprctl -j workspacerules | ${lib.getExe pkgs.jaq} -e 'any(.[]; select(.workspaceString == "w[t1]" or .workspaceString == "w[tg1]" or .workspaceString == "w[f1]") | (.gapsIn | all(. == 0)) and (.gapsOut | all(. == 0)))' > /dev/null
+
+      if [ $? -eq 0 ]; then
+      ${forEach (selector: ''
+        hyprctl keyword workspace "${selector}, gapsout:${toString gaps_out}, gapsin:${toString gaps_in}"
+        hyprctl keyword windowrulev2 "bordersize ${toString border_size}, floating:0, onworkspace:${selector}"
+        hyprctl keyword windowrulev2 "rounding ${toString rounding}, floating:0, onworkspace:${selector}"
+      '')}
+      else
+      ${forEach (selector: ''
+        hyprctl keyword workspace "${selector}, gapsout:0, gapsin:0"
+        hyprctl keyword windowrulev2 "bordersize 0, floating:0, onworkspace:${selector}"
+        hyprctl keyword windowrulev2 "rounding 0, floating:0, onworkspace:${selector}"
+      '')}
+      fi
+    '';
+in {
+  # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
+  # "Smart gaps" / "No gaps when only"
+  wayland.windowManager.hyprland.settings = {
+    workspace = [
+      "w[t1], gapsout:0, gapsin:0"
+      "w[tg1], gapsout:0, gapsin:0"
+      "f[1], gapsout:0, gapsin:0"
+    ];
+
+    windowrulev2 = [
+      "bordersize 0, floating:0, onworkspace:w[t1]"
+      "rounding 0, floating:0, onworkspace:w[t1]"
+      "bordersize 0, floating:0, onworkspace:w[tg1]"
+      "rounding 0, floating:0, onworkspace:w[tg1]"
+      "bordersize 0, floating:0, onworkspace:f[1]"
+      "rounding 0, floating:0, onworkspace:f[1]"
+    ];
+
+    bind = [
+      "$mod, M, exec, ${toggleSmartGaps}"
+    ];
+  };
+}