From f113baa3e73c73d8e60e3dd8550d53745115714a Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sat, 11 May 2024 22:55:23 +0100
Subject: [PATCH] Make the exwm modeline minibuffer aware

---
 flake.lock                                    | 24 +++++++--------
 flake.nix                                     |  2 +-
 .../noether/lisp/fg42/modeline/views.el       | 29 +++++++++++++++++++
 nix/modules/noether/lisp/fg42/noether.el      |  3 +-
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index f9c4100..a56a356 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,11 +85,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1707650010,
-        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
+        "lastModified": 1715106579,
+        "narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
+        "rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89",
         "type": "github"
       },
       "original": {
@@ -219,16 +219,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1714648678,
-        "narHash": "sha256-CxLSUYRk2quey0skgxa+v8mVE+pGSSPcxtK0uFq6YkQ=",
-        "ref": "refs/tags/v0.1.11",
-        "rev": "b4e667a73a0de7d83f78910d6fa3acc3b3044675",
-        "revCount": 53,
+        "lastModified": 1715464233,
+        "narHash": "sha256-VPhsO6yVPq1h0pI+tBnH+/JCDWUZVaFrPy782dOmu2c=",
+        "ref": "refs/tags/v0.3.0",
+        "rev": "5c40c1a5783b0904fb106bd6cc70671e7b1e7320",
+        "revCount": 57,
         "type": "git",
         "url": "https://devheroes.codes/lxsameer/noether"
       },
       "original": {
-        "ref": "refs/tags/v0.1.11",
+        "ref": "refs/tags/v0.3.0",
         "type": "git",
         "url": "https://devheroes.codes/lxsameer/noether"
       }
diff --git a/flake.nix b/flake.nix
index 86434e1..fa296ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e";
   inputs.noether = {
-    url = "git+https://devheroes.codes/lxsameer/noether?ref=refs/tags/v0.1.11";
+    url = "git+https://devheroes.codes/lxsameer/noether?ref=refs/tags/v0.3.0";
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
diff --git a/nix/modules/noether/lisp/fg42/modeline/views.el b/nix/modules/noether/lisp/fg42/modeline/views.el
index d9d8344..d469dd8 100644
--- a/nix/modules/noether/lisp/fg42/modeline/views.el
+++ b/nix/modules/noether/lisp/fg42/modeline/views.el
@@ -48,6 +48,7 @@
   :binding (kbd "C-c 0")
   :buffer "*modeline*"
   :visible? t
+  :separator " "
   :timeout 0
   :on-parent-resize #'fg42/adjust-modeline
   :frame
@@ -115,6 +116,34 @@ Appears on the center of the current window."
    (date-unit :label (format "%s " (nerd-icons-codicon "nf-cod-calendar")))
    (time-unit :label (format " %s " (nerd-icons-mdicon "nf-md-clock_time_three")))))
 
+(noether-defview fg42/exwm-modeline
+  "A super simple bar containing the line number and column number that
+Appears on the center of the current window."
+  :managed? t
+  :buffer "*exwm-status*"
+  :binding (kbd "C-c 0")
+  :separator " "
+  :visible? t
+  :sticky t
+  :hide-when-minibuffer? t
+  :timeout 0
+  :on-parent-resize #'fg42/adjust-modeline
+  :frame
+  (list
+   :poshandler #'fg42/--bottom-right-padded
+   :border-width 0
+   :font (format "%s %s" (config-get font-name) (config-get font-size))
+   :border-color "#bd93f9")
+
+  :units
+  (list
+   (buffer-name-unit
+    :label (format "%s " (nerd-icons-codicon "nf-cod-layers"))
+    :len 30)
+   (fg42/exwm-input-mode-unit :label (format "%s " (nerd-icons-faicon "nf-fa-linux")))
+   (date-unit :label (format "%s " (nerd-icons-codicon "nf-cod-calendar")))
+   (time-unit :label (format " %s " (nerd-icons-mdicon "nf-md-clock_time_three")))))
+
 
 (provide 'fg42/modeline/views)
 ;;; views.el ends here
diff --git a/nix/modules/noether/lisp/fg42/noether.el b/nix/modules/noether/lisp/fg42/noether.el
index 2533d73..839c7c9 100644
--- a/nix/modules/noether/lisp/fg42/noether.el
+++ b/nix/modules/noether/lisp/fg42/noether.el
@@ -82,7 +82,8 @@ to Emacs modeline."
 
   (when-wm
    ;; TODO: Fix `fg42/minimal-exwm' to pop up on every workspace
-   (setq-default noether-views nil)))
+   (setq-default noether-views (list fg42/exwm-modeline))))
+
 
 (provide 'fg42/noether)
 ;;; noether.el ends here