diff --git a/modules/nix/nvim/cmp.nix b/modules/nix/nvim/cmp.nix
index 618951e..72d9927 100644
--- a/modules/nix/nvim/cmp.nix
+++ b/modules/nix/nvim/cmp.nix
@@ -22,22 +22,20 @@ in
 
                 settings = {
                     mapping = {
-                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
-                    "<C-Space>" = "cmp.mapping.complete()";
-                    "<C-e>" = "cmp.mapping.close()";
-                    #"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select}), {'i', 's'})";
-                    #"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select}), {'i', 's'})";
-                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; 
-                    "<CR>" = "cmp.mapping.confirm({ select = false, behavior = cmp.ConfirmBehavior.Replace })";
-                };
+                        "<C-b>" = "cmp.mapping.scroll_docs(-4)";
+                        "<C-f>" = "cmp.mapping.scroll_docs(4)";
+                        "<C-Space>" = "cmp.mapping.complete()";
+                        "<C-e>" = "cmp.mapping.abort()";
+                        "<C-Left>" = "cmp.mapping.abort()";
+                        "<CR>" = "cmp.mapping.confirm({ select = false })";
 
-                preselect = "cmp.PreselectMode.None";
+                    };
 
-                snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
+                    preselect = "cmp.PreselectMode.None";
 
-                sources = [
+                    snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
+
+                    sources = [
                     {
                         name = "nvim_lsp";
                         priority = 1000;
diff --git a/modules/nix/nvim/nonels.nix b/modules/nix/nvim/nonels.nix
index 32506be..85f1f14 100644
--- a/modules/nix/nvim/nonels.nix
+++ b/modules/nix/nvim/nonels.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-    plugins.none-ls = {
+    programs.nixvim.plugins.none-ls = {
         enable = true;
         enableLspFormat = true;
         settings = {
diff --git a/modules/nix/nvim/opts.nix b/modules/nix/nvim/opts.nix
index d27d401..8dcf4db 100644
--- a/modules/nix/nvim/opts.nix
+++ b/modules/nix/nvim/opts.nix
@@ -34,8 +34,7 @@
             ]]
 
             local _border = "rounded"
-
-                vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+            vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
                   vim.lsp.handlers.hover, {
                     border = _border
                   }