lots of stuff

home-manager/modules/nvf/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   pkgs,
+  lib,
   ...
 }:
 {
@@ -22,7 +23,37 @@
         # pkgs.vimPlugins.vim-kitty-navigator
         vimPlugins.grug-far-nvim
         vimPlugins.image-nvim
+        oasis-nvim
+        vimPlugins.vim-hoogle
+        vimPlugins.telescope_hoogle
+        vimPlugins.zk-nvim
       ];
+      luaConfigRC.colorscheme = ''
+        vim.cmd.colorscheme("oasis-day")
+      '';
+      luaConfigRC.zk_nvim = ''
+        local ok, zk = pcall(require, "zk")
+        if not ok then
+          return
+        end
+
+        zk.setup({
+          -- use "telescope", "fzf", etc. if you prefer
+          picker = "select",
+
+          lsp = {
+            config = {
+              name = "zk",
+              cmd = { "zk", "lsp" },
+              filetypes = { "markdown" },
+              -- you can put on_attach = function(client, bufnr) ... end here if you want
+            },
+            auto_attach = {
+              enabled = true,
+            },
+          },
+        })
+      '';
     };
   };
 }

home-manager/modules/nvf/keymaps.nix

@@ -31,6 +31,13 @@
         action = "<cmd>bnext<cr>";
         desc = "Next Buffer";
       }
+      {
+        key = "<leader>bd";
+        mode = "n";
+        silent = true;
+        action = "<cmd>bd<cr>";
+        desc = "Close current buffer";
+      }
 
       # Disable Arrow Keys in Normal Mode
       # {

home-manager/modules/nvf/languages.nix

@@ -108,6 +108,8 @@
       ocaml.enable = true;
       haskell.enable = true;
       haskell.lsp.enable = true;
+      haskell.treesitter.enable = true;
+      haskell.dap.enable = false;
       html.enable = true;
       bash.enable = true;
       nix.enable = true;

home-manager/modules/nvf/mini.nix

@@ -9,5 +9,6 @@
     pairs.enable = true;
     diff.enable = true;
     git.enable = true;
+    # snippets.enable = true;
   };
 }

home-manager/modules/nvf/utils.nix

@@ -6,12 +6,13 @@
 {
   programs.nvf.settings.vim = {
     undoFile.enable = true;
-    theme = lib.mkForce {
-      enable = true;
-      name = "catppuccin";
-      style = "latte";
-      transparent = false;
-    };
+    # theme = lib.mkForce {
+    #   enable = true;
+    #   name = "catppuccin";
+    #   style = "latte";
+    #   transparent = false;
+    # };
+
     navigation = {
       harpoon.enable = true;
     };
@@ -30,10 +31,6 @@
     #   cmp.enable = true;
     # };
     statusline.lualine.enable = true;
-    # autocomplete.blink-cmp = {
-    #   enable = true;
-    #   friendly-snippets.enable = true;
-    # };
     autocomplete = {
       nvim-cmp = {
         enable = true;
@@ -48,6 +45,55 @@
       };
     };
     snippets.luasnip.enable = true;
+    snippets.luasnip.customSnippets.snipmate = {
+      all = [
+        {
+          trigger = "if";
+          body = "if $1 else $2";
+        }
+      ];
+      nix = [
+        {
+          trigger = "mkOption";
+          body = ''
+            mkOption {
+              type = $1;
+              default = $2;
+              description = $3;
+              example = $4;
+            }
+          '';
+        }
+      ];
+      haskell = [
+        {
+          trigger = "zzis";
+          body = ''
+            insert :: (Ord a) => a -> [a] -> [a]
+            insert x [] = [x]
+            insert x (y:ys)
+                | x <= y    = x : y : ys
+                | otherwise = y : insert x ys
+
+            insertionSort :: (Ord a) => [a] -> [a]
+            insertionSort [] = []
+            insertionSort (x:xs) = insert x (insertionSort xs)
+          '';
+        }
+        {
+          trigger = "zzso";
+          body = ''
+            sortOn :: Ord b => (a -> b) -> [a] -> [a]
+            sortOn f = foldr insert []
+              where
+                insert x [] = [x]
+                insert x (y:ys)
+                  | f x <= f y = x : y : ys
+                  | otherwise  = y : insert x ys
+          '';
+        }
+      ];
+    };
     ui = {
       noice.enable = true;
       colorizer.enable = true;