.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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"

lazy-lock.json

@@ -1,13 +1,15 @@
 {
   "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" },
+  "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" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" },

lua/core/keymaps.lua

@@ -9,6 +9,12 @@ keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = "Find files"
 keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = "Live grep" })
 keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', { desc = "Find buffers" })
 
+-- Git (Telescope pickers)
+keymap('n', '<leader>gt', '<cmd>Telescope git_status<cr>', { desc = "Git status" })
+keymap('n', '<leader>gc', '<cmd>Telescope git_commits<cr>', { desc = "Git commits" })
+keymap('n', '<leader>gf', '<cmd>Telescope git_bcommits<cr>', { desc = "File commits" })
+keymap('n', '<leader>gw', '<cmd>Telescope git_branches<cr>', { desc = "Git branches" })
+
 -- Better window navigation
 keymap('n', '<C-h>', '<C-w>h')
 keymap('n', '<C-j>', '<C-w>j')

lua/plugins/plugin.lua

@@ -1,11 +1,35 @@
 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,
     },
 
@@ -18,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", "<leader>gs", gs.stage_hunk, { desc = "Stage hunk" })
+                    map("n", "<leader>gr", gs.reset_hunk, { desc = "Reset hunk" })
+                    map("n", "<leader>gS", gs.stage_buffer, { desc = "Stage buffer" })
+                    map("n", "<leader>gu", gs.undo_stage_hunk, { desc = "Undo stage" })
+                    map("n", "<leader>gp", gs.preview_hunk, { desc = "Preview hunk" })
+                    map("n", "<leader>gb", function() gs.blame_line({ full = true }) end, { desc = "Blame line" })
+                    map("n", "<leader>gd", gs.diffthis, { desc = "Diff this" })
+                end,
+            })
+        end,
+    },
+
+    -- Diff view
+    {
+        "sindrets/diffview.nvim",
+        cmd = { "DiffviewOpen", "DiffviewFileHistory" },
+        keys = {
+            { "<leader>gv", "<cmd>DiffviewOpen<cr>", desc = "Diff view" },
+            { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
+            { "<leader>gx", "<cmd>DiffviewClose<cr>", desc = "Close diff" },
+        },
+        config = true,
+    },
+
     -- Fuzzy finder
     {
         "nvim-telescope/telescope.nvim",
@@ -145,7 +210,7 @@ return {
         dependencies = { "nvim-tree/nvim-web-devicons" },
         config = function()
             require("lualine").setup({
-                options = { theme = "catppuccin" },
+                options = { theme = "kanagawa" },
             })
         end,
     },
@@ -161,13 +226,14 @@ return {
             })
 
             wk.add({
-                { "<leader>e", desc = "Toggle file explorer" },
-                { "<leader>f", group = "Find" },
+                { "<leader>e",  desc = "Toggle file explorer" },
+                { "<leader>f",  group = "Find" },
                 { "<leader>ff", desc = "Find files" },
                 { "<leader>fg", desc = "Live grep" },
                 { "<leader>fb", desc = "Find buffers" },
-                { "<leader>w", desc = "Save" },
-                { "<leader>q", desc = "Quit" },
+                { "<leader>g",  group = "Git" },
+                { "<leader>w",  desc = "Save" },
+                { "<leader>q",  desc = "Quit" },
             })
         end,
     },