From c8c81e20ae6d6e2a4cb0b73c1e868216079583c9 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Thu, 27 Jun 2024 09:20:44 +0000
Subject: [PATCH] update

---
 docs/TODO.md                                 |  8 ++------
 home/programs/nvim/default.nix               |  4 +++-
 home/programs/nvim/{plugins => }/keymaps.nix |  9 +++++++++
 home/programs/nvim/plugins/alpha.nix         | 15 +++++++++++++++
 home/programs/nvim/plugins/flash.nix         |  1 +
 home/programs/nvim/plugins/lsp.nix           |  1 +
 home/programs/nvim/plugins/zen-mode.nix      |  1 +
 home/system/waybar/default.nix               |  9 ++++++++-
 8 files changed, 40 insertions(+), 8 deletions(-)
 rename home/programs/nvim/{plugins => }/keymaps.nix (79%)
 create mode 100644 home/programs/nvim/plugins/flash.nix
 create mode 100644 home/programs/nvim/plugins/zen-mode.nix

diff --git a/docs/TODO.md b/docs/TODO.md
index cd65e5d..574fba4 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -9,6 +9,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
     - [ ] Upload new wallpapers
     - [ ] macOS theme
   - [ ] Tofi (Wofi, but terminal based)
+  - [ ] Add Vim Keybindings to KEYBINDINGS.md
 
 - [ ] Qutebrowser
   - [ ] Bitwarden integration (I need this.)
@@ -25,15 +26,10 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
   - [ ] Fix screenshots
 
 - [ ] Nixvim
-  - [ ] Telescope: find with file content
   - [ ] Markdown snippets
-  - [ ] Whichkey: Description for keybindings
-  - [ ] Flash.nvim
-  - [ ] Alpha: Open keybindings.md
-  - [ ] Zen.nvim
   - [ ] Markdown fold
   - [ ] Markdown better table (maybe lsp?)
-  - [ ] Autosave with a shell command?
+  - [ ] Autosave when zen-mode is open
 
 - [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
   - [ ] Exclude file pattern (nodes modules, ...)
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 9a92b69..05cad16 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -17,7 +17,6 @@
     ./plugins/copilot.nix
     ./plugins/whichkey.nix
     ./plugins/alpha.nix
-    ./plugins/keymaps.nix
     ./plugins/comment.nix
     ./plugins/oil.nix
     ./plugins/trouble.nix
@@ -26,7 +25,10 @@
     ./plugins/obsidian.nix
     ./plugins/image.nix
     ./plugins/ltex.nix
+    ./plugins/flash.nix
+    ./plugins/zen-mode.nix
     ./options.nix
     ./colorscheme.nix
+    ./keymaps.nix
   ];
 }
diff --git a/home/programs/nvim/plugins/keymaps.nix b/home/programs/nvim/keymaps.nix
similarity index 79%
rename from home/programs/nvim/plugins/keymaps.nix
rename to home/programs/nvim/keymaps.nix
index 952a70b..dca6fb7 100644
--- a/home/programs/nvim/plugins/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -3,45 +3,54 @@
     {
       key = "<leader>e";
       action = "<CMD>Neotree toggle<CR>";
+      options.desc = "Neotree Toggle";
     }
     {
       key = "<space>fm";
       action = "<CMD>lua vim.lsp.buf.format()<CR>";
+      options.desc = "LSP Format";
     }
 
     {
       key = "<leader>ot";
       action = "<cmd>lua require('obsidian').util.toggle_checkbox()<cr>";
+      options.desc = "Toggle Checkbox";
     }
 
     {
       key = "<leader>oo";
       action = "<cmd>ObsidianQuickSwitch<cr>";
+      options.desc = "Quick Switch";
     }
 
     {
       key = "<leader>on";
       action = "<cmd>ObsidianNew<cr>";
+      options.desc = "New";
     }
 
     {
       key = "<leader>of";
       action = "<cmd>ObsidianSearch<cr>";
+      options.desc = "Search";
     }
 
     {
       key = "<leader>oi";
       action = "<cmd>ObsidianPasteImg<cr>";
+      options.desc = "Paste Image";
     }
 
     {
       key = "<leader>E";
       action = "<cmd>Oil<cr>";
+      options.desc = "Oil";
     }
 
     {
       key = "<leader>t";
       action = "<cmd>TroubleToggle<cr>";
+      options.desc = "Trouble";
     }
 
     {
diff --git a/home/programs/nvim/plugins/alpha.nix b/home/programs/nvim/plugins/alpha.nix
index 19d8563..7e4d42d 100644
--- a/home/programs/nvim/plugins/alpha.nix
+++ b/home/programs/nvim/plugins/alpha.nix
@@ -82,6 +82,21 @@
               hl = "AlphaTextColor";
             };
           }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
           {
             type = "button";
             val = "  Recently used";
diff --git a/home/programs/nvim/plugins/flash.nix b/home/programs/nvim/plugins/flash.nix
new file mode 100644
index 0000000..e24f287
--- /dev/null
+++ b/home/programs/nvim/plugins/flash.nix
@@ -0,0 +1 @@
+{ programs.nixvim.plugins.flash = { enable = true; }; }
diff --git a/home/programs/nvim/plugins/lsp.nix b/home/programs/nvim/plugins/lsp.nix
index 12c48b4..7529e42 100644
--- a/home/programs/nvim/plugins/lsp.nix
+++ b/home/programs/nvim/plugins/lsp.nix
@@ -11,6 +11,7 @@
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
+        marksman.enable = true;
         ltex = {
           enable = true;
           settings = {
diff --git a/home/programs/nvim/plugins/zen-mode.nix b/home/programs/nvim/plugins/zen-mode.nix
new file mode 100644
index 0000000..dccac56
--- /dev/null
+++ b/home/programs/nvim/plugins/zen-mode.nix
@@ -0,0 +1 @@
+{ programs.nixvim.plugins.zen-mode = { enable = true; }; }
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index dc10fe1..c14beff 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -124,7 +124,14 @@
           tooltip = false;
           on-click = "powermenu";
         };
-
+        # "custom/caffeine": {
+        #  "format": "{}",
+        #  "max-length": 5,
+        #  "interval": 10,
+        #  "exec": "caffeine-status-icon",
+        #  "exec-if": "pgrep spotify",
+        #  "return-type": ""
+        #}
         backlight = {
           device = "nvidia_0";
           format = "{icon}";