diff --git a/home-manager/features/development/lua.nix b/home-manager/features/development/lua.nix
index cbe2a46..9bc37b3 100644
--- a/home-manager/features/development/lua.nix
+++ b/home-manager/features/development/lua.nix
@@ -2,5 +2,6 @@
 {
   home.packages = with pkgs; [
     stylua # Formatter
+    lua-language-server # LSP
   ];
 }
diff --git a/home-manager/features/neovim/config/lua/config/keymaps.lua b/home-manager/features/neovim/config/lua/config/keymaps.lua
index 99fb402..2c134f7 100644
--- a/home-manager/features/neovim/config/lua/config/keymaps.lua
+++ b/home-manager/features/neovim/config/lua/config/keymaps.lua
@@ -1,8 +1,3 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
-
-let telescope = require('telescope')
-
-vim.api.nvim_set_keymap("n", "<leader><space><space>", telescope.builtin.oldfiles, { desc = "Telescope: Recent Files"}
-
diff --git a/home-manager/features/neovim/config/lua/plugins/disabled.lua b/home-manager/features/neovim/config/lua/plugins/disabled.lua
new file mode 100644
index 0000000..1ae82b1
--- /dev/null
+++ b/home-manager/features/neovim/config/lua/plugins/disabled.lua
@@ -0,0 +1,4 @@
+return {
+    -- Maeson installs it's own binaries that are incompatible with NixOS.
+    { "williamboman/mason.nvim", enabled = false },
+}
diff --git a/home-manager/features/neovim/config/lua/plugins/telescope.lua b/home-manager/features/neovim/config/lua/plugins/telescope.lua
new file mode 100644
index 0000000..ca30ca9
--- /dev/null
+++ b/home-manager/features/neovim/config/lua/plugins/telescope.lua
@@ -0,0 +1,13 @@
+return {
+  "nvim-telescope/telescope.nvim",
+  keys = {
+    -- Switch the default keybind to switch buffers instead of find files
+    {
+      "<leader><space>",
+      "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>",
+      desc = "Open Files",
+    },
+    -- Disable the <leader><comma> since it's so hard to type and redundant with the above.
+    { "<leader><comma>", false },
+  },
+}
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index 73b86bd..de938cd 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -1,5 +1,5 @@
 # Set up the user's prompt as ZSH with Starship
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   programs.zsh = {
     enable = true;
@@ -61,5 +61,3 @@
     };
   };
 }
-
-