diff --git a/flake.lock b/flake.lock
index c3a914a..5d696af 100644
--- a/flake.lock
+++ b/flake.lock
@@ -317,11 +317,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1724710305,
-        "narHash": "sha256-qotbY/mgvykExLqRLAKN4yeufPfIjnMaK6hQQFhE2DE=",
+        "lastModified": 1724800090,
+        "narHash": "sha256-7KxGFZ40pidca5gcdI2weGanfB74yDxrErFNElOZWqA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "eac092c876e4c4861c6df0cff93e25b972b1842c",
+        "rev": "4814147442cd3f12f8160ecad9e36751f68cdc22",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index afaed28..80e3bf6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,9 @@
             allowUnfree = true;
           };
         };
+        extraSpecialArgs = {
+          inherit inputs;
+        };
         modules = [ ./yadunut-mbp/home.nix ];
       };
       "yadunut@yadunut-mba" = home-manager.lib.homeManagerConfiguration {
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 6330790..3380286 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -54,6 +54,7 @@
         settings = {
           sources = [
             { name = "nvim_lsp"; }
+            { name = "nvim_lua"; }
             { name = "emoji"; }
             { name = "emoji"; }
             { name = "buffer"; option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; keywordLength = 3; }
@@ -77,6 +78,7 @@
         };
       };
       cmp-nvim-lsp.enable = true;
+      cmp-nvim-lua.enable = true;
       cmp-buffer.enable = true;
       cmp-path.enable = true;
       cmp_luasnip.enable = true;
@@ -100,8 +102,11 @@
           indent.enable = true;
         };
       };
-      which-key.enable = true;
+      treesitter-context.enable = true;
+      treesitter-textobjects.enable = true;
       ts-autotag.enable = true;
+
+      which-key.enable = true;
       telescope = {
         enable = true;
         extensions.fzf-native.enable = true;
@@ -114,11 +119,19 @@
           };
         };
       };
+
+
+      project-nvim = {
+        enable = true;
+        enableTelescope = true;
+      };
+
     };
     opts = {
       number = true;
       relativenumber = true;
       signcolumn = "yes";
+      updatetime = 250;
       undofile = true;
       ignorecase = true;
       smartcase = true;
@@ -131,6 +144,7 @@
       expandtab = true;
       smarttab = true;
       scrolloff = 5;
+      termguicolors = true;
     };
     globals = {
       mapleader = " ";
@@ -138,15 +152,18 @@
     };
     keymaps = [
       { action = ":"; key = ";"; mode = [ "n" ]; }
-      { action = "<cmd>Telescope find_files<CR>"; key = "<leader><leader>"; options.desc = "Find Files"; }
-      { action = "<cmd>Telescope live_grep<CR>"; key = "<leader>fg"; options.desc = "Grep";}
-      { action = "<cmd>Telescope buffers<CR>"; key = "<leader>fb"; options.desc = "Find Buffers";}
-      { action = "<cmd>NvimTreeToggle<CR>"; key = "<leader>tt"; options.desc = "Tree View";}
       { action = "gj"; key = "j"; mode = [ "n" ]; }
       { action = "gk"; key = "k"; mode = [ "n" ]; }
       { action = "<Esc>"; key = "jk"; mode = [ "i" ]; }
+
+      { action = "<cmd>Telescope find_files<CR>"; key = "<leader><leader>"; options.desc = "Find Files"; }
+      { action = "<cmd>Telescope live_grep<CR>"; key = "<leader>fg"; options.desc = "Grep";}
+      { action = "<cmd>Telescope buffers<CR>"; key = "<leader>fb"; options.desc = "Find Buffers";}
+      { action = "<cmd>Telescope projects<CR>"; key = "<leader>pp"; options.desc = "Switch Projects";}
+
       { action = "<cmd>Trouble diagnostics toggle<CR>"; key = "<leader>tr"; }
       { action = "<cmd>Neogit<CR>"; key = "<leader>gg"; options.desc = "Open Git"; }
+      { action = "<cmd>NvimTreeToggle<CR>"; key = "<leader>tt"; options.desc = "Tree View";}
     ];
   };
 }
diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix
index 11a500e..d4a5ba8 100644
--- a/yadunut-mbp/home.nix
+++ b/yadunut-mbp/home.nix
@@ -5,6 +5,7 @@
     (import ../modules/zsh.nix)
     (import ../modules/git.nix)
     (import ../modules/neovim.nix)
+    (import ../modules/wezterm)
   ];
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -38,6 +39,7 @@
     pkgs.pyright
     pkgs.yt-dlp
     pkgs.rsync
+    pkgs.k9s
     # Neovim deps
     # pkgs.texlab
     # pkgs.efm-langserver
@@ -70,6 +72,7 @@
 
   home.sessionVariables = {
     EDITOR = "nvim";
+    VISUAL = "nvim";
   };
 
   programs.zsh.shellAliases = {