From 59202f132e5c534e6536b614f4e93cbd2670a0b4 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Tue, 15 Oct 2024 03:47:58 +0200
Subject: [PATCH] From flake to nixvim plugin

---
 flake.lock                              | 17 -----
 flake.nix                               |  4 --
 home/programs/nvim/plugins/markdown.nix | 82 +++++++++++++------------
 3 files changed, 43 insertions(+), 60 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8edacd6..5c7d317 100644
--- a/flake.lock
+++ b/flake.lock
@@ -961,22 +961,6 @@
         "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
       }
     },
-    "plugin-markdown": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1728851430,
-        "narHash": "sha256-0OhVFwIJkpi4HucfyRZ4sJjxyR7vSHGy7+cuzsYW1LM=",
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "rev": "317df8708ce0238b142317a42ab55a66a2fa8650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -1012,7 +996,6 @@
         "nixpkgs": "nixpkgs_6",
         "nixvim": "nixvim",
         "nixy-wallpapers": "nixy-wallpapers",
-        "plugin-markdown": "plugin-markdown",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
diff --git a/flake.nix b/flake.nix
index 380e311..c12717a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,10 +26,6 @@
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    plugin-markdown = {
-      url = "github:MeanderingProgrammer/render-markdown.nvim";
-      flake = false;
-    };
     nixy-wallpapers = {
       url = "github:anotherhadi/nixy-wallpapers";
       flake = false;
diff --git a/home/programs/nvim/plugins/markdown.nix b/home/programs/nvim/plugins/markdown.nix
index 75dbedc..e4cb5e8 100644
--- a/home/programs/nvim/plugins/markdown.nix
+++ b/home/programs/nvim/plugins/markdown.nix
@@ -1,5 +1,5 @@
 # The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
-{ pkgs, config, inputs, ... }:
+{ config, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
   muted = "#${config.lib.stylix.colors.base03}";
@@ -85,13 +85,13 @@ in {
           modes = "n";
         };
         MkdnTableNextCell = {
-          key = "<Tab>";
-          modes = "i";
+          key = "<S-Tab>";
+          modes = "n";
         };
         MkdnTableNextRow = false;
         MkdnTablePrevCell = {
           key = "<S-Tab>";
-          modes = "i";
+          modes = "n";
         };
         MkdnTablePrevRow = false;
         MkdnToggleToDo = {
@@ -117,6 +117,7 @@ in {
       "ftplugin/markdown.lua".text = ''
         vim.opt.tabstop = 2
         vim.opt.shiftwidth = 2
+        vim.opt.expandtab = true 
       '';
     };
     highlight = {
@@ -130,40 +131,43 @@ in {
       RenderMarkdownTodo.fg = muted;
       RenderMarkdownWarning.fg = accent;
     };
-    extraPlugins = [
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "markdown.nvim";
-        src = inputs.plugin-markdown;
-      })
-    ];
-    extraConfigLua =
-      # lua
-      ''
-        require('render-markdown').setup({
-          heading = {
-            icons = { '# ', '󰲣 ', '󰲥 ', '󰲧 ', '󰲩 ', '󰲫 ' },
-            backgrounds = {
-                'RenderMarkdownBg',
-            },
-            foregrounds = {
-                'RenderMarkdownH1',
-                'RenderMarkdownH2',
-                'RenderMarkdownH3',
-                'RenderMarkdownH4',
-                'RenderMarkdownH5',
-                'RenderMarkdownH6',
-            },
-          },
-          checkbox = {
-            unchecked = { highlight = 'RenderMarkdownTodo' },
-            checked = { highlight = 'RenderMarkdownTodo' },
-            custom = {
-              pending = { raw = '[-]', rendered = '󰥔 ', highlight = 'RenderMarkdownTodo' },
-              important = { raw = '[!]', rendered = ' ', highlight = 'RenderMarkdownWarning' },
-              cancel = { raw = '[/]', rendered = '󱋬 ', highlight = 'RenderMarkdownTodo' },
-            },
-          },
-        })
-      '';
+    plugins.render-markdown = {
+      enable = true;
+      settings = {
+        heading = {
+          icons = [ "# " "󰲣 " "󰲥 " "󰲧 " "󰲩 " "󰲫 " ];
+          backgrounds = [ "RenderMarkdownBg" ];
+          foregrounds = [
+            "RenderMarkdownH1"
+            "RenderMarkdownH2"
+            "RenderMarkdownH3"
+            "RenderMarkdownH4"
+            "RenderMarkdownH5"
+            "RenderMarkdownH6"
+          ];
+        };
+        checkbox = {
+          unchecked = { highlight = "RenderMarkdownTodo"; };
+          checked = { highlight = "RenderMarkdownTodo"; };
+          custom = {
+            pending = {
+              raw = "[-]";
+              rendered = "󰥔 ";
+              highlight = "RenderMarkdownTodo";
+            };
+            important = {
+              raw = "[!]";
+              rendered = " ";
+              highlight = "RenderMarkdownWarning";
+            };
+            cancel = {
+              raw = "[/]";
+              rendered = "󱋬 ";
+              highlight = "RenderMarkdownTodo";
+            };
+          };
+        };
+      };
+    };
   };
 }