5 files changed, 23 insertions, 13 deletions
diff --git a/lua/plugins/auto-session.lua b/lua/plugins/auto-session.lua
index 974d32d..d10604d 100644
--- a/lua/plugins/auto-session.lua
+++ b/lua/plugins/auto-session.lua
@@ -39,11 +39,10 @@ return {
   config = function(_, opts)
     local ass = require('auto-session')
     ass.setup(opts)
-    local sl = require('auto-session.session-lens')
 
     vim.keymap.set('n', '<leader>asr', ass.RestoreSession, { desc = '[a]uto [s]ession: [r]estore' })
     vim.keymap.set('n', '<leader>ass', ass.SaveSession, { desc = '[a]uto [s]ession: [s]ave' })
     vim.keymap.set('n', '<leader>asd', ass.DeleteSession, { desc = '[a]uto [s]ession: [d]elete' })
-    vim.keymap.set('n', '<leader>asl', sl.search_session, { desc = '[a]uto [s]ession: [l]list' })
+    vim.keymap.set('n', '<leader>asl', '<CMD>Telescope session-lens<CR>', { desc = '[a]uto [s]ession: [l]list' })
   end
 }
diff --git a/lua/plugins/context.lua b/lua/plugins/context.lua
index b968f5a..dd64e16 100644
--- a/lua/plugins/context.lua
+++ b/lua/plugins/context.lua
@@ -20,7 +20,6 @@ return {
   config = function(_, opts)
     require('treesitter-context').setup(opts)
 
-    -- TODO: change keybind?
-    vim.keymap.set('n', '<leader>cx', '<CMD>TSContextToggle<CR>', { desc = '[C]onte[x]t Toggle' })
+    vim.keymap.set('n', '<leader>cx', '<CMD>TSContext toggle<CR>', { desc = '[C]onte[x]t Toggle' })
   end,
 }
diff --git a/lua/plugins/leap.lua b/lua/plugins/leap.lua
index b1ef5e6..a03d524 100644
--- a/lua/plugins/leap.lua
+++ b/lua/plugins/leap.lua
@@ -1,6 +1,7 @@
 return {
   'ggandor/leap.nvim',
   config = function()
-    require('leap').create_default_mappings()
+    vim.keymap.set({ 'n', 'x', 'o' }, 's', '<Plug>(leap)')
+    vim.keymap.set('n', 'S', '<Plug>(leap-from-window)')
   end,
 }
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index ec41a3f..23ab2b2 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -36,7 +36,7 @@ local servers = {
       allFeatures = true,
     },
   },
-  ruff_lsp = {
+  ruff = {
     init_options = {
       settings = {
         -- Any extra CLI arguments for `ruff` go here.
@@ -79,7 +79,7 @@ return {
         'gopls',
         'rust-analyzer',
         'mypy',
-        'ruff-lsp',
+        'ruff',
         'pyright',
         'lua-language-server',
         'shfmt',
@@ -112,7 +112,7 @@ return {
       { 'folke/neodev.nvim', opts = {} },
     },
     config = function()
-      local lspconfig = require('lspconfig')
+      local lspconfig = vim.lsp.config
 
       -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
       local capabilities = vim.lsp.protocol.make_client_capabilities()
@@ -120,7 +120,7 @@ return {
 
       -- TODO: change keybinds to the autocmd suggested by the lspconfig github
       local on_attach = function(client, bufnr)
-        if client.name == 'ruff_lsp' then
+        if client.name == 'ruff' then
           -- Disable hover in favor of Pyright
           client.server_capabilities.hoverProvider = false
         end
@@ -178,7 +178,7 @@ return {
 
       -- generic server setup
       local function setup_server(server_name)
-        lspconfig[server_name].setup({
+        lspconfig(server_name, {
           capabilities = capabilities,
           on_attach = on_attach,
           settings = servers[server_name],
@@ -186,7 +186,7 @@ return {
       end
 
       -- setup_server('clangd')
-      lspconfig['clangd'].setup({
+      lspconfig('clangd', {
         capabilities = capabilities,
         on_attach = function(client, bufnr)
           -- Really only required if NvChad is used:
@@ -208,12 +208,12 @@ return {
       setup_server('gopls')
       setup_server('rust_analyzer')
       setup_server('pyright')
-      setup_server('ruff_lsp')
+      setup_server('ruff')
       setup_server('lua_ls')
       setup_server('bashls')
       -- assumes localhost is mirrored (networkingMode=mirrored in .wslconfig)
       -- setup_server('gdscript')
-      lspconfig['gdscript'].setup({
+      lspconfig('gdscript', {
         capabilities = capabilities,
         on_attach = on_attach,
         settings = servers['gdscript'],
diff --git a/lua/plugins/theme.lua b/lua/plugins/theme.lua
index 1085034..9abeb93 100644
--- a/lua/plugins/theme.lua
+++ b/lua/plugins/theme.lua
@@ -11,6 +11,7 @@ return {
         borders = true,
         errors = { mode = 'bg' },
         search = { theme = 'vim' },
+
         styles = {
           -- Style to be applied to different syntax groups
           -- Value is any valid attr-list value for `:help nvim_set_hl`
@@ -18,12 +19,22 @@ return {
           keywords = {},
           functions = {},
           variables = {},
+          errors = {},
+
           -- To customize lualine/bufferline
           bufferline = {
             current = {},
             modified = { italic = true },
           },
         },
+
+        -- Definitions from the old nord theme I was using:
+        -- https://github.com/shaunsingh/nord.nvim/blob/master/lua/nord/theme.lua
+        on_highlights = function(hl, c)
+          -- Treesitter: https://github.com/gbprod/nord.nvim/blob/main/lua/nord/treesitter.lua
+          -- old theme was in yellow, changed the default to purple to match better the newer theme
+          hl["@constant"] = { fg = c.aurora.purple }
+        end,
       })
 
       vim.cmd.colorscheme('nord')