zutty: add xresources

nvim/.config/nvim/init.lua

@@ -7,11 +7,14 @@ require("plugins.auto-session")
 require("plugins.colorscheme")
 require("plugins.conform")
 require("plugins.flash")
+require("plugins.guess-indent")
 require("plugins.luasnip")
 require("plugins.multicursor")
 require("plugins.nvim-various-textobjs")
 require("plugins.oil")
+require("plugins.slimline")
 require("plugins.snacks")
 require("plugins.telescope")
 require("plugins.surround")
 require("plugins.treesitter")
+require("plugins.which-key")

nvim/.config/nvim/lua/config/lsp.lua

@@ -15,7 +15,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 				return { abbr = item.label:gsub("%b()", "") }
 			end,
 		})
-		vim.keymap.set("n", "<leader>a", vim.lsp.buf.code_action)
+		vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action)
 		vim.keymap.set("i", "<C-space>", vim.lsp.completion.get)
 		vim.keymap.set("n", "<leader>k", function()
 			vim.diagnostic.jump({ float = true, count = -1 })

nvim/.config/nvim/lua/config/options.lua

@@ -6,6 +6,7 @@ vim.g.maplocalleader = " \\"
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.signcolumn = "yes"
+vim.opt.title = true
 
 vim.opt.timeout = false
 

nvim/.config/nvim/lua/plugins/auto-session.lua

@@ -1,6 +1,6 @@
 vim.pack.add({ "https://github.com/rmagatti/auto-session" })
 
-vim.keymap.set("n", "<leader>A", "<cmd>AutoSession search<cr>")
+vim.keymap.set("n", "<leader>wa", "<cmd>AutoSession search<cr>")
 
 local ok, sess = pcall(require, "auto-session")
 if ok then

nvim/.config/nvim/lua/plugins/colorscheme.lua

@@ -1,5 +1,5 @@
-vim.pack.add({ "https://github.com/EdenEast/nightfox.nvim" })
+vim.pack.add({ "https://github.com/EdenEast/nightfox.nvim", "https://github.com/rebelot/kanagawa.nvim" })
 
 local cs = require("config.colorscheme")
-cs.set_colorschemes("terafox", "dayfox")
+cs.set_colorschemes("kanagawa-wave", "dayfox")
 cs.update_colorscheme()

nvim/.config/nvim/lua/plugins/conform.lua

@@ -6,10 +6,30 @@ if ok then
 		formatters_by_ft = {
 			lua = { "stylua" },
 		},
-		format_on_save = {
-			timeout_ms = 500,
-			lsp_format = "fallback",
-		},
+		format_on_save = function(bufnr)
+			-- Disable with a global or buffer-local variable
+			if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+				return
+			end
+			return { timeout_ms = 500, lsp_format = "fallback" }
+		end,
+	})
+	vim.api.nvim_create_user_command("FormatDisable", function(args)
+		if args.bang then
+			-- FormatDisable! will disable formatting just for this buffer
+			vim.b.disable_autoformat = true
+		else
+			vim.g.disable_autoformat = true
+		end
+	end, {
+		desc = "Disable autoformat-on-save",
+		bang = true,
+	})
+	vim.api.nvim_create_user_command("FormatEnable", function()
+		vim.b.disable_autoformat = false
+		vim.g.disable_autoformat = false
+	end, {
+		desc = "Re-enable autoformat-on-save",
 	})
 else
 	print("plugin conform missing")

nvim/.config/nvim/lua/plugins/guess-indent.lua

@@ -0,0 +1,8 @@
+vim.pack.add({ "https://github.com/NMAC427/guess-indent.nvim" })
+
+local ok, guess_indent = pcall(require, "guess-indent")
+if ok then
+	guess_indent.setup()
+else
+	print("plugin guess-indent missing")
+end

nvim/.config/nvim/lua/plugins/slimline.lua

@@ -0,0 +1,8 @@
+vim.pack.add({ "https://github.com/sschleemilch/slimline.nvim" })
+
+local ok, slimline = pcall(require, "slimline")
+if ok then
+	slimline.setup()
+else
+	print("plugin slimline missing")
+end

