From bc66ec89c6bda2e7c31b5a64f5079cf8ac075099 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 31 Mar 2026 23:46:23 -0500
Subject: [PATCH] neovim updates

---
 modules/programs/neovim.nix | 61 ++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 9a7c79f..9b3e4a8 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -7,10 +7,11 @@
   };
 
   perSystem = { system, pkgs, ... }: {
-    packages.my-neovim = (inputs.nvf.lib.neovimConfiguration {
+    packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
       inherit pkgs;
       modules = [
         {
+          # https://nvf.notashelf.dev/search.html
           config.vim = {
             options = {
               number = true;
@@ -19,6 +20,9 @@
               shiftwidth = 4;
               tabstop = 4;
               softtabstop = 4;
+
+              wrap = true;
+              linebreak = true;
             };
 
             syntaxHighlighting = true;
@@ -28,10 +32,27 @@
             theme.name = "catppuccin";
             theme.style = "mocha";
 
+            git = {
+              enable = true;
+            };
+
+            filetree.neo-tree = {
+              enable = true;
+            };
+
             lazy = {
               enable = true;
             };
 
+            # globals = {
+            #   SimpylFold_docstring_preview = 1;
+            #   SimpylFold_fold_blank = 0;
+            # };
+
+            # extraPlugins = with pkgs.vimPlugins; {
+            #   SimpylFold.package = SimpylFold;
+            # };
+
             telescope = {
               enable = true;
               extensions  = [
@@ -46,7 +67,7 @@
             # Enable Treesitter
             treesitter = {
               enable = true;
-              # grammars = [ "python" ];
+              grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ python ];
             };
 
             lsp.enable = true;
@@ -54,6 +75,24 @@
             languages = {
               enableTreesitter = true;
               enableFormat = true;
+
+              markdown = {
+                enable = true;
+                extensions = {
+                  # render-markdown-nvim.enable = true;
+                  markview-nvim.enable = true;
+                };
+              };
+
+              bash.enable = true;
+              css.enable = true;
+              yaml.enable = true;
+              toml.enable = true;
+
+              nix = {
+                enable = true;
+              };
+
               python = {
                 enable = true;
                 dap.enable = true;
@@ -63,16 +102,24 @@
 
             keymaps = [
               {
-                key = "<leader>m";
+                key = "<leader>fd";
+                mode = "n";
+                silent = false;
+                action = ":Telescope find_files";
+              }
+              {
+                key = "<C-b>";
                 mode = "n";
                 silent = true;
-                action = ":make<CR>";
+                action = ":Neotree";
               }
             ];
           };
         }
       ];
-    })
-    .neovim;
+    }).neovim).overrideAttrs (old: {
+      pname = "my-neovim";
+      version = "custom";
+    });
   };
-}
\ No newline at end of file
+}