From 5f8c78ba12a78458233d5d10c050c5bac0f9bf9c Mon Sep 17 00:00:00 2001 From: nicholai Date: Sat, 13 Dec 2025 14:45:53 -0700 Subject: [PATCH 1/4] disabled catpuccin, switched to kanagawa --- lua/plugins/plugin.lua | 52 ++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/lua/plugins/plugin.lua b/lua/plugins/plugin.lua index b59777b..cf63eeb 100644 --- a/lua/plugins/plugin.lua +++ b/lua/plugins/plugin.lua @@ -1,22 +1,46 @@ return { -- Color scheme { - "catppuccin/nvim", - name = "catppuccin", + "rebelot/kanagawa.nvim", + name = "kanagawa", priority = 1000, config = function() - vim.cmd.colorscheme "catppuccin-mocha" + require('kanagawa').setup({ + compile = true, -- enable compiling the colorscheme + undercurl = true, -- enable undercurls + commentStyle = { italic = true }, + functionStyle = {}, + keywordStyle = { italic = true }, + statementStyle = { bold = true }, + typeStyle = {}, + transparent = false, -- do not set background color + dimInactive = false, -- dim inactive window `:h hl-NormalNC` + terminalColors = true, -- define vim.g.terminal_color_{0,17} + colors = { -- add/modify theme and palette colors + palette = {}, + theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, + }, + overrides = function(colors) -- add/modify highlights + return {} + end, + theme = "wave", -- Load "wave" theme + background = { -- map the value of 'background' option to a theme + dark = "wave", -- try "dragon" ! + light = "lotus" + }, + }) + vim.cmd("colorscheme kanagawa") end, }, -- File explorer - { - "nvim-tree/nvim-tree.lua", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("nvim-tree").setup() - end, - }, + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("nvim-tree").setup() + end, + }, -- Fuzzy finder { @@ -161,13 +185,13 @@ return { }) wk.add({ - { "e", desc = "Toggle file explorer" }, - { "f", group = "Find" }, + { "e", desc = "Toggle file explorer" }, + { "f", group = "Find" }, { "ff", desc = "Find files" }, { "fg", desc = "Live grep" }, { "fb", desc = "Find buffers" }, - { "w", desc = "Save" }, - { "q", desc = "Quit" }, + { "w", desc = "Save" }, + { "q", desc = "Quit" }, }) end, }, From 0c218da55a74916071b017bd61af85b5b4663b42 Mon Sep 17 00:00:00 2001 From: nicholai Date: Sat, 13 Dec 2025 14:49:51 -0700 Subject: [PATCH 2/4] forgot this bit --- lua/plugins/plugin.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/plugins/plugin.lua b/lua/plugins/plugin.lua index cf63eeb..68251b0 100644 --- a/lua/plugins/plugin.lua +++ b/lua/plugins/plugin.lua @@ -6,7 +6,7 @@ return { priority = 1000, config = function() require('kanagawa').setup({ - compile = true, -- enable compiling the colorscheme + compile = true, -- enable compiling the colorscheme undercurl = true, -- enable undercurls commentStyle = { italic = true }, functionStyle = {}, @@ -34,13 +34,13 @@ return { }, -- File explorer - { - "nvim-tree/nvim-tree.lua", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("nvim-tree").setup() - end, - }, + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("nvim-tree").setup() + end, + }, -- Fuzzy finder { @@ -169,7 +169,7 @@ return { dependencies = { "nvim-tree/nvim-web-devicons" }, config = function() require("lualine").setup({ - options = { theme = "catppuccin" }, + options = { theme = "kanagawa" }, }) end, }, From 50119051093a27455457429dc25a8d8cf65dcb2e Mon Sep 17 00:00:00 2001 From: Nicholai Date: Sat, 17 Jan 2026 22:22:20 -0700 Subject: [PATCH 3/4] fuck --- .bashrc | 10 ++++++++++ lazy-lock.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index a869206..e5db98e 100644 --- a/.bashrc +++ b/.bashrc @@ -651,4 +651,14 @@ export LESS_TERMCAP_so=$'\e[01;33m' export LESS_TERMCAP_ue=$'\e[0m' export LESS_TERMCAP_us=$'\e[1;4;31m' +alias ff='fastfetch' +alias nuke='sudo bash /home/nicholai/Documents/obsidian-vault/02_Areas/Nuke-monitoring/scripts/nuke_isolated.sh' +alias note='cd /mnt/work/dev/personal-projects/nicholai-work-2026 && pnpm notepad' +alias comfy='cd /home/nicholai/ComfyUI && source .venv/bin/activate && python main.py' +alias scripts='nvim .nuke/' +# opencode +export PATH=/home/nicholai/.opencode/bin:$PATH + +# OpenRouter API Key for oh-my-opencode +export OPENROUTER_API_KEY="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" diff --git a/lazy-lock.json b/lazy-lock.json index 20eb548..16a5f4a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,13 +1,13 @@ { "LuaSnip": { "branch": "master", "commit": "ccf25a5452b8697a823de3e5ecda63ed3d723b79" }, "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" }, - "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" }, From 6e8006d935bdc63b52de9f515bb6a41109a3ee53 Mon Sep 17 00:00:00 2001 From: Nicholai Date: Sat, 17 Jan 2026 22:38:01 -0700 Subject: [PATCH 4/4] add git source control integration with gitsigns and diffview Adds gitsigns.nvim for inline git signs and hunk operations, diffview.nvim for side-by-side diffs, and Telescope git pickers under the g namespace. Co-Authored-By: Claude Opus 4.5 --- lazy-lock.json | 2 ++ lua/core/keymaps.lua | 6 ++++++ lua/plugins/plugin.lua | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 16a5f4a..9b8e931 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,7 +6,9 @@ "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, "kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index 4a189ee..92a1a18 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -9,6 +9,12 @@ keymap('n', 'ff', 'Telescope find_files', { desc = "Find files" keymap('n', 'fg', 'Telescope live_grep', { desc = "Live grep" }) keymap('n', 'fb', 'Telescope buffers', { desc = "Find buffers" }) +-- Git (Telescope pickers) +keymap('n', 'gt', 'Telescope git_status', { desc = "Git status" }) +keymap('n', 'gc', 'Telescope git_commits', { desc = "Git commits" }) +keymap('n', 'gf', 'Telescope git_bcommits', { desc = "File commits" }) +keymap('n', 'gw', 'Telescope git_branches', { desc = "Git branches" }) + -- Better window navigation keymap('n', '', 'h') keymap('n', '', 'j') diff --git a/lua/plugins/plugin.lua b/lua/plugins/plugin.lua index 68251b0..4c2eb8f 100644 --- a/lua/plugins/plugin.lua +++ b/lua/plugins/plugin.lua @@ -42,6 +42,47 @@ return { end, }, + -- Git signs + { + "lewis6991/gitsigns.nvim", + event = { "BufReadPre", "BufNewFile" }, + config = function() + require("gitsigns").setup({ + on_attach = function(bufnr) + local gs = package.loaded.gitsigns + local map = function(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + -- Navigation + map("n", "]c", function() gs.next_hunk() end, { desc = "Next hunk" }) + map("n", "[c", function() gs.prev_hunk() end, { desc = "Previous hunk" }) + -- Actions + map("n", "gs", gs.stage_hunk, { desc = "Stage hunk" }) + map("n", "gr", gs.reset_hunk, { desc = "Reset hunk" }) + map("n", "gS", gs.stage_buffer, { desc = "Stage buffer" }) + map("n", "gu", gs.undo_stage_hunk, { desc = "Undo stage" }) + map("n", "gp", gs.preview_hunk, { desc = "Preview hunk" }) + map("n", "gb", function() gs.blame_line({ full = true }) end, { desc = "Blame line" }) + map("n", "gd", gs.diffthis, { desc = "Diff this" }) + end, + }) + end, + }, + + -- Diff view + { + "sindrets/diffview.nvim", + cmd = { "DiffviewOpen", "DiffviewFileHistory" }, + keys = { + { "gv", "DiffviewOpen", desc = "Diff view" }, + { "gh", "DiffviewFileHistory %", desc = "File history" }, + { "gx", "DiffviewClose", desc = "Close diff" }, + }, + config = true, + }, + -- Fuzzy finder { "nvim-telescope/telescope.nvim", @@ -190,6 +231,7 @@ return { { "ff", desc = "Find files" }, { "fg", desc = "Live grep" }, { "fb", desc = "Find buffers" }, + { "g", group = "Git" }, { "w", desc = "Save" }, { "q", desc = "Quit" }, })