nvim/.config/nvim/lua/plugins/which-key.lua

@@ -0,0 +1,8 @@
+vim.pack.add({ "https://github.com/folke/which-key.nvim" })
+
+local ok, whichkey = pcall(require, "which-key")
+if ok then
+	whichkey.setup({ preset = "helix", delay = 1000 })
+else
+	print("plugin whichkey missing")
+end

nvim/.config/nvim/nvim-pack-lock.json

@@ -21,6 +21,14 @@
       "rev": "fcea7ff883235d9024dc41e638f164a450c14ca2",
       "src": "https://github.com/folke/flash.nvim"
     },
+    "guess-indent.nvim": {
+      "rev": "84a4987ff36798c2fc1169cbaff67960aed9776f",
+      "src": "https://github.com/NMAC427/guess-indent.nvim"
+    },
+    "kanagawa.nvim": {
+      "rev": "aef7f5cec0a40dbe7f3304214850c472e2264b10",
+      "src": "https://github.com/rebelot/kanagawa.nvim"
+    },
     "multicursor.nvim": {
       "rev": "993c6eda70077c5619388900dcffefff73b40c96",
       "src": "https://github.com/jake-stewart/multicursor.nvim",
@@ -57,6 +65,10 @@
       "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
+    "slimline.nvim": {
+      "rev": "b23d6239ae06d7b422b30b227756971348ffcd68",
+      "src": "https://github.com/sschleemilch/slimline.nvim"
+    },
     "snacks.nvim": {
       "rev": "fe7cfe9800a182274d0f868a74b7263b8c0c020b",
       "src": "https://github.com/folke/snacks.nvim"
@@ -78,6 +90,10 @@
       "rev": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179",
       "src": "https://github.com/nvim-telescope/telescope.nvim",
       "version": "'v0.2.1'"
+    },
+    "which-key.nvim": {
+      "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
+      "src": "https://github.com/folke/which-key.nvim"
     }
   }
 }

oxwm/.config/oxwm/config.lua

