save

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"

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"

nvim/.config/nvim/lua/keymaps.lua

@@ -21,11 +21,11 @@ keymap("n", "<leader>en", ":edit $MYVIMRC<CR>")
 keymap("n", "<leader>ez", ":edit ~/.zshrc<CR>")
 keymap("n", "<leader>eo", ":edit ~/dotfiles/oxwm/.config/oxwm/config.lua<CR>")
 
-keymap("n", "<leader>f", ":Pick files<CR>")
+keymap("n", "<leader><leader>", ":Pick files<CR>")
-keymap("n", "<leader>g", ":Pick grep_live<CR>")
+keymap("n", "<leader>f", ":Pick grep_live<CR>")
 
 -- Project
-vim.keymap.set('n', '<leader>pf', function()
+keymap("n", "<leader>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', '<leader>pf', function()
 	end)
 end)
 
-vim.keymap.set("n", "<leader>pv", ":Explore<CR>")
+keymap("n", "<leader>g", ":Neogit<CR>")
 
 -- Language
 keymap("n", "<leader>lf", vim.lsp.buf.format)

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 }

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 },

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"

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