From 23af131b11394e1e77393381fff4a31489389628 Mon Sep 17 00:00:00 2001 From: pmcc Date: Tue, 5 Aug 2025 06:35:33 -0400 Subject: [PATCH 1/2] Switch to zsh --- .bashrc => .zshrc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename .bashrc => .zshrc (74%) diff --git a/.bashrc b/.zshrc similarity index 74% rename from .bashrc rename to .zshrc index c8a3958..854d05b 100644 --- a/.bashrc +++ b/.zshrc @@ -1,5 +1,5 @@ # -# ~/.bashrc +# ~/.zshrc # # If not running interactively, don't do anything @@ -8,11 +8,10 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' -PS1='[\u@\h \W]\$ ' -eval "$(starship init bash)" +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" \ No newline at end of file From e1991fa1d8526e4a72ccea604fe5da6497a7e7ce Mon Sep 17 00:00:00 2001 From: pmcc Date: Tue, 5 Aug 2025 21:01:07 -0400 Subject: [PATCH 2/2] neovim LSP --- .config/nvim/init.lua | 2 +- .config/nvim/lua/plugins/catppuccin.lua | 2 +- .config/nvim/lua/plugins/lspconfig.lua | 33 +++++++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7ee2c11..fa2e53b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -21,5 +21,5 @@ local opts = { checker = { enabled = true }, } --- Setup lazy.nvim +require("vim-options") require("lazy").setup("plugins", opts) diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua index 7359449..df7244b 100644 --- a/.config/nvim/lua/plugins/catppuccin.lua +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -12,6 +12,6 @@ return { dark = "mocha", }, }) - vim.cmd.colorscheme "catppuccin-mocha" + vim.cmd.colorscheme "catppuccin-mocha" end } diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 7d7fd6f..0e20712 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -1,7 +1,30 @@ return { - "neovim/nvim-lspconfig", - config = function() - vim.lsp.enable("zls") - vim.lsp.enable("clangd") - end + { + "neovim/nvim-lspconfig", + lazy = false, + config = function() + local lspconfig = require("lspconfig") + lspconfig.lua_ls.setup({}) + + vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) + vim.keymap.set("n", "gr", vim.lsp.buf.references, {}) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {}) + vim.keymap.set('n', '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, + }, + } }