From e9bd585c605b376633a309c9c59bc5f3096934b9 Mon Sep 17 00:00:00 2001 From: pmcc Date: Tue, 5 Aug 2025 06:35:33 -0400 Subject: [PATCH 1/5] Switch to zsh --- .bashrc => .zshrc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename .bashrc => .zshrc (92%) diff --git a/.bashrc b/.zshrc similarity index 92% rename from .bashrc rename to .zshrc index 0099360..912ca3d 100644 --- a/.bashrc +++ b/.zshrc @@ -1,5 +1,5 @@ # -# ~/.bashrc +# ~/.zshrc # # If not running interactively, don't do anything @@ -8,9 +8,8 @@ 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)" alias reboot-to-windows='sudo grub-reboot "Windows Boot Manager (on /dev/nvme1n1p1)" && sudo reboot' export PATH=~/.npm-global/bin:~/.local/bin:$PATH From dd4b99d5d28245ddfe06b52521f9426f1984ad12 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Charavel Date: Tue, 5 Aug 2025 07:36:12 -0400 Subject: [PATCH 2/5] zsh keybinds --- .zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.zshrc b/.zshrc index 912ca3d..65e3707 100644 --- a/.zshrc +++ b/.zshrc @@ -5,6 +5,9 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return +bindkey "^A" beginning-of-line +bindkey "^E" end-of-line + alias ls='ls --color=auto' alias grep='grep --color=auto' alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' From 4bc18cd77b302299916a009289c07f0acef6938f Mon Sep 17 00:00:00 2001 From: pmcc Date: Tue, 5 Aug 2025 06:35:33 -0400 Subject: [PATCH 3/5] 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 f404788868375facf8cd994bc038b529336afa30 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Charavel Date: Tue, 5 Aug 2025 07:44:05 -0400 Subject: [PATCH 4/5] More zsh keybinds --- .zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zshrc b/.zshrc index 65e3707..ab9036b 100644 --- a/.zshrc +++ b/.zshrc @@ -7,6 +7,8 @@ bindkey "^A" beginning-of-line bindkey "^E" end-of-line +bindkey "^[[1;5C" forward-word +bindkey "^[[1;5D" backward-word alias ls='ls --color=auto' alias grep='grep --color=auto' From 46ec7c60ee6d37b5bde5d9ea35f353218b89a015 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Charavel Date: Tue, 5 Aug 2025 16:19:18 -0400 Subject: [PATCH 5/5] Update neovim configs --- .config/nvim/init.lua | 51 ++----------------------- .config/nvim/lua/plugins.lua | 2 + .config/nvim/lua/plugins/catppuccin.lua | 17 +++++++++ .config/nvim/lua/plugins/diffview.lua | 3 ++ .config/nvim/lua/plugins/lspconfig.lua | 7 ++++ .config/nvim/lua/plugins/neo-tree.lua | 12 ++++++ .config/nvim/lua/plugins/telescope.lua | 10 +++++ .config/nvim/lua/plugins/treesitter.lua | 12 ++++++ .config/nvim/lua/vim-options.lua | 10 +++++ 9 files changed, 77 insertions(+), 47 deletions(-) create mode 100644 .config/nvim/lua/plugins.lua create mode 100644 .config/nvim/lua/plugins/catppuccin.lua create mode 100644 .config/nvim/lua/plugins/diffview.lua create mode 100644 .config/nvim/lua/plugins/lspconfig.lua create mode 100644 .config/nvim/lua/plugins/neo-tree.lua create mode 100644 .config/nvim/lua/plugins/telescope.lua create mode 100644 .config/nvim/lua/plugins/treesitter.lua create mode 100644 .config/nvim/lua/vim-options.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index f04daef..7ee2c11 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -15,54 +15,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -vim.g.mapleader= " " -vim.o.termguicolors = true -vim.o.number = true -vim.o.relativenumber = true -vim.o.signcolumn = "yes" -vim.o.expandtab = true -vim.o.tabstop = 2 -vim.o.softtabstop = 2 -vim.o.shiftwidth = 2 -vim.o.termguicolors = true - --- Setup lazy.nvim -require("lazy").setup({ - spec = { - { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - { "nvim-telescope/telescope.nvim", tag = "0.1.8", dependencies = { "nvim-lua/plenary.nvim" } }, - { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, - { "neovim/nvim-lspconfig" }, - { "sindrets/diffview.nvim" }, - }, - -- Configure any other settings here. See the documentation for more details. - -- colorscheme that will be used when installing plugins. +local opts = { install = { colorscheme = { "catppuccin" } }, -- automatically check for plugin updates checker = { enabled = true }, -}) +} -require("catppuccin").setup({ - auto_integrations = true, - flavour = "mocha", - background = { - light = "mocha", - dark = "mocha", - }, -}) - -vim.cmd("colorscheme catppuccin-mocha") - -local builtin = require("telescope.builtin") -vim.keymap.set("n", "", builtin.find_files, {}) -vim.keymap.set("n", "fg", builtin.live_grep, {}) - -local config = require("nvim-treesitter.configs") -config.setup({ - ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"}, - highlight = { enable = true }, - indent = { enable = true }, -}) - -vim.lsp.enable("zls") -vim.lsp.enable("clangd") +-- Setup lazy.nvim +require("lazy").setup("plugins", opts) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua new file mode 100644 index 0000000..97aeadd --- /dev/null +++ b/.config/nvim/lua/plugins.lua @@ -0,0 +1,2 @@ +return { +} diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..7359449 --- /dev/null +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -0,0 +1,17 @@ +return { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + config = function() + local config = require("catppuccin") + config.setup({ + auto_integrations = true, + flavour = "mocha", + background = { + light = "mocha", + dark = "mocha", + }, + }) + vim.cmd.colorscheme "catppuccin-mocha" + end +} diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua new file mode 100644 index 0000000..aab3fd3 --- /dev/null +++ b/.config/nvim/lua/plugins/diffview.lua @@ -0,0 +1,3 @@ +return { + "sindrets/diffview.nvim" +} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..7d7fd6f --- /dev/null +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,7 @@ +return { + "neovim/nvim-lspconfig", + config = function() + vim.lsp.enable("zls") + vim.lsp.enable("clangd") + end +} diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..ef6ff41 --- /dev/null +++ b/.config/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,12 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set('n', '', ':Neotree filesystem reveal float') + end +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..fbd46c9 --- /dev/null +++ b/.config/nvim/lua/plugins/telescope.lua @@ -0,0 +1,10 @@ +return { + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + vim.keymap.set("n", "", builtin.find_files, {}) + vim.keymap.set("n", "fg", builtin.live_grep, {}) + end +} diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..e2060cc --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,12 @@ +return { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local config = require("nvim-treesitter.configs") + config.setup({ + ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"}, + highlight = { enable = true }, + indent = { enable = true }, + }) + end +} diff --git a/.config/nvim/lua/vim-options.lua b/.config/nvim/lua/vim-options.lua new file mode 100644 index 0000000..c450aa5 --- /dev/null +++ b/.config/nvim/lua/vim-options.lua @@ -0,0 +1,10 @@ +vim.g.mapleader= " " +vim.o.termguicolors = true +vim.o.number = true +vim.o.relativenumber = true +vim.o.signcolumn = "yes" +vim.o.expandtab = true +vim.o.tabstop = 2 +vim.o.softtabstop = 2 +vim.o.shiftwidth = 2 +vim.o.termguicolors = true