From be03be655e7c4ae50077eddd491440918921f5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Thu, 18 Dec 2025 11:10:33 +0100
Subject: [PATCH] nvim: add templ lsp, gruvbox colorscheme, add keys, shell:
 editor nvim

---
 nvim/.config/nvim/init.lua                    |  1 +
 nvim/.config/nvim/lsp/templ-lsp.lua           |  5 ++
 nvim/.config/nvim/lua/config/lsp.lua          |  1 +
 nvim/.config/nvim/lua/config/remap.lua        |  4 +
 nvim/.config/nvim/lua/plugins/colorscheme.lua |  2 +-
 shell/.profile                                |  4 +-
 xsession/.Xresources                          | 74 ++++++++++---------
 7 files changed, 52 insertions(+), 39 deletions(-)
 create mode 100644 nvim/.config/nvim/lsp/templ-lsp.lua

diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 287e1a8..686dd6c 100644
--- a/nvim/.config/nvim/init.lua
+++ b/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",
diff --git a/nvim/.config/nvim/lsp/templ-lsp.lua b/nvim/.config/nvim/lsp/templ-lsp.lua
new file mode 100644
index 0000000..2c8b0eb
--- /dev/null
+++ b/nvim/.config/nvim/lsp/templ-lsp.lua
@@ -0,0 +1,5 @@
+return {
+	cmd = { "templ", "lsp" },
+	filetypes = { "templ" },
+	root_markers = { "go.mod", "go.work", ".git" },
+}
diff --git a/nvim/.config/nvim/lua/config/lsp.lua b/nvim/.config/nvim/lua/config/lsp.lua
index 9f05ced..3a74762 100644
--- a/nvim/.config/nvim/lua/config/lsp.lua
+++ b/nvim/.config/nvim/lua/config/lsp.lua
@@ -1,6 +1,7 @@
 vim.lsp.enable({
 	"clangd",
 	"gopls",
+	"templ-lsp",
 	"lua_ls",
 	"ols",
 	"typescript-language-server",
diff --git a/nvim/.config/nvim/lua/config/remap.lua b/nvim/.config/nvim/lua/config/remap.lua
index 129249d..e626479 100644
--- a/nvim/.config/nvim/lua/config/remap.lua
+++ b/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>")
diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua
index 3488c9c..40111cc 100644
--- a/nvim/.config/nvim/lua/plugins/colorscheme.lua
+++ b/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,
 }
diff --git a/shell/.profile b/shell/.profile
index a4f62ae..5e21614 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -10,8 +10,8 @@
 
 export LANG=pl_PL.UTF-8
 
-export EDITOR=vis
-export VISUAL=vis
+export EDITOR=nvim
+export VISUAL=nvim
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
diff --git a/xsession/.Xresources b/xsession/.Xresources
index f4ab83c..cc0fd00 100644
--- a/xsession/.Xresources
+++ b/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.foreground: #9da0af
+st.background: #282828
+st.foreground: #d5c4a1
 st.cursorColor: #bf8040
 st.reverse-cursor: #1f212e
-st.color0: #1f212e
-st.color1: #862d2d
-st.color2: #3a783a
-st.color3: #707010
-st.color4: #345eb2
-st.color5: #cc66cc
-st.color6: #3a7878
-st.color7: #a1a3aa
-st.color8: #4d4d4d
-st.color9: #c27070
-st.color10: #40bf40
-st.color11: #acac53
-st.color12: #6b8ac7
-st.color13: #8f248f
-st.color14: #509595
-st.color15: #dbdff0
+st.color0: #282828
+st.color1: #cc241d
+st.color2: #98971a
+st.color3: #d79921
+st.color4: #458588
+st.color5: #b16286
+st.color6: #689d6a
+st.color7: #a89984
+st.color8: #928374
+st.color9: #fb4934
+st.color10: #b8bb26
+st.color11: #fabd2f
+st.color12: #83a598
+st.color13: #d3869b
+st.color14: #8ec07c
+st.color15: #ebdbb2
 #else
 st.lightmode: 1
-st.background: #f2f2f3
-st.foreground: #1f212e
+st.background: #fbf1c7
+st.foreground: #3c3836
 st.cursorColor: #bf8040
 st.reverse-cursor: #1f212e
-st.color0: #1f212e
-st.color1: #862d2d
-st.color2: #3a783a
-st.color3: #707010
-st.color4: #345eb2
-st.color5: #cc66cc
-st.color6: #3a7878
-st.color7: #a1a3aa
-st.color8: #73778c
-st.color9: #c27070
-st.color10: #40bf40
-st.color11: #acac53
-st.color12: #6b8ac7
-st.color13: #8f248f
-st.color14: #509595
-st.color15: #dae4f1
+st.color0: #282828
+st.color1: #cc241d
+st.color2: #98971a
+st.color3: #d79921
+st.color4: #458588
+st.color5: #b16286
+st.color6: #689d6a
+st.color7: #7c6f64
+st.color8: #928374
+st.color9: #9d0006
+st.color10: #79740e
+st.color11: #b57614
+st.color12: #076678
+st.color13: #8f3f71
+st.color14: #427b58
+st.color15: #3c3836
 #endif