@@ -32,7 +32,7 @@ local blocks = {
 		format = "Ram: {used}/{total} GB",
 		interval = 5,
 		color = colors.light_blue,
-		underline = true,
+		underline = false,
 	}),
 	oxwm.bar.block.static({
 		text = " │  ",
@@ -45,8 +45,23 @@ local blocks = {
 		command = "uname -r",
 		interval = 999999999,
 		color = colors.red,
-		underline = true,
+		underline = false,
 	}),
+	-- oxwm.bar.block.static({
+	-- 	text = " │  ",
+	-- 	interval = 999999999,
+	-- 	color = colors.lavender,
+	-- 	underline = false,
+	-- }),
+	-- oxwm.bar.block.battery({
+	-- 	format = "Bat: {}%",
+	-- 	charging = "⚡ Bat: {}%",
+	-- 	discharging = "- Bat: {}%",
+	-- 	full = "✓ Bat: {}%",
+	-- 	interval = 30,
+	-- 	color = colors.green,
+	-- 	underline = false,
+	-- }),
 	oxwm.bar.block.static({
 		text = " │  ",
 		interval = 999999999,
@@ -58,18 +73,8 @@ local blocks = {
 		date_format = "%a, %b %d - %H:%M",
 		interval = 1,
 		color = colors.cyan,
-		underline = true,
+		underline = false,
 	}),
-	-- Uncomment to add battery status (useful for laptops)
-	-- oxwm.bar.block.battery({
-	--     format = "Bat: {}%",
-	--     charging = "⚡ Bat: {}%",
-	--     discharging = "- Bat: {}%",
-	--     full = "✓ Bat: {}%",
-	--     interval = 30,
-	--     color = colors.green,
-	--     underline = true,
-	-- }),
 }
 
 -------------------------------------------------------------------------------
@@ -146,12 +151,16 @@ oxwm.bar.set_scheme_normal(colors.fg, colors.bg, "#444444")
 -- Occupied tags
 oxwm.bar.set_scheme_occupied(colors.cyan, colors.bg, colors.cyan)
 -- Currently selected tag
-oxwm.bar.set_scheme_selected(colors.cyan, colors.bg, colors.purple)
+oxwm.bar.set_scheme_selected(colors.orange, colors.bg, colors.orange)
 -- Urgent tags (windows requesting attention)
 oxwm.bar.set_scheme_urgent(colors.red, colors.bg, colors.red)
 
 -- Hide tags that have no windows and are not selected
 -- oxwm.bar.set_hide_vacant_tags(true)
+--
+function shell_quote(s)
+	return '"' .. string.gsub(s, '[$"!`\\]', "\\%1") .. '"'
+end
 
 -------------------------------------------------------------------------------
 -- Keybindings
@@ -168,7 +177,17 @@ oxwm.bar.set_scheme_urgent(colors.red, colors.bg, colors.red)
 
 oxwm.key.bind({ modkey }, "Return", oxwm.spawn_terminal())
 -- Launch Dmenu
-oxwm.key.bind({ modkey }, "P", oxwm.spawn({ "sh", "-c", "dmenu_run -l 10" }))
+oxwm.key.bind(
+	{ modkey },
+	"P",
+	oxwm.spawn({
+		"sh",
+		"-c",
+		"dmenu_run -l 10 -fn " .. shell_quote(bar_font) .. " -nb " .. shell_quote(colors.bg) .. " -nf " .. shell_quote(
+			colors.fg
+		) .. " -sb " .. shell_quote(colors.orange) .. " -sf " .. shell_quote(colors.black),
+	})
+)
 -- Copy screenshot to clipboard
 oxwm.key.bind({ modkey }, "S", oxwm.spawn({ "sh", "-c", "maim -s | xclip -selection clipboard -t image/png" }))
 oxwm.key.bind({ modkey }, "X", oxwm.client.kill())
@@ -281,6 +300,10 @@ oxwm.key.chord({
 	{ { modkey }, "Space" },
 	{ {}, "T" },
 }, oxwm.spawn_terminal())
+oxwm.key.chord({
+	{ { modkey }, "Space" },
+	{ {}, "F" },
+}, oxwm.spawn({ "firefox" }))
 oxwm.key.chord({
 	{ { modkey }, "Space" },
 	{ {}, "L" },

oxwm/.config/oxwm/dark.lua

@@ -1,13 +1,14 @@
 return {
-	fg = "#bbbbbb",
+	fg = "#aaaaaa",
 	red = "#f7768e",
 	bg = "#1a1b26",
+	black = "#1a1b26",
 	cyan = "#0db9d7",
 	green = "#9ece6a",
 	lavender = "#a9b1d6",
 	light_blue = "#7aa2f7",
-	grey = "#bbbbbb",
+	grey = "#737373",
 	blue = "#6dade3",
 	purple = "#ad8ee6",
-	orange = "#d78042",
+	orange = "#bd6628",
 }

oxwm/.config/oxwm/light.lua

@@ -2,6 +2,7 @@ return {
 	fg = "#1a1b26",
 	red = "#b94646",
 	bg = "#dddddd",
+	black = "#1a1b26",
 	cyan = "#4d8080",
 	green = "#9ece6a",
 	lavender = "#a9b1d6",

xsession/.Xresources

@@ -58,31 +58,55 @@ XTerm.vt100.color15:        #ECEFF4
 
 st.font: FiraCode Nerd Font:size=10
 
-! terrafox colors from https://github.com/edeneast/nightfox.nvim/raw/main/extra/terafox/alacritty.toml
+! kanagawa wave colors from https://github.com/rebelot/kanagawa.nvim/blob/master/extras/alacritty/kanagawa_wave.toml
 ! dayfox colors from https://github.com/edeneast/nightfox.nvim/raw/main/extra/dayfox/alacritty.toml
 
+Zutty.font: monaspaceneon
+Zutty.fontpath: /usr/share/fonts:HOME/.local/share/fonts
+Zutty.fontsize: 20
+
 #ifdef THEME_DARK
 st.lightmode: 0
-st.background: #152528
-st.foreground: #e6eaea
+st.background: #1f1f28
+st.foreground: #dcd7ba
 st.cursorColor: #cbd9d8
 st.reverse-cursor: #e6eaea
-st.color0: #2f3239
-st.color1: #e85c51
-st.color2: #7aa4a1
-st.color3: #fda47f
-st.color4: #5a93aa
-st.color5: #ad5c7c
-st.color6: #a1cdd8
-st.color7: #ebebeb
-st.color8: #4e5157
-st.color9: #eb746b
-st.color10: #8eb2af
-st.color11: #fdb292
-st.color12: #73a3b7
-st.color13: #b97490
-st.color14: #afd4de
-st.color15: #eeeeee
+st.color0: #090618
+st.color1: #c34043
+st.color2: #76946a
+st.color3: #c0a36e
+st.color4: #7e9cd8
+st.color5: #957fb8
+st.color6: #6a9589
+st.color7: #c8c093
+st.color8: #727169
+st.color9: #e82424
+st.color10: #98bb6c
+st.color11: #e6c384
+st.color12: #7fb4ca
+st.color13: #938aa9
+st.color14: #7aa89f
+st.color15: #dcd7ba
+
+Zutty.bg: #1f1f28
+Zutty.fg: #dcd7ba
+Zutty.cr: #cbd9d8
+Zutty.color0: #090618
+Zutty.color1: #c34043
+Zutty.color2: #76946a
+Zutty.color3: #c0a36e
+Zutty.color4: #7e9cd8
+Zutty.color5: #957fb8
+Zutty.color6: #6a9589
+Zutty.color7: #c8c093
+Zutty.color8: #727169
+Zutty.color9: #e82424
+Zutty.color10: #98bb6c
+Zutty.color11: #e6c384
+Zutty.color12: #7fb4ca
+Zutty.color13: #938aa9
+Zutty.color14: #7aa89f
+Zutty.color15: #dcd7ba
 #else
 st.lightmode: 1
 st.background: #f6f2ee
@@ -105,4 +129,24 @@ st.color12: #4863b6
 st.color13: #8452d5
 st.color14: #488d93
 st.color15: #f4ece6
+
+Zutty.bg: #f6f2ee
+Zutty.fg: #3d2b5a
+Zutty.cr: #643f61
+Zutty.color0: #352c24
+Zutty.color1: #a5222f
+Zutty.color2: #396847
+Zutty.color3: #ac5402
+Zutty.color4: #2848a9
+Zutty.color5: #6e33ce
+Zutty.color6: #287980
+Zutty.color7: #f2e9e1
+Zutty.color8: #534c45
+Zutty.color9: #b3434e
+Zutty.color10: #577f63
+Zutty.color11: #b86e28
+Zutty.color12: #4863b6
+Zutty.color13: #8452d5
+Zutty.color14: #488d93
+Zutty.color15: #f4ece6
 #endif

xsession/.xsession

@@ -8,7 +8,7 @@ xset b off
 xrandr --auto
 xrandr --output DP-0 --left-of DP-2 --primary
 xrandr --output HDMI-0 --left-of DP-0
-xrdb -merge ~/.Xresources
+xrdb -merge ~/.Xresources -DHOME="$HOME"
 setxkbmap pl -option ctrl:nocaps
 
 if [ -x  ~/.fehbg ]; then

xsession/bin/lupan-set-theme

@@ -30,7 +30,7 @@ if [ -n "$XRES" ]; then
     elif [ "$THEME" = light ]; then
         sed -i 's/^#define THEME_DARK/#undef THEME_DARK/' "$XRES"
     fi
-    xrdb -merge "$XRES"
+    xrdb -merge "$XRES" -DHOME="$HOME"
     pkill -USR1 '^st$'
 fi