diff --git a/home-manager/common/desktops/hyprland/components/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix
index 4ba6e084..e0e33df5 100644
--- a/home-manager/common/desktops/hyprland/components/hyprland.nix
+++ b/home-manager/common/desktops/hyprland/components/hyprland.nix
@@ -36,6 +36,7 @@
       input = {
           kb_layout = "us";
           follow_mouse = "1";
+          mouse_refocus = false;
           touchpad = {
               natural_scroll = true;
               disable_while_typing = true;
diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 228ede11..a35c2c22 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -11,8 +11,6 @@
         }
       )
 
-      vim.diagnostic.config { float = { border = _border } }
-
       require('lspconfig.ui.windows').default_options = { border = _border }
       local signs = { Error = "󰅚 ", Warn = "󰀪 ", Hint = "󰌶 ", Info = " " }
       for type, icon in pairs(signs) do
@@ -29,11 +27,12 @@
 
       vim.diagnostic.config ( { virtual_text = { prefix = '●', } } )
       vim.diagnostic.config { float = { border = _border } }
+      vim.diagnostic.config({ virtual_text = false })
     '';
 
     plugins = {
       lsp-lines.enable = true;
-      lsp-lines.currentLine = false;
+      lsp-lines.currentLine = true;
       crates-nvim.enable = true;
       lspsaga = {
         enable = false;
@@ -82,6 +81,7 @@
             }
           )
         '';
+
         keymaps = {
           silent = true;
           diagnostic = {
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 30b4bcc6..1926d003 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -51,8 +51,8 @@
         popupmenu.enabled = false;
         lsp.hover.enabled = false;
         presets = { 
-          bottom_search = false; 
-          command_palette = false; 
+          bottom_search = true; 
+          command_palette = true; 
           long_message_to_split = false; 
           inc_rename = false; 
           lsp_doc_border = true; 
diff --git a/home-manager/common/software/cli/nixvim/cmp.nix b/home-manager/common/software/cli/nixvim/cmp.nix
index 99377661..a73c2592 100644
--- a/home-manager/common/software/cli/nixvim/cmp.nix
+++ b/home-manager/common/software/cli/nixvim/cmp.nix
@@ -18,7 +18,7 @@
         "<C-d>" = "cmp.mapping.scroll_docs(-4)";
         "<C-e>" = "cmp.mapping.close()";
         "<C-f>" = "cmp.mapping.scroll_docs(4)";
-        "<CR>" = "cmp.mapping.confirm({ select = true })";
+        "<CR>"  = "cmp.mapping.confirm({ select = true })";
         "<S-Tab>" = {
           action = "cmp.mapping.select_prev_item()";
           modes = [
@@ -35,9 +35,9 @@
         };
       };
       sources = [
-#          { name = "nvim_lua"; }
+        { name = "nvim_lua"; }
         { name = "nvim_lsp"; }
-#          { name = "nvim_lsp_signature_help"; }
+        { name = "nvim_lsp_signature_help"; }
         { name = "calc"; }
         { name = "path"; }
         { name = "buffer"; }
@@ -54,10 +54,10 @@
           format = ''
             function(entry, item)
               local menu_icon = {
-                  nvim_lsp = 'λ',
-                  luasnip = '⋗',
-                  buffer = 'Ω',
-                  path = '🖫',
+                nvim_lsp = 'λ',
+                luasnip = '⋗',
+                buffer = 'Ω',
+                path = '🖫',
               }
               item.menu = menu_icon[entry.source.name]
               return item