diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 97aeadb..f94d8b1 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -8,10 +8,16 @@ vim.pack.add { version = "1.*", }, { src = "https://github.com/nvim-lualine/lualine.nvim" }, + { src = "https://github.com/sphamba/smear-cursor.nvim" }, + + { src = "https://github.com/m00qek/baleia.nvim" }, + { src = "https://github.com/esmuellert/codediff.nvim" }, + { src = "https://github.com/NeogitOrg/neogit" }, } require("mini.pick").setup {} require("lualine").setup {} +require("smear_cursor").setup {} require('blink.cmp').setup { fuzzy = { implementation = 'prefer_rust_with_warning' }, @@ -52,3 +58,5 @@ require('blink.cmp').setup { } } } + +require("neogit").setup {} diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 0bf3443..80dae93 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -1,10 +1,18 @@ { "plugins": { + "baleia.nvim": { + "rev": "710537ff5cd669c5a76c5f5b6a9169fd9b913d18", + "src": "https://github.com/m00qek/baleia.nvim" + }, "blink.cmp": { "rev": "d0c5196dae32c53cde1208161554906f5b982de8", "src": "https://github.com/saghen/blink.cmp", "version": "'1.*'" }, + "codediff.nvim": { + "rev": "29b06f37251f2e010f53a0892573b2ec03d165e2", + "src": "https://github.com/esmuellert/codediff.nvim" + }, "friendly-snippets": { "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", "src": "https://github.com/rafamadriz/friendly-snippets" @@ -17,13 +25,25 @@ "rev": "8521fe21df86e08d9e4b3c3f3a7d50e47954e1af", "src": "https://github.com/nvim-mini/mini.pick" }, + "neogit": { + "rev": "99326a1310fb2d616b455d2fd16d01bf00682f06", + "src": "https://github.com/NeogitOrg/neogit" + }, "nvim-jdtls": { "rev": "77ccaeb422f8c81b647605da5ddb4a7f725cda90", "src": "https://codeberg.org/mfussenegger/nvim-jdtls" }, + "smear-cursor.nvim": { + "rev": "9e9378d6ee34bb3782e0e8c63d9ec8ca618b479b", + "src": "https://github.com/sphamba/smear-cursor.nvim" + }, "todo-comments.nvim": { "rev": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668", "src": "https://github.com/folke/todo-comments.nvim" + }, + "vxwpi.nvim": { + "rev": "ee6d3704ce76294dfc455c5bd9f1a00d9dc31fa0", + "src": "/home/owen/programming/vxwpi.nvim" } } } diff --git a/oxwm/.config/oxwm/config.lua b/oxwm/.config/oxwm/config.lua index 63e382b..cc2853c 100644 --- a/oxwm/.config/oxwm/config.lua +++ b/oxwm/.config/oxwm/config.lua @@ -185,6 +185,12 @@ oxwm.key.bind({ modkey, "Control", "Shift" }, "7", oxwm.tag.toggletag(6)) oxwm.key.bind({ modkey, "Control", "Shift" }, "8", oxwm.tag.toggletag(7)) oxwm.key.bind({ modkey, "Control", "Shift" }, "9", oxwm.tag.toggletag(8)) +oxwm.key.chord({ + { { modkey }, "R" }, + { {}, "C" } +}, oxwm.spawn({ "$HOME/wpilib/2026/frccode/frccode2026" })) + oxwm.autostart("~/walls/set") oxwm.autostart("fastcompmgr") oxwm.autostart("gentoo-pipewire-launcher") +oxwm.autostart("dunst")