WIP nvim: change and add snacks keys

nvim/.config/nvim/init.lua

@@ -6,6 +6,7 @@ local ok, paq = pcall(require, "paq")
 if ok then
 	paq({
 		"EdenEast/nightfox.nvim",
+		"ellisonleao/gruvbox.nvim",
 		"stevearc/conform.nvim",
 		"otavioschwanck/arrow.nvim",
 		"folke/flash.nvim",

nvim/.config/nvim/lsp/templ-lsp.lua

@@ -0,0 +1,5 @@
+return {
+	cmd = { "templ", "lsp" },
+	filetypes = { "templ" },
+	root_markers = { "go.mod", "go.work", ".git" },
+}

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

@@ -1,6 +1,7 @@
 vim.lsp.enable({
 	"clangd",
 	"gopls",
+	"templ-lsp",
 	"lua_ls",
 	"ols",
 	"typescript-language-server",

nvim/.config/nvim/lua/config/remap.lua

@@ -4,3 +4,7 @@ vim.keymap.set("n", "<M-j>", "<C-w>j")
 vim.keymap.set("n", "<M-l>", "<C-w>l")
 
 vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<cr>")
+vim.keymap.set("n", "<leader>k", "<cmd>cp<cr>")
+vim.keymap.set("n", "<leader>j", "<cmd>cn<cr>")
+vim.keymap.set("n", "<leader>x", "<cmd>copen<cr>")
+vim.keymap.set("n", "<leader>X", "<cmd>cclose<cr>")

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

@@ -10,7 +10,7 @@ return {
 	},
 	init = function()
 		local cs = require("config.colorscheme")
-		cs.set_colorschemes("nightfox", "dayfox")
+		cs.set_colorschemes("gruvbox", "gruvbox")
 		cs.update_colorscheme()
 	end,
 }

nvim/.config/nvim/lua/plugins/snacks.lua

@@ -6,14 +6,14 @@ return {
 			Snacks.picker.smart()
 		end, { desc = "Smart Find Files" })
 
-		set("n", "<leader><space>", function()
+		set("n", "<leader>b", function()
-			Snacks.picker.smart()
-		end, { desc = "Smart Find Files" })
-
-		set("n", "<leader>a", function()
 			Snacks.picker.buffers()
 		end, { desc = "Buffers" })
 
+		set("n", "<leader>e", function()
+			Snacks.explorer()
+		end, { desc = "File Explorer" })
+
 		set("n", "<leader>r", function()
 			Snacks.picker.recent()
 		end, { desc = "Recent files" })
@@ -22,41 +22,97 @@ return {
 			Snacks.picker.resume()
 		end, { desc = "Resume" })
 
-		set("n", "<leader>b", function()
+		set("n", "<leader>a", function()
+			Snacks.picker.projects()
+		end, { desc = "Projects" })
+
+		set("n", "<leader>l", function()
 			Snacks.picker.lines()
 		end, { desc = "Buffer lines" })
 
-		set("n", "<leader>B", function()
+		set("n", "<leader>L", function()
 			Snacks.picker.grep_buffers()
 		end, { desc = "Grep Open Buffers" })
 
-		set("n", "<leader>f", function()
+		set("n", "<leader>F", function()
 			Snacks.picker.files()
 		end, { desc = "Find Files" })
 
-		set("n", "<leader>s", function()
+		set("n", "<leader>S", function()
 			Snacks.picker.grep()
 		end, { desc = "Grep" })
 
-		set("n", "<leader>S", function()
+		set("n", "<leader>B", function()
+			Snacks.picker.git_branches()
+		end, { desc = "Git Branches" })
+
+		set({ "n", "v" }, "<leader>xB", function()
+			Snacks.gitbrowse()
+		end, { desc = "Git Browse" })
+
+		set("n", "<leader>i", function()
+			Snacks.picker.git_log_line()
+		end, { desc = "Git Log Line" })
+
+		set("n", "<leader>I", function()
+			Snacks.picker.git_log()
+		end, { desc = "Git Log" })
+
+		set("n", "<leader>t", function()
 			Snacks.picker.git_status()
 		end, { desc = "Git Status" })
 
-		set("n", "<leader>g", function()
+		set("n", "<leader>H", function()
+			Snacks.picker.git_diff()
+		end, { desc = "Git Diff (Hunks)" })
+
+		set("n", "<leader>xS", function()
+			Snacks.picker.git_stash()
+		end, { desc = "Git Stash" })
+
+		set("n", "<leader>f", function()
 			Snacks.picker.git_files()
 		end, { desc = "Find Git Files" })
 
-		set("n", "<leader>G", function()
+		set("n", "<leader>s", function()
 			Snacks.picker.git_grep()
 		end, { desc = "Git Grep" })
 
-		set("n", "<leader>l", function()
+		set({ "n", "v" }, "<leader>o", function()
+			Snacks.picker.grep_word()
+		end, { desc = "Grep Visual Selection or Word" })
+
+		set("n", "<leader>g", function()
 			Snacks.lazygit()
 		end, { desc = "Lazygit" })
 
-		set("n", "<leader>L", function()
+		set("n", "<leader>G", function()
 			Snacks.lazygit.log_file()
-		end, { desc = "Lazygit log file" })
+		end, { desc = "Git Log File" })
+
+		set("n", "<leader>m", function()
+			Snacks.picker.marks()
+		end, { desc = "Marks" })
+
+		set("n", "<leader>M", function()
+			Snacks.picker.man()
+		end, { desc = "Man pages" })
+
+		set("n", "<leader>U", function()
+			Snacks.picker.undo()
+		end, { desc = "Undo History" })
+
+		set("n", "<leader>q", function()
+			Snacks.picker.qflist()
+		end, { desc = "Quickfix list" })
+
+		set("n", "<leader>Q", function()
+			Snacks.picker.loclist()
+		end, { desc = "Location List" })
+
+		set("n", "<leader>xs", function()
+			Snacks.picker.colorschemes()
+		end, { desc = "Colorschemes" })
 
 		set("n", "<leader>n", function()
 			Snacks.notifier.show_history()
@@ -66,7 +122,7 @@ return {
 			Snacks.picker.notifications()
 		end, { desc = "Notifications" })
 
-		set("n", "<leader>C", function()
+		set("n", "<leader>xC", function()
 			Snacks.picker.commands()
 		end, { desc = "Commands" })
 
@@ -74,7 +130,11 @@ return {
 			Snacks.picker.keymaps()
 		end, { desc = "Keymaps" })
 
-		set("n", "<leader>:", function()
+		set("n", "<leader>xh", function()
+			Snacks.picker.highlights()
+		end, { desc = "Hightlights" })
+
+		set("n", "<leader>xc", function()
 			Snacks.picker.command_history()
 		end, { desc = "Command History" })
 
@@ -89,6 +149,15 @@ return {
 		set("n", "<leader>z", function()
 			Snacks.zen.zoom()
 		end, { desc = "Toggle Zoom" })
+
+		set("n", "<leader>.", function()
+			Snacks.scratch()
+		end, { desc = "Toggle Scratch Buffer" })
+
+		set("n", "<leader>x.", function()
+			Snacks.scratch.select()
+		end, { desc = "Select Scratch Buffer" })
+
 		-- LSP
 
 		set("n", "gd", function()
@@ -99,7 +168,7 @@ return {
 			Snacks.picker.lsp_declarations()
 		end, { desc = "Goto Declaration" })
 
-		set("n", "gr", function()
+		set("n", "grr", function()
 			Snacks.picker.lsp_references()
 		end, { desc = "References" })
 

shell/.profile

@@ -10,8 +10,8 @@
 
 export LANG=pl_PL.UTF-8
 
-export EDITOR=vis
+export EDITOR=nvim
-export VISUAL=vis
+export VISUAL=nvim
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then

xsession/.Xresources

@@ -58,48 +58,50 @@ XTerm.vt100.color15:        #ECEFF4
 
 st.font: FiraCode Nerd Font:size=10
 
+! gruvebox colors from https://github.com/morhetz/gruvbox-contrib/tree/master/deepin-terminal
+
 #ifdef THEME_DARK
 st.lightmode: 0
-st.background: #1f212e
+st.background: #282828
-st.foreground: #9da0af
+st.foreground: #d5c4a1
 st.cursorColor: #bf8040
 st.reverse-cursor: #1f212e
-st.color0: #1f212e
+st.color0: #282828
-st.color1: #862d2d
+st.color1: #cc241d
-st.color2: #3a783a
+st.color2: #98971a
-st.color3: #707010
+st.color3: #d79921
-st.color4: #345eb2
+st.color4: #458588
-st.color5: #cc66cc
+st.color5: #b16286
-st.color6: #3a7878
+st.color6: #689d6a
-st.color7: #a1a3aa
+st.color7: #a89984
-st.color8: #4d4d4d
+st.color8: #928374
-st.color9: #c27070
+st.color9: #fb4934
-st.color10: #40bf40
+st.color10: #b8bb26
-st.color11: #acac53
+st.color11: #fabd2f
-st.color12: #6b8ac7
+st.color12: #83a598
-st.color13: #8f248f
+st.color13: #d3869b
-st.color14: #509595
+st.color14: #8ec07c
-st.color15: #dbdff0
+st.color15: #ebdbb2
 #else
 st.lightmode: 1
-st.background: #f2f2f3
+st.background: #fbf1c7
-st.foreground: #1f212e
+st.foreground: #3c3836
 st.cursorColor: #bf8040
 st.reverse-cursor: #1f212e
-st.color0: #1f212e
+st.color0: #282828
-st.color1: #862d2d
+st.color1: #cc241d
-st.color2: #3a783a
+st.color2: #98971a
-st.color3: #707010
+st.color3: #d79921
-st.color4: #345eb2
+st.color4: #458588
-st.color5: #cc66cc
+st.color5: #b16286
-st.color6: #3a7878
+st.color6: #689d6a
-st.color7: #a1a3aa
+st.color7: #7c6f64
-st.color8: #73778c
+st.color8: #928374
-st.color9: #c27070
+st.color9: #9d0006
-st.color10: #40bf40
+st.color10: #79740e
-st.color11: #acac53
+st.color11: #b57614
-st.color12: #6b8ac7
+st.color12: #076678
-st.color13: #8f248f
+st.color13: #8f3f71
-st.color14: #509595
+st.color14: #427b58
-st.color15: #dae4f1
+st.color15: #3c3836
 #endif