From 8df869f3046e1a732c62f8ef1fc71a6ba4e2e33f Mon Sep 17 00:00:00 2001
From: solidsnakedev <jona.ca.eng@gmail.com>
Date: Mon, 9 Dec 2024 08:44:41 -0700
Subject: [PATCH] feat: update according to latest nixvim

---
 home-manager/mac/home.nix |  5 +++++
 modules/nixvim.nix        | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/home-manager/mac/home.nix b/home-manager/mac/home.nix
index 7942af5..fb1029a 100644
--- a/home-manager/mac/home.nix
+++ b/home-manager/mac/home.nix
@@ -58,6 +58,11 @@
 
   };
 
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   programs.fish = {
     enable = true;
 
diff --git a/modules/nixvim.nix b/modules/nixvim.nix
index 9418f4c..eb3c154 100644
--- a/modules/nixvim.nix
+++ b/modules/nixvim.nix
@@ -6,6 +6,7 @@
     vimAlias = true;
     colorschemes.catppuccin.enable = true;
     plugins = {
+      web-devicons.enable = true;
       # ui
       lualine.enable = true;
       tmux-navigator.enable = true;
@@ -22,7 +23,7 @@
       hop.enable = true;
       nvim-tree.enable = true;
       todo-comments.enable = true;
-      surround.enable = true;
+      vim-surround.enable = true;
       lastplace.enable = true;
       bufdelete.enable = true;
 
@@ -30,21 +31,28 @@
       # rust-tools.enable = true;
       typescript-tools = {
         enable = true;
-        settings.exposeAsCodeAction = "all";
+        settings.settings.exposeAsCodeAction = "all";
       };
       lsp = {
         enable = true;
         servers = {
-          nil-ls = {
+          nil_ls = {
             enable = true; # Enable nil_ls. You can use nixd or anything you want from the docs.
             settings.formatting.command = [ "nixpkgs-fmt" ];
           };
-          lua-ls = {
+          lua_ls = {
             enable = true;
             settings.diagnostics.globals = [ "vim" ];
           };
-          rust-analyzer.enable = true;
-          hls.enable = true;
+          rust_analyzer = {
+            enable = true;
+            installCargo = false;
+            installRustc = false;
+          };
+          hls = {
+            enable = true;
+            installGhc = false;
+          };
         };
       };
       lspsaga = {