nvim: add wf (another which key)

nvim/.config/nvim/init.lua

@@ -7,7 +7,6 @@ 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")
@@ -17,4 +16,4 @@ require("plugins.snacks")
 require("plugins.telescope")
 require("plugins.surround")
 require("plugins.treesitter")
-require("plugins.which-key")
+require("plugins.wf")

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>ca", vim.lsp.buf.code_action)
+		vim.keymap.set("n", "<leader>a", 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,7 +6,6 @@ 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>wa", "<cmd>AutoSession search<cr>")
+vim.keymap.set("n", "<leader>A", "<cmd>AutoSession search<cr>")
 
 local ok, sess = pcall(require, "auto-session")
 if ok then

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

@@ -1,8 +0,0 @@
-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/wf.lua

@@ -0,0 +1,27 @@
+vim.pack.add({ "https://github.com/Cassin01/wf.nvim" })
+
+local ok, wf = pcall(require, "wf")
+if ok then
+	wf.setup()
+
+	local which_key = require("wf.builtin.which_key")
+	local register = require("wf.builtin.register")
+	local buffer = require("wf.builtin.buffer")
+	local mark = require("wf.builtin.mark")
+
+	-- Register
+	vim.keymap.set("n", "<Space>wr", register(), { noremap = true, silent = true, desc = "[wf.nvim] register" })
+
+	-- Mark
+	vim.keymap.set("n", "'", mark(), { nowait = true, noremap = true, silent = true, desc = "[wf.nvim] mark" })
+
+	-- Which Key
+	vim.keymap.set(
+		"n",
+		"<Leader>",
+		which_key({ text_insert_in_advance = "<Leader>" }),
+		{ noremap = true, silent = true, desc = "[wf.nvim] which-key /" }
+	)
+else
+	print("plugin wf missing")
+end

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

@@ -1,8 +0,0 @@
-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,10 +21,6 @@
       "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"
@@ -91,9 +87,9 @@
       "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"
+    "wf.nvim": {
+      "rev": "5b96c7300d4391f990d4bef22eace9d834167da4",
+      "src": "https://github.com/Cassin01/wf.nvim"
     }
   }
 }

xsession/.Xresources

@@ -61,10 +61,6 @@ st.font: FiraCode Nerd Font:size=10
 ! 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: #1f1f28
@@ -87,26 +83,6 @@ 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
@@ -129,24 +105,4 @@ 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 -DHOME="$HOME"
+xrdb -merge ~/.Xresources
 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" -DHOME="$HOME"
+    xrdb -merge "$XRES"
     pkill -USR1 '^st$'
 fi