diff --git a/config/plugins/leap.nix b/config/plugins/leap.nix
index e51b816..ec154cf 100644
--- a/config/plugins/leap.nix
+++ b/config/plugins/leap.nix
@@ -1,3 +1,4 @@
+{ helpers, ...}:
 {
   plugins.leap = {
     enable = true;
@@ -11,8 +12,7 @@
         "o"
       ];
       key = "<leader>ss";
-      action = "function() require('leap').leap {} end";
-      lua = true;
+      action = helpers.mkRaw "function() require('leap').leap {} end";
       # action = "require('leap').leap";
     }
     {
diff --git a/config/plugins/lsp/lsp.nix b/config/plugins/lsp/lsp.nix
index 0821e5b..0e6a101 100644
--- a/config/plugins/lsp/lsp.nix
+++ b/config/plugins/lsp/lsp.nix
@@ -80,7 +80,7 @@
             };
           };
         };
-        nil_ls = {
+        nil-ls = {
           enable = true;
         };
         tsserver = {
diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix
index bd94574..8f03050 100644
--- a/config/plugins/telescope.nix
+++ b/config/plugins/telescope.nix
@@ -17,22 +17,22 @@
       # };
       undo = {
         enable = true;
-        mappings = {
+        settings.mappings = {
           i = {
-            "<cr>" = "yank_additions";
-            "<s-cr>" = "yank_deletions";
-            "<c-cr>" = "restore";
+            "<cr>" = "require('telescope-undo.actions').yank_additions";
+            "<s-cr>" = "require('telescope-undo.actions').yank_deletions";
+            "<c-cr>" = "require('telescope-undo.actions').restore";
           };
           n = {
-            "y" = "yank_additions";
-            "Y" = "yank_deletions";
-            "u" = "restore";
+            "y" = "require('telescope-undo.actions').yank_additions";
+            "Y" = "require('telescope-undo.actions').yank_deletions";
+            "u" = "require('telescope-undo.actions').restore";
           };
         };
       };
     };
     # If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
-    defaults = {
+    settings.defaults = {
       mappings = {
         i = {
           "<esc>" = {
@@ -47,95 +47,95 @@
     keymaps = {
       "<leader><space>" = {
         action = "find_files, {}";
-        desc = "Find project files";
+        options.desc = "Find project files";
       };
       "<leader>/" = {
         action = "live_grep";
-        desc = "Grep (root dir)";
+        options.desc = "Grep (root dir)";
       };
       "<leader>:" = {
         action = "command_history, {}";
-        desc = "Command History";
+        options.desc = "Command History";
       };
       "<leader>b" = {
         action = "buffers, {}";
-        desc = "+buffer";
+        options.desc = "+buffer";
       };
       "<leader>ff" = {
         action = "find_files, {}";
-        desc = "Find project files";
+        options.desc = "Find project files";
       };
       "<leader>fr" = {
         action = "oldfiles, {}";
-        desc = "Recent";
+        options.desc = "Recent";
       };
       "<leader>fb" = {
         action = "buffers, {}";
-        desc = "Buffers";
+        options.desc = "Buffers";
       };
       "<C-p>" = {
         action = "git_files, {}";
-        desc = "Search git files";
+        options.desc = "Search git files";
       };
       "<leader>gc" = {
         action = "git_commits, {}";
-        desc = "Commits";
+        options.desc = "Commits";
       };
       "<leader>gs" = {
         action = "git_status, {}";
-        desc = "Status";
+        options.desc = "Status";
       };
       "<leader>sa" = {
         action = "autocommands, {}";
-        desc = "Auto Commands";
+        options.desc = "Auto Commands";
       };
       "<leader>sb" = {
         action = "current_buffer_fuzzy_find, {}";
-        desc = "Buffer";
+        options.desc = "Buffer";
       };
       "<leader>sc" = {
         action = "command_history, {}";
-        desc = "Command History";
+        options.desc = "Command History";
       };
       "<leader>sC" = {
         action = "commands, {}";
-        desc = "Commands";
+        options.desc = "Commands";
       };
       "<leader>sD" = {
         action = "diagnostics, {}";
-        desc = "Workspace diagnostics";
+        options.desc = "Workspace diagnostics";
       };
       "<leader>sh" = {
         action = "help_tags, {}";
-        desc = "Help pages";
+        options.desc = "Help pages";
       };
       "<leader>sH" = {
         action = "highlights, {}";
-        desc = "Search Highlight Groups";
+        options.desc = "Search Highlight Groups";
       };
       "<leader>sk" = {
         action = "keymaps, {}";
-        desc = "Keymaps";
+        options.desc = "Keymaps";
       };
       "<leader>sM" = {
         action = "man_pages, {}";
-        desc = "Man pages";
+        options.desc = "Man pages";
       };
       "<leader>sm" = {
         action = "marks, {}";
-        desc = "Jump to Mark";
+        options.desc = "Jump to Mark";
       };
       "<leader>so" = {
         action = "vim_options, {}";
-        desc = "Options";
+        options.desc = "Options";
       };
       "<leader>sR" = {
         action = "resume, {}";
-        desc = "Resume";
+        options.desc = "Resume";
       };
       "<leader>uC" = {
         action = "colorscheme, {}";
-        desc = "Colorscheme preview";
+        options.desc = "Colorscheme preview";
       };
     };
   };
diff --git a/config/sets.nix b/config/sets.nix
index c39bf94..8f0b443 100644
--- a/config/sets.nix
+++ b/config/sets.nix
@@ -4,7 +4,7 @@
       mapleader = " ";
       maplocalleader = " ";
     };
-    options = {
+    opts = {
       relativenumber = true;
       splitbelow = true;
       redrawtime = 5000;