fix(config): updates for latest nixvim

LGUG2Z · Aug 24, 2024 · cce9560 · cce9560
1 parent ec9b4b6
commit cce9560
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 35 deletions.
diff --git a/config/bufferline.nix b/config/bufferline.nix
@@ -1,14 +1,16 @@
 {pkgs, ...}: {
   plugins.bufferline = {
     enable = pkgs.lib.mkDefault true;
-    alwaysShowBufferline = pkgs.lib.mkDefault false;
-    offsets = [
-      {
-        filetype = "NvimTree";
-        text = "Explorer";
-        highlight = "PanelHeading";
-        padding = 1;
-      }
-    ];
+    settings.options = {
+      alwaysShowBufferline = pkgs.lib.mkDefault false;
+      offsets = [
+        {
+          filetype = "NvimTree";
+          text = "Explorer";
+          highlight = "PanelHeading";
+          padding = 1;
+        }
+      ];
+    };
   };
 }
diff --git a/config/cmp.nix b/config/cmp.nix
@@ -2,7 +2,7 @@
   plugins = {
     luasnip = {
       enable = pkgs.lib.mkDefault true;
-      extraConfig = {
+      settings = {
         enable_autosnippets = pkgs.lib.mkDefault true;
       };
     };

diff --git a/config/keymaps/whichkey.nix b/config/keymaps/whichkey.nix
@@ -1,23 +1,25 @@
 {pkgs, ...}: {
   plugins.which-key = {
     enable = pkgs.lib.mkDefault true;
-    layout = {align = "center";};
-    triggersNoWait = ["`" "'" "<leader>" "g`" "g'" "\"" "<c-r>" "z="];
-    window = {
-      border = "rounded";
-      position = "bottom";
-      winblend = 10;
-      margin = {
-        top = 1;
-        right = 1;
-        bottom = 2;
-        left = 1;
+    settings = {
+      notify = false;
+      layout = {align = "center";};
+      triggersNoWait = ["`" "'" "<leader>" "g`" "g'" "\"" "<c-r>" "z="];
+      icons.colors = false;
+      win = {
+        border = "rounded";
+        title = true;
+        zindex = 10;
+        padding = [
+          1
+          2
+        ];
+      };
+      registrations = {
+        "<leader>l" = "+LSP";
+        "<leader>z" = "+Zen";
+        "<leader>p" = "+Parameter swap";
       };
-    };
-    registrations = {
-      "<leader>l" = "+LSP";
-      "<leader>z" = "+Zen";
-      "<leader>p" = "+Parameter swap";
     };
   };
 }
diff --git a/config/lsp/lsp.nix b/config/lsp/lsp.nix
@@ -17,7 +17,7 @@
         installRustc = pkgs.lib.mkDefault false;
       };
       tailwindcss.enable = pkgs.lib.mkDefault true;
-      typst-lsp.enable = pkgs.lib.mkDefault true;
+      # typst-lsp.enable = pkgs.lib.mkDefault true; # broken
       cssls.enable = pkgs.lib.mkDefault true;
       html.enable = pkgs.lib.mkDefault true;
       htmx.enable = pkgs.lib.mkDefault true;

diff --git a/config/plugins/plugins.nix b/config/plugins/plugins.nix
@@ -10,14 +10,16 @@
     lastplace.enable = pkgs.lib.mkDefault true;
     todo-comments = {
       enable = pkgs.lib.mkDefault true;
-      mergeKeywords = pkgs.lib.mkDefault true;
-      highlight = {
-        before = "";
-        after = "fg";
-        keyword = "wide";
-      };
-      keywords = {
-        QUESTION = {icon = "";};
+      settings = {
+        mergeKeywords = pkgs.lib.mkDefault true;
+        highlight = {
+          before = "";
+          after = "fg";
+          keyword = "wide";
+        };
+        keywords = {
+          QUESTION = {icon = "";};
+        };
       };
     };
     comment.enable = pkgs.lib.mkDefault true;