Merge branch 'zephyrus'

.config/nvim/init.lua

@@ -21,5 +21,5 @@ local opts = {
   checker = { enabled = true },
 }
 
--- Setup lazy.nvim
+require("vim-options")
 require("lazy").setup("plugins", opts)

.config/nvim/lua/plugins/catppuccin.lua

@@ -12,6 +12,6 @@ return {
         dark = "mocha",
       },
     })
-    vim.cmd.colorscheme "catppuccin-mocha"    
+    vim.cmd.colorscheme "catppuccin-mocha"
   end
 }

.config/nvim/lua/plugins/lspconfig.lua

@@ -1,7 +1,30 @@
 return {
-  "neovim/nvim-lspconfig",
+  {
-  config = function()
+    "neovim/nvim-lspconfig",
-    vim.lsp.enable("zls")
+    lazy = false,
-    vim.lsp.enable("clangd")
+    config = function()
-  end
+      local lspconfig = require("lspconfig")
+      lspconfig.lua_ls.setup({})
+
+      vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
+      vim.keymap.set("n", "<leader>gd", vim.lsp.buf.definition, {})
+      vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references, {})
+      vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, {})
+      vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, {})
+    end,
+  },
+  {
+    "williamboman/mason.nvim",
+    lazy = false,
+    config = function()
+      require("mason").setup()
+    end
+  },
+  {
+    "williamboman/mason-lspconfig.nvim",
+    lazy = false,
+    opts = {
+      auto_install = true,
+    },
+  }
 }

.zshrc

@@ -19,4 +19,4 @@ eval "$(starship init zsh)"
 export PATH=~/.npm-global/bin:~/.local/bin:$PATH
 export SSH_AUTH_SOCK=/home/pmcc/.bitwarden-ssh-agent.sock
 
-alias claude="/home/pmcc/.claude/local/claude"
+alias claude="/home/pmcc/.claude/local/claude"