From 28c67f22c3c338e96d1fd4d8e67f464eaf4f429e Mon Sep 17 00:00:00 2001 From: vxclutch Date: Mon, 8 Jun 2026 19:51:17 -0400 Subject: [PATCH] save --- nvim/.config/nvim/ftplugin/c.lua | 3 +++ nvim/.config/nvim/lua/configs.lua | 2 +- nvim/.config/nvim/lua/keymaps.lua | 8 ++++---- nvim/.config/nvim/lua/lsp.lua | 1 + nvim/.config/nvim/lua/plugins.lua | 12 ++++++++++-- nvim/.config/nvim/nvim-pack-lock.json | 4 ++++ oxwm/.config/oxwm/config.lua | 23 ++--------------------- 7 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 nvim/.config/nvim/ftplugin/c.lua diff --git a/nvim/.config/nvim/ftplugin/c.lua b/nvim/.config/nvim/ftplugin/c.lua new file mode 100644 index 0000000..d77f9eb --- /dev/null +++ b/nvim/.config/nvim/ftplugin/c.lua @@ -0,0 +1,3 @@ +vim.opt_local.shiftwidth = 8 +vim.opt_local.expandtab = false +vim.opt_local.formatoptions:remove "o" diff --git a/nvim/.config/nvim/lua/configs.lua b/nvim/.config/nvim/lua/configs.lua index 5f6f453..accd564 100644 --- a/nvim/.config/nvim/lua/configs.lua +++ b/nvim/.config/nvim/lua/configs.lua @@ -7,7 +7,7 @@ opt.wrap = false opt.splitright = true opt.splitbelow = true -vim.cmd.colorscheme("vague") +vim.cmd.colorscheme("gruber-darker") if vim.g.neovide then vim.o.guifont = "ComicShannsMono Nerd Font" diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua index 262f4fe..ab94469 100644 --- a/nvim/.config/nvim/lua/keymaps.lua +++ b/nvim/.config/nvim/lua/keymaps.lua @@ -21,11 +21,11 @@ keymap("n", "en", ":edit $MYVIMRC") keymap("n", "ez", ":edit ~/.zshrc") keymap("n", "eo", ":edit ~/dotfiles/oxwm/.config/oxwm/config.lua") -keymap("n", "f", ":Pick files") -keymap("n", "g", ":Pick grep_live") +keymap("n", "", ":Pick files") +keymap("n", "f", ":Pick grep_live") -- Project -vim.keymap.set('n', 'pf', function() +keymap("n", "p", function() local root = vim.fn.expand("~/programming") local items = vim.fn.globpath(root, '*', false, true) local dirs = {} @@ -45,7 +45,7 @@ vim.keymap.set('n', 'pf', function() end) end) -vim.keymap.set("n", "pv", ":Explore") +keymap("n", "g", ":Neogit") -- Language keymap("n", "lf", vim.lsp.buf.format) diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index 33c1f8c..d05e38c 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -3,6 +3,7 @@ vim.lsp.enable { "lua_ls", "clangd", "jdtls", + "bashls", } vim.diagnostic.config { virtual_text = true, underline = true, signs = false } diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 6732428..4530911 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -11,13 +11,21 @@ vim.pack.add { { src = "https://github.com/NeogitOrg/neogit" }, { src = "https://github.com/folke/snacks.nvim" }, { src = "https://github.com/saghen/blink.lib" }, - { src = "https://github.com/vague-theme/vague.nvim" }, + { src = "https://github.com/blazkowolf/gruber-darker.nvim" }, + { src = "https://github.com/MeanderingProgrammer/render-markdown.nvim" } } require("mini.pick").setup {} require("lualine").setup {} -require("smear_cursor").setup {} require("neogit").setup {} +require("render-markdown").setup { + completions = { lsp = { enabled = true } } +} +require("render-markdown").enable() + +if not vim.g.neovide then + require("smear_cursor").setup {} +end require("snacks").setup { notifier = { enabled = true }, diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 7a2ac39..1361b17 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -20,6 +20,10 @@ "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", "src": "https://github.com/rafamadriz/friendly-snippets" }, + "gruber-darker.nvim": { + "rev": "aba065c3a79b58cc3863d5c9db319255abd1258a", + "src": "https://github.com/blazkowolf/gruber-darker.nvim" + }, "lualine.nvim": { "rev": "47f91c416daef12db467145e16bed5bbfe00add8", "src": "https://github.com/nvim-lualine/lualine.nvim" diff --git a/oxwm/.config/oxwm/config.lua b/oxwm/.config/oxwm/config.lua index 49a3851..8460c27 100644 --- a/oxwm/.config/oxwm/config.lua +++ b/oxwm/.config/oxwm/config.lua @@ -83,6 +83,7 @@ local blocks = { oxwm.set_terminal(terminal) oxwm.set_modkey(modkey) oxwm.set_tags(tags) + oxwm.set_layout_symbol("tiling", "[T]") oxwm.rule.add({ instance = "atlauncher", floating = true }) @@ -92,7 +93,7 @@ oxwm.border.set_focused_color(colors.blue) oxwm.border.set_unfocused_color(colors.grey) oxwm.set_floating_position("center") -oxwm.gaps.set_smart(enabled) +oxwm.gaps.set_smart(true) oxwm.gaps.set_inner(5, 5) oxwm.gaps.set_outer(5, 5) @@ -163,26 +164,6 @@ oxwm.key.bind({ modkey, "Shift" }, "7", oxwm.tag.move_to(6)) oxwm.key.bind({ modkey, "Shift" }, "8", oxwm.tag.move_to(7)) oxwm.key.bind({ modkey, "Shift" }, "9", oxwm.tag.move_to(8)) -oxwm.key.bind({ modkey, "Control" }, "1", oxwm.tag.toggleview(0)) -oxwm.key.bind({ modkey, "Control" }, "2", oxwm.tag.toggleview(1)) -oxwm.key.bind({ modkey, "Control" }, "3", oxwm.tag.toggleview(2)) -oxwm.key.bind({ modkey, "Control" }, "4", oxwm.tag.toggleview(3)) -oxwm.key.bind({ modkey, "Control" }, "5", oxwm.tag.toggleview(4)) -oxwm.key.bind({ modkey, "Control" }, "6", oxwm.tag.toggleview(5)) -oxwm.key.bind({ modkey, "Control" }, "7", oxwm.tag.toggleview(6)) -oxwm.key.bind({ modkey, "Control" }, "8", oxwm.tag.toggleview(7)) -oxwm.key.bind({ modkey, "Control" }, "9", oxwm.tag.toggleview(8)) - -oxwm.key.bind({ modkey, "Control", "Shift" }, "1", oxwm.tag.toggletag(0)) -oxwm.key.bind({ modkey, "Control", "Shift" }, "2", oxwm.tag.toggletag(1)) -oxwm.key.bind({ modkey, "Control", "Shift" }, "3", oxwm.tag.toggletag(2)) -oxwm.key.bind({ modkey, "Control", "Shift" }, "4", oxwm.tag.toggletag(3)) -oxwm.key.bind({ modkey, "Control", "Shift" }, "5", oxwm.tag.toggletag(4)) -oxwm.key.bind({ modkey, "Control", "Shift" }, "6", oxwm.tag.toggletag(5)) -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" }