nvim config, mostly

common/hm-modules/nvim/default.nix

@@ -44,6 +44,11 @@ with lib;
 
           shiftwidth = 2;
           smartindent = true;
+
+          title = true;
+
+          spell = true;
+          spelllang = "en_gb";
         };
 
         clipboard.providers.wl-copy.enable = true;
@@ -61,22 +66,34 @@ with lib;
 
         plugins = {
           nvim-surround.enable = true;
-          dap.enable = true;
-          image = {
+
+          vimwiki = {
             enable = true;
-            backend = "kitty";
+            settings = {
+              list = [
+                {
+                  ext = ".md";
+                  path = "~/cloud/Notes/";
+                  syntax = "markdown";
+                }
+              ];
+            };
+          };
+
+          image = {
+            enable = false;
+            settings.backend = "kitty";
           };
           web-devicons.enable = true;
           bufferline.enable = true;
           nix.enable = true;
           luasnip.enable = true;
-          typst-vim.enable = true;
           startup = {
             enable = true;
             theme = "my_theme";
           };
           obsidian = {
-            enable = true;
+            enable = false;
             settings = {
               new_notes_location = "notes_subdir";
               notes_subdir = "Unsorted";
@@ -94,35 +111,18 @@ with lib;
                 nvim_cmp = true;
               };
               picker.name = "telescope.nvim";
-              # note_id_func = ''
-              #   function(title)
-              #       -- Create note IDs in a Zettelkasten format with a timestamp and a suffix.
-              #       -- In this case a note with the title 'My new note' will be given an ID that looks
-              #       -- like '1657296016-my-new-note', and therefore the file name '1657296016-my-new-note.md'
-              #       local suffix = ""
-              #       if title ~= nil then
-              #         -- If title is given, transform it into valid file name.
-              #         suffix = title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower()
-              #       else
-              #         -- If title is nil, just add 4 random uppercase letters to the suffix.
-              #         for _ = 1, 4 do
-              #           suffix = suffix .. string.char(math.random(65, 90))
-              #         end
-              #       end
-              #       return tostring(os.time()) .. "-" .. suffix
-              #     end
-              # '';
             };
           };
           fidget = {
             enable = true;
-            progress = {
-              ignoreDoneAlready = true;
-              ignore = [ "ltex" ];
-              display.doneTtl = 5;
-            };
-            notification = {
-              overrideVimNotify = true;
+            settings = {
+              progress = {
+                ignore = [ "ltex" ];
+                display.done_ttl = 5;
+              };
+              notification = {
+                override_vim_notify = true;
+              };
             };
           };
           neotest = {
@@ -156,6 +156,10 @@ with lib;
             settings.options.theme = "catppuccin";
           };
 
+          oil = {
+            enable = true;
+          };
+
           telescope = {
             enable = true;
             settings.defaults.preview.ls_short = true;
@@ -169,9 +173,11 @@ with lib;
             extensions.fzf-native.enable = true;
             extensions.fzf-native.settings.fuzzy = true;
             extensions.frecency.enable = true;
+            extensions.ui-select.enable = true;
           };
           comment.enable = true;
-          vimtex.enable = true;
+          vimtex.enable = false;
+          typst-preview.enable = true;
           floaterm.enable = true;
           cmp = {
             enable = true;

common/hm-modules/nvim/keybinds.nix

@@ -38,11 +38,11 @@
       key = "<leader>fr";
       action = ":Telescope frecency<CR>";
     }
-    {
-      mode = "n";
-      key = "<leader>ob";
-      action = mkRaw "require('obsidian_picker').obsidian_picker";
-    }
+      # {
+      # mode = "n";
+      #key = "<leader>ob";
+      # action = mkRaw "require('obsidian_picker').obsidian_picker";
+      #}
     # Commenting
     {
       mode = "n";
@@ -140,7 +140,18 @@
     {
       mode = "n";
       key = "<M-CR>";
-      action = ":Lspsaga code_action<CR>";
+      action = mkRaw "vim.lsp.buf.code_action";
+    }
+    {
+      mode = "n";
+      key = "<leader>e";
+      action = mkRaw "vim.diagnostic.open_float";
+    }
+    # oil
+    {
+      mode = "n";
+      key = "-";
+      action = "<CMD>Oil<CR>";
     }
   ];
 }

common/hm-modules/nvim/lsp.nix

@@ -3,7 +3,6 @@
   plugins = {
     rustaceanvim = {
       enable = true;
-      rustAnalyzerPackage = pkgs.rust-analyzer;
 
       settings = {
         auto_attach = true;
@@ -70,6 +69,7 @@
         clangd.enable = true;
         yamlls.enable = true;
         lua_ls.enable = true;
+        tinymist.enable = true;
       };
     };