diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 21f73215..961508c0 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -50,33 +50,29 @@
       edgy = {
         enable = true;
         settings = {
+          animate.enabled = false;
+          wo = {
+            signcolumn = "no";
+            spell = false;
+            winbar = false;
+            winfixheight = false;
+            winfixwidth = false;
+            winhighlight = "";
+          };
           left = [
             { 
               title = "󰉓  Files";
               ft = "neo-tree";
-              filter = ''
-                function(buf)
-                  return vim.b[buf].neo_tree_source == "filesystem"
-                end
-              '';
-            }
-            { 
-              title = "󰈚 Buffers";
-              ft = "neo-tree"; 
-              filter = ''
-                function(buf)
-                  return vim.b[buf].neo_tree_source == "buffers"
-                end
-              '';
+              pinned = true;
+              filter = ''function(buf) return vim.b[buf].neo_tree_source == "filesystem" end'';
+              size = 0.7;
             }
             { 
               title = "󰊢 Git";
               ft = "neo-tree"; 
-              filter = ''
-                function(buf)
-                  return vim.b[buf].neo_tree_source == "git_status"
-                end
-              '';
+              filter = ''function(buf) return vim.b[buf].neo_tree_source == "git_status" end'';
+              size = 0.3;
+              pinned = true;
             }
 
           ];
@@ -89,7 +85,8 @@
       # git plugin for vim
       fugitive.enable = true;
   
-    # pretty stuff
+      # pretty stuff
+      numbertoggle.enable = true;
       # Fancify markdown et al 
       render-markdown.enable = true;
       # Rainbow matching {} [] () 's
@@ -118,7 +115,8 @@
         stages = "slide";
       };
 
-    # Nix related
+      # Nix related
+      mini.enable = true;
       # Nix language syntax highlighting / file type associations
       nix.enable = true;
       # Run nix develop / shell without exiting vim 
@@ -131,8 +129,9 @@
       nvim-autopairs.enable = true;
       # Indentation guides 
       indent-blankline.enable = true;
-      # Surround text blocks 
-      vim-surround.enable = true;
+      # Surround text blocks
+      sandwich.enable = true;
+      # vim-surround.enable = true;
       # Automatic indent
       intellitab.enable = true;
       # Better yank 
@@ -146,17 +145,18 @@
         enable = true;
         settings = {
           options = {
-            separatorStyle = "padded_slope";
+            # separatorStyle = "padded_slope";
             color_icons = true;
+            diagnostics = "nvim_lsp";
             always_show_bufferline = false;
-            show_buffer_close_icons = false;
+            show_buffer_close_icons = true;
             offsets = [
               {
                 # filetype = "NvimTree";
                 filetype = "neo-tree";
-                text = "Explorer";
-                # highlight = "Directory";
-                # highlight = "EcovimNvimTreeTitle";
+                text = " Explorer";
+                # highlight = "None";
+                highlight = "EcovimNvimTreeTitle";
                 text_align = "center";
                 separator = true;
               }
diff --git a/home-manager/common/software/cli/nixvim/keymaps.nix b/home-manager/common/software/cli/nixvim/keymaps.nix
index 0a77f8fc..87909aa0 100644
--- a/home-manager/common/software/cli/nixvim/keymaps.nix
+++ b/home-manager/common/software/cli/nixvim/keymaps.nix
@@ -11,8 +11,8 @@
     in [
       # Unmap keys that aren't useful, or that we want to use for different things
       (nvmap "<Space>" "<Nop>" // silent)
-      (nvmap "<Cr>" "<Nop>" // silent)
-      (nvmap "s" "<Nop>" // silent)
+      (nvmap "<Cr>" "<Nop>"    // silent)
+      (nvmap "s" "<Nop>"       // silent)
       # Redo
       (nmap "R" "<C-r>")
       # Copy and paste
@@ -30,7 +30,7 @@
       # Insert Mode
 
       # Normal Mode
-      # NVimTree
+      # NeoTree
       (nmap "<leader>nf" ":Neotree focus<CR>"      // desc "[F]ocus NeoTree")
       (nmap "<leader>nt" ":Neotree toggle<CR>"     // desc "[T]oggle NeoTree")
       (nmap "<leader>nc" ":Neotree close<CR>"      // desc "[C]lose NeoTree")
@@ -81,8 +81,8 @@
       (nmap "<leader>mu" ":MCunderCursor<CR>"   // desc "Select [U]nder Corsor")
       (nmap "<leader>mp" ":MCpattern<CR>"       // desc "Select [P]attern")
       # Ollama 
-      (nmap "<leader>os" ":OllamaServe<CR>"     // desc "Ollama [S]erve")
-      (nmap "<leader>op" ":Ollama<CR>"          // desc "Ollama [P]rompt")
-      (nmap "<leader>om" ":OllamaModel<CR>"     // desc "Ollama [M]odel")
+      # (nmap "<leader>os" ":OllamaServe<CR>"     // desc "Ollama [S]erve")
+      # (nmap "<leader>op" ":Ollama<CR>"          // desc "Ollama [P]rompt")
+      # (nmap "<leader>om" ":OllamaModel<CR>"     // desc "Ollama [M]odel")
     ];
 }