diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 9b6a3c59..ba744b98 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -4,6 +4,9 @@
   programs.nixvim = {
     plugins = {
       lsp-lines.enable = true;
+      lsp-lines.currentLine = true;
+      lspsaga.enable = true;
+      lspsaga.lightbulb.enable = false;
       crates-nvim.enable = true;
       lsp = {
         enable = true;
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 14fd22f9..5b2a013f 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -58,55 +58,68 @@
 
       # Normal Mode
       # NVimTree
-      (nmap "<leader>n" "<Nop>" // desc "[N]vimTree")
+      (nmap "<leader>n" "<Nop>"                 // desc "[N]vimTree")
       (nmap "<leader>nf" ":NvimTreeFocus<CR>"   // desc "[F]ocus NvimTree")
       (nmap "<leader>nt" ":NvimTreeToggle<CR>"  // desc "[T]oggle NvimTree")
       (nmap "<leader>ns" ":NvimTreeFindFile<CR>"// desc "[S]earch NvimTree")
       (nmap "<leader>nc" ":NvimTreeClose<CR>"   // desc "[C]lose NvimTree")
       (nmap "<leader>nr" ":NvimTreeRefresh<CR>" // desc "[R]efresh NvimTree")
+      (nmap "<leader>nT" ":NoiceTelescope<CR>"  // desc "Noice [T]elescope")
       # ToggleTerm
-      (nmap "<leader>Tt" ":ToggleTerm<CR>" // desc "[T]oggle Terminal")
-      (nmap "<leader>Ts" ":TermSelect<CR>" // desc "[S]elect a terminal")
+      (nmap "<leader>Tt" ":ToggleTerm<CR>"      // desc "[T]oggle Terminal")
+      (nmap "<leader>Ts" ":TermSelect<CR>"      // desc "[S]elect a terminal")
       # Fugitive
-      (nmap "<leader>gc" ":Git cam \""    // desc "[C]ommit" )
-      (nmap "<leader>gp" ":Git push<CR>"  // desc "Git [p]ush")
-      (nmap "<leader>gP" ":Git pull<CR>"  // desc "[P]ull")
-      (nmap "<leader>ga" ":Git add "      // desc "[A]dd file...")
-      (nmap "<leader>gb" ":Git blame<CR>" // desc "[B]lame")
-      (nmap "<leader>gd" ":Git diff<CR>"  // desc "[D]iff")
+      (nmap "<leader>gc" ":Git cam \""          // desc "[C]ommit" )
+      (nmap "<leader>gp" ":Git push<CR>"        // desc "Git [p]ush")
+      (nmap "<leader>gP" ":Git pull<CR>"        // desc "[P]ull")
+      (nmap "<leader>ga" ":Git add "            // desc "[A]dd file...")
+      (nmap "<leader>gb" ":Git blame<CR>"       // desc "[B]lame")
+      (nmap "<leader>gd" ":Git diff<CR>"        // desc "[D]iff")
       # Trouble 
-      (nmap "<leader>tf" ":Trouble<CR>"       // desc "[F]ocus")
-      (nmap "<leader>tt" ":TroubleToggle<CR>" // desc "[T]oggle")
-      (nmap "<leader>tc" ":TroubleClose<CR>"  // desc "[C]lose")
+      (nmap "<leader>tf" ":Trouble<CR>"         // desc "[F]ocus")
+      (nmap "<leader>tt" ":TroubleToggle<CR>"   // desc "[T]oggle")
+      (nmap "<leader>tc" ":TroubleClose<CR>"    // desc "[C]lose")
       # Navbuddy 
-      (nmap "<leader>N" ":Navbuddy<CR>"       // desc "[N]avbuddy")
+      (nmap "<leader>N" ":Navbuddy<CR>"         // desc "[N]avbuddy")
       # Window Management
-      (nmap "<leader>wh"  ":wincmd h<CR>"     // desc "Move left")
-      (nmap "<leader>wl"  ":wincmd l<CR>"     // desc "Move right")
-      (nmap "<leader>wj"  ":wincmd j<CR>"     // desc "Move down")
-      (nmap "<leader>wk"  ":wincmd k<CR>"     // desc "Move up")
-      (nmap "<leader>wn"  ":wincmd w<CR>"     // desc "Move to next")
-      (nmap "<leader>wN"  ":wincmd p<CR>"     // desc "Move to previous")
-      (nmap "<leader>wc"  ":wincmd c<CR>"     // desc "[C]lose active window")
-      (nmap "<leader>woh" ":wincmd n<CR>"     // desc "Open [H]orizontal window")
-      (nmap "<leader>wov" ":wincmd v<CR>"     // desc "Open [V]ertical window")
+      (nmap "<leader>wh"  ":wincmd h<CR>"       // desc "Move left")
+      (nmap "<leader>wl"  ":wincmd l<CR>"       // desc "Move right")
+      (nmap "<leader>wj"  ":wincmd j<CR>"       // desc "Move down")
+      (nmap "<leader>wk"  ":wincmd k<CR>"       // desc "Move up")
+      (nmap "<leader>wn"  ":wincmd w<CR>"       // desc "Move to next")
+      (nmap "<leader>wN"  ":wincmd p<CR>"       // desc "Move to previous")
+      (nmap "<leader>wc"  ":wincmd c<CR>"       // desc "[C]lose active window")
+      (nmap "<leader>woh" ":wincmd n<CR>"       // desc "Open [H]orizontal window")
+      (nmap "<leader>wov" ":wincmd v<CR>"       // desc "Open [V]ertical window")
       # resize window
-      (nmap "<leader>wrh" ":resize "          // desc "Resize Horizontal")
-      (nmap "<leader>wrv" ":vertical resize " // desc "Resize Vertical")
+      (nmap "<leader>wrh" ":resize "            // desc "Resize Horizontal")
+      (nmap "<leader>wrv" ":vertical resize "   // desc "Resize Vertical")
       # Buffer Management
-      (nmap "<leader>bn" ":bnext<CR>"         // desc "Next buffer")
-      (nmap "<leader>bN" ":bNext<CR>"         // desc "Previous buffer")
-      (nmap "<leader>bc" ":bdelete<CR>"       // desc "[c]lose buffer")
-      (nmap "<leader>bt" ":enew<CR>"          // desc "New [T]ab")
+      (nmap "<leader>bn" ":bnext<CR>"           // desc "Next buffer")
+      (nmap "<leader>bN" ":bNext<CR>"           // desc "Previous buffer")
+      (nmap "<leader>bc" ":bdelete<CR>"         // desc "[c]lose buffer")
+      (nmap "<leader>bt" ":enew<CR>"            // desc "New [T]ab")
       # Multicursors 
-      (nmap "<leader>ms" ":MCstart<CR>"       // desc "[S]tart Multicorsor")
-      (nmap "<leader>mv" ":MCvisual<CR>"      // desc "[V]isual Multicorsor")
-      (nmap "<leader>mc" ":MCclear<CR>"       // desc "[C]lear Multicorsor")
-      (nmap "<leader>mu" ":MCunderCursor<CR>" // desc "Select [U]nder Corsor")
-      (nmap "<leader>mp" ":MCpattern<CR>"     // desc "Select [P]attern")
+      (nmap "<leader>ms" ":MCstart<CR>"         // desc "[S]tart Multicorsor")
+      (nmap "<leader>mv" ":MCvisual<CR>"        // desc "[V]isual Multicorsor")
+      (nmap "<leader>mc" ":MCclear<CR>"         // desc "[C]lear Multicorsor")
+      (nmap "<leader>mu" ":MCunderCursor<CR>"   // desc "Select [U]nder Corsor")
+      (nmap "<leader>mp" ":MCpattern<CR>"       // desc "Select [P]attern")
     ];
 
     plugins = {
+      # Testing 
+      noice = {
+        enable = true;
+        popupmenu.enabled = true;
+      };
+      notify = {
+        enable = true;
+        topDown = true; 
+        fps = 60;
+        stages = "slide";
+      };
+
     # Git related
       # Gutter information for git modifications
       gitsigns.enable = true;
@@ -193,7 +206,7 @@
           "<leader>c" = "Colorscheme...";
           "<leader>g" = "Git Options...";
           "<leader>l" = "LSP Options...";
-          "<leader>n" = "NvimTree...";
+          "<leader>n" = "NvimTree / Noice...";
           "<leader>t" = "Trouble...";
           "<leader>T" = "ToggleTerm...";
           "<leader>w" = "Manage Windows...";