nvim: colorscheme nightfox (terafox/dayfox)

a4/.config/a4/a4.ini

@@ -1,266 +0,0 @@
-# Session settings
-# Name used for the default session
-session     = default
-# Key press used to detatch from a session. Typically a Control key specified
-# with prefix C-, for example C-\ for Control-backslash. Single keys are also
-# allowed but not Meta (M-) keys.
-detach_key  = C-\
-
-# Application Theming
-# Colors are specified as -1 for default, 0-7 for standard, 8-15 for bright,
-# 16-231 for extended, 232-255 for gray scale, 0xRRGGBB for 24-bit RGB colors,
-# or you can use any of the X11 or Web Color Names. One or more comma separated
-# font attributes may optionally be specified: bold, italic, reverse, strike,
-# and blink. The attributes may also optionally include one of three underline
-# types single, double, or curly.
-include             = theme_blue.ini
-#statusbar_attr      = white    0x5F636A
-#tag_unoccupied      = white    0x5F636A
-#titlebar_unselected = white    0x004C6C
-titlebar_unselected = 0x808080  0x000000
-#tag_occupied        = white    0x004C6C
-#tag_urgent          = white    0x004C6C bold,blink
-#titlebar_selected   = white    0x00AEEF
-titlebar_selected   = white    0x004C6C
-#tag_selected        = white    0x00AEEF bold
-# Read only settings are overlayed onto the three titlebar settings above. Set
-# either fg or bg to -1 to retain that titlebar setting. Any specified
-# attributes are combined with those from above. These must be in this order
-# and must be after all other titlebar definitions!
-#titlebar_urgent     = 0xE7DDB4 -1       blink
-#titlebar_readonly   = 0xA56815 -1       bold,italic
-
-# Define up to 9 alphanumeric tag names, how they will be displayed on the
-# status bar, and the types of colors and font attributes.
-tagnames            = 1 2 3 4 5 6 7 8 9
-#tagnames            = play dev test stage prod
-tag_printf          = " %s "
-# Number of lines saved for each terminal's scroll back history
-scroll_history      = 5000
-# The size of the layout zoom area is a number from .1 to .9, and the number of
-# terminals in the zoom area is a number 1 or more.
-zoomsize            = .5
-zoomnum             = 1
-
-# Specify one or more status bar commands to cycle through at the given number
-# of interval seconds. Set interval to 0 to have the command run once and not
-# refresh. Set interval to -1 to not have any status bar text.
-statusbar_cmd       = date; echo " | a4/$A4_SESSION" $A4
-statusbar_cmd       = uptime; echo " | a4/$A4_SESSION" $A4
-#statusbar_cmd       = cat ~/.cache/status/statusbar.txt; echo ' | a4' $A4
-statusbar_interval  = 10
-statusbar_display   = true
-statusbar_top       = true
-#statusbar_begin     = [
-#statusbar_end       = ]
-
-# The terminal cursor can be set to visible or hidden, blinking or solid, and
-# the shape can be 1-block, 2-underline, or 3-bar.
-cursorvis           = true
-cursorblink         = true
-cursorshape         = 1
-
-# Any number of actions assigned to the optional special keyword "startup" are
-# run when a4 is started, in the order specified.
-#include             = startup.ini
-startup             = create
-#startup             = view 2
-#startup             = create
-#startup             = keysequence ssh example.com\n
-
-[Layouts]
-# Layout symbol string in the status bar. First layout is the default. Order
-# determines layout toggle cycle.
-zoom_left       = " │├┤ "
-zoom_right      = " ├┤│ "
-fullscreen      = " │ │ "
-grid            = " ├┼┤ "
-columns         = " │││ "
-rows            = " ─── "
-zoom_top        = " ├┬┤ "
-zoom_bottom     = " ├┴┤ "
-
-[KeyboardActions]
-# Keyboard actions have a key combination of no more than three keys assigned
-# to them. A key can be raw or can include modifiers Meta or Alt, M-, Control,
-# C-, Shift, S-, or with combinations of those. Any modifier keys must be put
-# in the order of M-C-S-. Two special keys that must be fully spelled out are
-# "Space" and "Hyphen".
-C-g c           = create
-C-g x x         = destroy
-C-g Enter       = zoom
-C-g .           = minimize
-C-g q q         = quit
-C-g C-l         = redraw
-C-g s           = statusbar vis
-C-g S           = statusbar pos
-
-# The four actions view, tag, viewtoggle, and tagtoggle each take tag name as a
-# parameter. You can use the special '#' character as a shortcut to assign
-# mappings for up to 9 digits to the list of tag names. For the key
-# combination, the last occurrence of '#' is replaced with the digit 'n' and
-# then the 'nth' tag name is passed as the action parameter. For example,
-# "C-g # F# = view #" expands to "C-g F1 = view 1", "C-g F2 = view 2", ....
-C-g v #         = view #
-C-g F#          = view #
-C-g t #         = tag #
-C-g V #         = viewtoggle #
-C-g T #         = tagtoggle #
-
-C-g v 0         = view _all
-C-g v Tab       = view _swap
-C-g t 0         = tag _all
-
-# The focus action takes several possible parameters, including window number.
-# You can use the special '#' character as a shortcut to assign mappings for
-# all digits 1-9. in the key combination and the action parameter to assign
-# that combo/action pairing to digits 1-9. For the key combination, the last
-# occurrence of '#' is replaced with the digit 'n' and the same digit 'n' is
-# passed as the action parameter. For example, "C-g # = focus #" is expanded
-# out to "C-g 1 = focus 1", "C-g 2 = focus 2", ....
-C-g #           = focus #
-
-C-g j           = focus next
-C-g C-j         = focus NEXT
-C-g k           = focus prev
-C-g C-k         = focus PREV
-C-g Tab         = focus swap
-C-g H           = focus left
-C-g J           = focus down
-C-g K           = focus up
-C-g L           = focus right
-C-g )           = focus group
-C-g 0           = focus groupall
-C-g *           = readonly
-
-C-a #           = view #
-
-C-a f           = layout fullscreen
-C-a g           = layout grid
-C-a h           = layout zoom_left
-C-a j           = layout zoom_bottom
-C-a k           = layout zoom_top
-C-a l           = layout zoom_right
-C-a c           = layout columns
-C-a r           = layout rows
-# Cycle through all layouts in order listed in the [Layouts] section
-C-a Space       = layout +1
-C-a C-Space     = layout -1
-C-a Tab         = layout swap
-
-C-a i           = zoomnum +1
-C-a d           = zoomnum -1
-C-a I           = zoomsize +.05
-C-a D           = zoomsize -.05
-
-S-PageUp        = scrollback  .5
-S-PageDown      = scrollback -.5
-C-g PageUp      = scrollback  1.0
-C-g PageDown    = scrollback -1.0
-
-# Specify ANSI escape or other key sequence overrides
-#include         = vt220.ini
-#Home            = keysequence \e[1~
-#End             = keysequence \e[4~
-#C-g Space       = keysequence Hello world!
-
-[MouseTermwinActions]
-click-1         = focus
-C-click-1       = zoom
-click-3         = focus group
-C-click-3       = focus 0
-wheel-up        = scrollback  3
-wheel-dn        = scrollback -3
-S-wheel-up      = scrollback  0.5
-S-wheel-dn      = scrollback -0.5
-C-wheel-up      = scrollback  1.0
-C-wheel-dn      = scrollback -1.0
-
-[MouseTitlebarActions]
-click-1         = minimize
-click-3         = readonly
-
-[MouseTagNamesActions]
-click-1         = view
-C-click-1       = viewtoggle
-click-3         = tag
-C-click-3       = tagtoggle
-
-[MouseLayoutSymbolActions]
-click-1         = layout +1
-click-3         = layout -1
-C-click-1       = zoomnum +1
-C-click-3       = zoomnum -1
-M-C-click-1     = zoomsize +.05
-M-C-click-3     = zoomsize -.05
-
-[MouseStatusTextActions]
-click-1         = statusbar next
-
-[MouseFrameLinesActions]
-click-1         = layout fullscreen
-
-# Terminals typically have a default foreground (fg) color, background (bg)
-# color, and 16 standard colors that are used by terminal applications. They
-# can also define color numbers up to 255, but the are used less often. In a4,
-# you can define ColorSchemes that are then applied to terminal windows
-# dynamically by comparing the terminal's title text to defined ColorRules (see
-# below). The first defined ColorScheme is used by default for all windows.
-# (The cursor color is not yet implemented.)
-#include     = cs_gruvbox.ini
-#include     = cs_solarized.ini
-#include     = cs_redsands.ini
-#include     = cs_fairyfloss.ini
-#include     = cs_kokuban.ini
-#include     = cs_frontend_fun_forrest.ini
-#include     = cs_seafoam_pastel.ini
-[ColorScheme Basic]
-fg          = 7
-bg          = 0
-#color123    = DarkOrange1
-
-[ColorScheme BasicRed]
-fg          = 0
-bg          = 1
-
-[ColorScheme Red160]
-fg          = 232
-bg          = 160
-
-[ColorScheme Crimson]
-fg          = MidnightBlue
-bg          = Crimson
-
-[colorscheme RedSands]
-color00     = 0x000000
-color01     = 0xff3f00
-color02     = 0x00bb00
-color03     = 0xe7b000
-color04     = 0x0072ff
-color05     = 0xbb00bb
-color06     = 0x00bbbb
-color07     = 0xbbbbbb
-color08     = 0x555555
-color09     = 0xbb0000
-color10     = 0x00bb00
-color11     = 0xe7b000
-color12     = 0x0072ae
-color13     = 0xff55ff
-color14     = 0x55ffff
-color15     = 0xffffff
-fg          = 0xd7c9a7
-bg          = 0x7a251e
-cursor      = 0xd7c9a7
-
-# Color rules pair text with a colorscheme. A terminal window's title bar text
-# is compared with each ColorRule text, in the order specified, until one
-# matches, and then that colorscheme is applied to the terminal. If none of the
-# rules match, then the first colorscheme defined in a4.ini is used.
-# <pattern> = <colorscheme name> [<fg color|-1> [<bg color>]]
-#[ColorRules]
-#root@appdev.com = FairyFloss red
-#@appdev.com     = FairyFloss
-#root@appprd     = redsands   red
-#appprd          = redsands
-#root@appprddr   = redsands   red 0x521914
-#appprddr        = redsands   -1  0x521914

nvim/.config/nvim/init.lua

@@ -7,14 +7,10 @@ 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/lsp/lua_ls.lua

@@ -1,12 +1,5 @@
 return {
-	cmd = { "lua-language-server" },
+	cmd = 'lua-language-server',
-	filetypes = { "lua" },
+	filetypes = { 'lua' },
-	root_markers = { ".luarc.json", ".git" },
+	rootmarkers = { '.git' },
-	settings = {
-		Lua = {
-			runtime = {
-				version = "LuaJIT",
-			},
-		},
-	},
 }

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,8 +6,5 @@ vim.g.maplocalleader = " \\"
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.signcolumn = "yes"
-vim.opt.title = true
 
 vim.opt.timeout = false
-
-vim.o.undofile = true

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/colorscheme.lua

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

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

@@ -6,30 +6,10 @@ if ok then
 		formatters_by_ft = {
 			lua = { "stylua" },
 		},
-		format_on_save = function(bufnr)
+		format_on_save = {
-			-- Disable with a global or buffer-local variable
+			timeout_ms = 500,
-			if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+			lsp_format = "fallback",
-				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

@@ -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/luasnip.lua

@@ -1,48 +0,0 @@
-vim.api.nvim_create_autocmd("PackChanged", {
-	group = vim.api.nvim_create_augroup("luasnip-update", { clear = true }),
-	callback = function(ev)
-		local name, kind = ev.data.spec.name, ev.data.kind
-		if name == "luasnip" and (kind == "install" or kind == "update") then
-			vim.system({ "make install_jsregexp" }, { cwd = ev.data.path }):wait()
-			print("luasnip make done.")
-		end
-	end,
-})
-
-vim.pack.add({ { src = "https://github.com/L3MON4D3/LuaSnip", version = vim.version.range("^2.0.0") } })
-local ok, ls = pcall(require, "luasnip")
-
-if ok then
-	vim.keymap.set({ "i" }, "<C-K>", function()
-		ls.expand()
-	end, { silent = true })
-	vim.keymap.set({ "i", "s" }, "<C-L>", function(fallback)
-		if ls.locally_jumpable() then
-			ls.jump(1)
-		else
-			local key = vim.api.nvim_replace_termcodes("<C-L>", true, false, true)
-			vim.api.nvim_feedkeys(key, "n", false)
-		end
-	end, { silent = true })
-	vim.keymap.set({ "i", "s" }, "<C-J>", function()
-		if ls.locally_jumpable() then
-			ls.jump(-1)
-		else
-			local key = vim.api.nvim_replace_termcodes("<C-J>", true, false, true)
-			vim.api.nvim_feedkeys(key, "n", false)
-		end
-	end, { silent = true })
-
-	vim.keymap.set({ "i", "s" }, "<C-E>", function()
-		if ls.choice_active() then
-			ls.change_choice(1)
-		else
-			local key = vim.api.nvim_replace_termcodes("<C-E>", true, false, true)
-			vim.api.nvim_feedkeys(key, "n", false)
-		end
-	end, { silent = true })
-
-	require("luasnip.loaders.from_lua").load({ paths = vim.fs.joinpath(vim.fn.stdpath("config"), "lua", "snippets") })
-else
-	print("plugin luasnip missing")
-end

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

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

@@ -11,38 +11,14 @@ end
 
 local set = vim.keymap.set
 
-set("n", "<leader>ea", function()
+set("n", "<leader><space>", function()
+	Snacks.picker.smart()
+end, { desc = "Smart Find Files" })
+
+set("n", "<leader>e", function()
 	Snacks.explorer()
 end, { desc = "File Explorer" })
 
-set("n", "<leader>ga", function()
-	Snacks.lazygit()
-end, { desc = "Lazygit" })
-
-set("n", "<leader>gh", function()
-	Snacks.picker.git_diff()
-end, { desc = "Git Diff (Hunks)" })
-
-set("n", "<leader>gl", function()
-	Snacks.picker.git_log_line()
-end, { desc = "Git Log Line" })
-
-set("n", "<leader>gL", function()
-	Snacks.picker.git_log()
-end, { desc = "Git Log" })
-
-set("n", "<leader>gr", function()
-	Snacks.lazygit.log_file()
-end, { desc = "Git Log File (reflog)" })
-
-set({ "n", "v" }, "<leader>gw", function()
-	Snacks.picker.grep_word()
-end, { desc = "Grep Visual Selection or Word" })
-
-set({ "n", "v" }, "<leader>gx", function()
-	Snacks.gitbrowse()
-end, { desc = "Git Browse" })
-
 set("n", "<leader>xr", function()
 	Snacks.picker.recent()
 end, { desc = "Recent files" })
@@ -51,11 +27,51 @@ set("n", "<leader>xR", function()
 	Snacks.picker.resume()
 end, { desc = "Resume" })
 
+set("n", "<leader>p", function()
+	Snacks.picker.projects()
+end, { desc = "Projects" })
+
+set({ "n", "v" }, "<leader>xB", function()
+	Snacks.gitbrowse()
+end, { desc = "Git Browse" })
+
+set("n", "<leader>gl", 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>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", "v" }, "<leader>o", function()
+	Snacks.picker.grep_word()
+end, { desc = "Grep Visual Selection or Word" })
+
+set("n", "<leader>gg", function()
+	Snacks.lazygit()
+end, { desc = "Lazygit" })
+
+set("n", "<leader>gL", function()
+	Snacks.lazygit.log_file()
+end, { desc = "Git Log File" })
+
 set("n", "<leader>U", function()
 	Snacks.picker.undo()
 end, { desc = "Undo History" })
 
-set("n", "<leader>xC", function()
+set("n", "<leader>xs", function()
 	Snacks.picker.colorschemes()
 end, { desc = "Colorschemes" })
 
@@ -67,6 +83,14 @@ set("n", "<leader>N", function()
 	Snacks.picker.notifications()
 end, { desc = "Notifications" })
 
+set("n", "<leader>xC", function()
+	Snacks.picker.commands()
+end, { desc = "Commands" })
+
+set("n", "<leader>xc", function()
+	Snacks.picker.command_history()
+end, { desc = "Command History" })
+
 set("n", "<leader>$", function()
 	Snacks.rename.rename_file()
 end, { desc = "Rename File" })

nvim/.config/nvim/lua/plugins/telescope.lua

@@ -3,7 +3,7 @@ vim.api.nvim_create_autocmd("PackChanged", {
 	callback = function(ev)
 		local name, kind = ev.data.spec.name, ev.data.kind
 		if name == "telescope-fzf-native.nvim" and (kind == "install" or kind == "update") then
-			vim.system({ "make" }, { cwd = ev.data.path }):wait()
+			vim.system({ "make" }, { cwd = ev.data.path })
 			print("telescope-fzf-native make done.")
 		end
 	end,
@@ -30,64 +30,40 @@ if ok then
 	set("n", "<leader><space>", function()
 		require("telescope-frecency").start()
 	end, { desc = "Telescope frecency" })
-	set("n", "<leader>;", function()
-		require("telescope-frecency").start({ workspace = "CWD" })
-	end, { desc = "Telescope frecency" })
 	set("n", "<leader>b", builtin.buffers, { desc = "Telescope buffers" })
-	set("n", "<leader>cc", builtin.commands, { desc = "Telescope commands" })
+	set("n", "<leader>f", builtin.git_files, { desc = "Telescope git files" })
-	set("n", "<leader>ch", builtin.command_history, { desc = "Telescope command history" })
-	set("n", "<leader>cH", builtin.highlights, { desc = "Telescope highlights" })
-	set("n", "<leader>da", builtin.diagnostics, { desc = "Telescope diagnostics" })
-	set("n", "<leader>ec", function()
-		builtin.find_files({ cwd = vim.fn.stdpath("config") })
-	end, { desc = "Telescope nvim config files" })
-	set("n", "<leader>ep", function()
-		builtin.find_files({ cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "site") })
-	end, { desc = "Telescope find files" })
-	set("n", "<leader>fa", builtin.git_files, { desc = "Telescope nvim package files" })
-	set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
-	set("n", "<leader>fh", function()
-		builtin.find_files({ hidden = true })
-	end, { desc = "Telescope find files (hidden)" })
-	set("n", "<leader>gB", builtin.git_branches, { desc = "Telescope git branches" })
-	set("n", "<leader>gc", builtin.git_bcommits, { desc = "Telescope git buffer commits" })
-	set("n", "<leader>gC", builtin.git_commits, { desc = "Telescope git commits" })
-	set("n", "<leader>gs", builtin.git_status, { desc = "Telescope git status" })
-	set("n", "<leader>gS", builtin.git_stash, { desc = "Telescope git stash" })
-	set("n", "<leader>ha", builtin.help_tags, { desc = "Telescope help tags" })
-	set("n", "<leader>hk", builtin.keymaps, { desc = "Telescope keymaps" })
 	set("n", "<leader>l", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" })
 	set("n", "<leader>L", function()
 		builtin.live_grep({ grep_open_files = true })
 	end, { desc = "Telescope grep open files" })
+	set("n", "<leader>s", function()
+		builtin.live_grep({ command = "git grep" })
+	end, { desc = "Telescope grep open files" })
+	set("n", "<leader>d", builtin.diagnostics, { desc = "Telescope diagnostics" })
+	set("n", "<leader>f", builtin.git_files, { desc = "Telescope git files" })
+	set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
+	set("n", "<leader>gB", builtin.git_branches, { desc = "Telescope git branches" })
+	set("n", "<leader>gc", builtin.git_bcommits, { desc = "Telescope git buffer commits" })
+	set("n", "<leader>gC", builtin.git_commits, { desc = "Telescope git commits" })
+	set("n", "<leader>gs", builtin.git_status, { desc = "Telescope git status" })
+	set("n", "<leader>h", builtin.help_tags, { desc = "Telescope help tags" })
+	set("n", "<leader>H", builtin.keymaps, { desc = "Telescope keymaps" })
+	set("n", "<leader>xH", builtin.highlights, { desc = "Telescope highlights" })
 	set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" })
 	set("n", "<leader>M", builtin.man_pages, { desc = "Telescope man pages" })
 	set("n", "<leader>o", builtin.oldfiles, { desc = "Telescope oldfiles" })
-	set("n", "<leader>qa", builtin.quickfix, { desc = "Telescope quickfix" })
+	set("n", "<leader>qq", builtin.quickfix, { desc = "Telescope quickfix" })
 	set("n", "<leader>qh", builtin.quickfixhistory, { desc = "Telescope quickfix history" })
 	set("n", "<leader>ql", builtin.loclist, { desc = "Telescope loclist" })
 	set("n", "<leader>r", builtin.resume, { desc = "Telescope resume" })
 	set("n", "<leader>t", builtin.treesitter, { desc = "Telescope treesitter symbols" })
 	set("n", "<leader>R", builtin.registers, { desc = "Telescope registers" })
-	set("n", "<leader>sa", function()
+	set("n", "<leader>s", function()
 		require("git_grep").live_grep()
-	end, { desc = "Telescope git live grep" })
+	end, { desc = "Telescope git grep" })
 	set("n", "<leader>S", builtin.live_grep, { desc = "Telescope live grep" })
-	set("n", "<leader>sh", builtin.search_history, { desc = "Telescope search history" })
+	set("n", "<leader>w", builtin.lsp_document_symbols, { desc = "Telescope document symbols" })
-	set("n", "<leader>so", function()
+	set("n", "<leader>W", builtin.lsp_workspace_symbols, { desc = "Telescope workspace symbols" })
-		builtin.grep_string({ grep_open_files = true })
-	end, { desc = "Telescope grep open files" })
-	set({ "n", "v" }, "<leader>sw", function()
-		require("git_grep").grep()
-	end, { desc = "Telescope git grep word" })
-	set("n", "<leader>wd", builtin.lsp_document_symbols, { desc = "Telescope document symbols" })
-	set("n", "<leader>wp", builtin.lsp_workspace_symbols, { desc = "Telescope workspace symbols" })
-	set("n", "<leader>ws", function()
-		require("git_grep").workspace_live_grep()
-	end, { desc = "Telescope workspace git live grep" })
-	set("n", "<leader>wy", function()
-		require("git_grep").workspace_grep()
-	end, { desc = "Telescope workspace git grep word" })
 	set("n", "<leader>:", builtin.builtin, { desc = "Telescope builtin" })
 
 	set("n", "gd", builtin.lsp_definitions, { desc = "Goto Definition" })

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/lua/snippets/go.lua

@@ -1,43 +0,0 @@
-return {
-	s(
-		"ife",
-		fmt(
-			[[
-			if err != nil {
-				<>
-			}
-			]],
-			{
-				i(0),
-			},
-			{ delimiters = "<>" }
-		)
-	),
-
-	s(
-		"ifse",
-		fmt(
-			[[
-			if <><>err = <>; err != nil {
-				<>
-			}
-			]],
-			{
-				i(1),
-				f(function(args)
-					local a = args[1][1]
-					if string.sub(a, -2) == ", " or a == "" then
-						return ""
-					elseif string.sub(a, -1) == "," then
-						return " "
-					else
-						return ", "
-					end
-				end, { 1 }),
-				i(2),
-				i(0),
-			},
-			{ delimiters = "<>" }
-		)
-	),
-}

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

@@ -1,10 +1,5 @@
 {
   "plugins": {
-    "LuaSnip": {
-      "rev": "5a1e39223db9a0498024a77b8441169d260c8c25",
-      "src": "https://github.com/L3MON4D3/LuaSnip",
-      "version": "2.0.0 - 3.0.0"
-    },
     "arrow.nvim": {
       "rev": "6e0f726f55f99332dd726a53effd6813786b6d49",
       "src": "https://github.com/otavioschwanck/arrow.nvim"
@@ -21,14 +16,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"
-    },
     "multicursor.nvim": {
       "rev": "993c6eda70077c5619388900dcffefff73b40c96",
       "src": "https://github.com/jake-stewart/multicursor.nvim",
@@ -65,10 +52,6 @@
       "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"
@@ -90,10 +73,6 @@
       "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/.luarc.json

@@ -1,5 +0,0 @@
-{
-	"workspace.library" : [
-		"/usr/local/share/oxwm"
-	]
-}

oxwm/.config/oxwm/config.lua

@@ -1,321 +0,0 @@
----@meta
-
----Load type definitions for LSP
----@module 'oxwm'
-
--- Modifier key: "Mod4" is the Super/Windows key, "Mod1" is Alt
-local modkey = "Mod4"
-
--- Terminal emulator command (defaults to alacritty)
-local terminal = "st"
-
-local colors
-local f = io.open(os.getenv("HOME") .. "/.lightmode")
-if f ~= nil then
-	io.close(f)
-	colors = require("light")
-else
-	colors = require("dark")
-end
-os.execute("hsetroot -solid '" .. colors.bg .. "'")
-
--- Workspace tags - can be numbers, names, or icons (requires a Nerd Font)
-local tags = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }
-
--- Font for the status bar (use "fc-list" to see available fonts)
-local bar_font = "monospace:style=Bold:size=10"
-
--- Define your blocks
--- Similar to widgets in qtile, or dwmblocks
-local blocks = {
-	oxwm.bar.block.ram({
-		format = "Ram: {used}/{total} GB",
-		interval = 5,
-		color = colors.light_blue,
-		underline = false,
-	}),
-	oxwm.bar.block.static({
-		text = " │  ",
-		interval = 999999999,
-		color = colors.lavender,
-		underline = false,
-	}),
-	oxwm.bar.block.shell({
-		format = "{}",
-		command = "uname -r",
-		interval = 999999999,
-		color = colors.red,
-		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,
-		color = colors.lavender,
-		underline = false,
-	}),
-	oxwm.bar.block.datetime({
-		format = "{}",
-		date_format = "%a, %b %d - %H:%M",
-		interval = 1,
-		color = colors.cyan,
-		underline = false,
-	}),
-}
-
--------------------------------------------------------------------------------
--- Basic Settings
--------------------------------------------------------------------------------
-oxwm.set_terminal(terminal)
-oxwm.set_modkey(modkey) -- This is for Mod + mouse binds, such as drag/resize
-oxwm.set_tags(tags)
-
--------------------------------------------------------------------------------
--- Layouts
--------------------------------------------------------------------------------
--- Set custom symbols for layouts (displayed in the status bar)
--- Available layouts: "tiling", "normie" (floating), "grid", "monocle", "tabbed"
-oxwm.set_layout_symbol("tiling", "[T]")
-oxwm.set_layout_symbol("normie", "[F]")
-oxwm.set_layout_symbol("tabbed", "[=]")
-
--------------------------------------------------------------------------------
--- Appearance
--------------------------------------------------------------------------------
--- Border configuration
-
--- Width in pixels
-oxwm.border.set_width(3)
--- Color of focused window border
-oxwm.border.set_focused_color(colors.orange)
--- Color of unfocused window borders
-oxwm.border.set_unfocused_color(colors.grey)
-
--- Smart Enabled = No border if 1 window
-oxwm.gaps.set_smart(true)
--- Inner gaps (horizontal, vertical) in pixels
-oxwm.gaps.set_inner(5, 5)
--- Outer gaps (horizontal, vertical) in pixels
-oxwm.gaps.set_outer(5, 5)
-
--------------------------------------------------------------------------------
--- Window Rules
--------------------------------------------------------------------------------
--- Rules allow you to automatically configure windows based on their properties
--- You can match windows by class, instance, title, or role
--- Available properties: floating, tag, fullscreen, etc.
---
--- Common use cases:
--- - Force floating for certain applications (dialogs, utilities)
--- - Send specific applications to specific workspaces
--- - Configure window behavior based on title or class
-
--- Examples (uncomment to use):
-oxwm.rule.add({ instance = "gimp", floating = true })
--- oxwm.rule.add({ class = "Alacritty", tag = 9, focus = true })
--- oxwm.rule.add({ class = "firefox", title = "Library", floating = true })
--- oxwm.rule.add({ class = "firefox", tag = 2 })
--- oxwm.rule.add({ instance = "mpv", floating = true })
-
--- To find window properties, use xprop and click on the window
--- WM_CLASS(STRING) shows both instance and class (instance, class)
-
--------------------------------------------------------------------------------
--- Status Bar Configuration
--------------------------------------------------------------------------------
--- Font configuration
-oxwm.bar.set_font(bar_font)
-
--- Set your blocks here (defined above)
-oxwm.bar.set_blocks(blocks)
-
--- Bar color schemes (for workspace tag display)
--- Parameters: foreground, background, border
-
--- Unoccupied tags
-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.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
--------------------------------------------------------------------------------
--- Keybindings are defined using oxwm.key.bind(modifiers, key, action)
--- Modifiers: {"Mod4"}, {"Mod1"}, {"Shift"}, {"Control"}, or combinations like {"Mod4", "Shift"}
--- Keys: Use uppercase for letters (e.g., "Return", "H", "J", "K", "L")
--- Actions: Functions that return actions (e.g., oxwm.spawn(), oxwm.client.kill())
---
--- A list of available keysyms can be found in the X11 keysym definitions.
--- Common keys: Return, Space, Tab, Escape, Backspace, Delete, Left, Right, Up, Down
-
--- Basic window management
-
-oxwm.key.bind({ modkey }, "Return", oxwm.spawn_terminal())
--- Launch Dmenu
-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())
-
--- Keybind overlay - Shows important keybindings on screen
-oxwm.key.bind({ modkey, "Shift" }, "Slash", oxwm.show_keybinds())
-
--- Window state toggles
-oxwm.key.bind({ modkey }, "F", oxwm.client.toggle_fullscreen())
-oxwm.key.bind({ modkey, "Shift" }, "Space", oxwm.client.toggle_floating())
-
--- Layout management
-oxwm.key.bind({ modkey, "Shift" }, "F", oxwm.layout.set("normie"))
-oxwm.key.bind({ modkey }, "T", oxwm.layout.set("tiling"))
-oxwm.key.bind({ modkey }, "G", oxwm.layout.set("grid"))
-oxwm.key.bind({ modkey }, "M", oxwm.layout.set("monocle"))
-oxwm.key.bind({ modkey }, "B", oxwm.layout.set("tabbed"))
-oxwm.key.bind({ modkey, "Shift" }, "S", oxwm.layout.set("scrolling"))
-oxwm.key.bind({ modkey }, "N", oxwm.layout.cycle())
-
-oxwm.key.bind({ modkey, "Shift" }, "T", oxwm.spawn({ "lupan-set-theme", "toggle" }))
-
--- Master area controls (tiling layout)
-
--- Decrease/Increase master area width
-oxwm.key.bind({ modkey }, "H", oxwm.set_master_factor(-5))
-oxwm.key.bind({ modkey }, "L", oxwm.set_master_factor(5))
--- Increment/Decrement number of master windows
-oxwm.key.bind({ modkey }, "I", oxwm.inc_num_master(1))
-oxwm.key.bind({ modkey, "Shift" }, "I", oxwm.inc_num_master(-1))
-
--- Gaps toggle
-oxwm.key.bind({ modkey }, "A", oxwm.toggle_gaps())
-
--- Window manager controls
-oxwm.key.bind({ modkey, "Shift" }, "Q", oxwm.quit())
-oxwm.key.bind({ modkey, "Shift" }, "R", oxwm.restart())
-
--- Focus movement [1 for up in the stack, -1 for down]
-oxwm.key.bind({ modkey }, "J", oxwm.client.focus_stack(1))
-oxwm.key.bind({ modkey }, "K", oxwm.client.focus_stack(-1))
-
--- Window movement (swap position in stack)
-oxwm.key.bind({ modkey, "Shift" }, "J", oxwm.client.move_stack(1))
-oxwm.key.bind({ modkey, "Shift" }, "K", oxwm.client.move_stack(-1))
-
--- Multi-monitor support
-
--- Focus next/previous Monitors
-oxwm.key.bind({ modkey }, "Comma", oxwm.monitor.focus(-1))
-oxwm.key.bind({ modkey }, "Period", oxwm.monitor.focus(1))
--- Move window to next/previous Monitors
-oxwm.key.bind({ modkey, "Shift" }, "Comma", oxwm.monitor.tag(-1))
-oxwm.key.bind({ modkey, "Shift" }, "Period", oxwm.monitor.tag(1))
-
--- Workspace (tag) navigation
--- Switch to workspace N (tags are 0-indexed, so tag "1" is index 0)
-oxwm.key.bind({ modkey }, "1", oxwm.tag.view(0))
-oxwm.key.bind({ modkey }, "2", oxwm.tag.view(1))
-oxwm.key.bind({ modkey }, "3", oxwm.tag.view(2))
-oxwm.key.bind({ modkey }, "4", oxwm.tag.view(3))
-oxwm.key.bind({ modkey }, "5", oxwm.tag.view(4))
-oxwm.key.bind({ modkey }, "6", oxwm.tag.view(5))
-oxwm.key.bind({ modkey }, "7", oxwm.tag.view(6))
-oxwm.key.bind({ modkey }, "8", oxwm.tag.view(7))
-oxwm.key.bind({ modkey }, "9", oxwm.tag.view(8))
-
--- Move focused window to workspace N
-oxwm.key.bind({ modkey, "Shift" }, "1", oxwm.tag.move_to(0))
-oxwm.key.bind({ modkey, "Shift" }, "2", oxwm.tag.move_to(1))
-oxwm.key.bind({ modkey, "Shift" }, "3", oxwm.tag.move_to(2))
-oxwm.key.bind({ modkey, "Shift" }, "4", oxwm.tag.move_to(3))
-oxwm.key.bind({ modkey, "Shift" }, "5", oxwm.tag.move_to(4))
-oxwm.key.bind({ modkey, "Shift" }, "6", oxwm.tag.move_to(5))
-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))
-
--- Combo view (view multiple tags at once) {argos_nothing}
--- Example: Mod+Ctrl+2 while on tag 1 will show BOTH tags 1 and 2
-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))
-
--- Multi tag (window on multiple tags)
--- Example: Mod+Ctrl+Shift+2 puts focused window on BOTH current tag and tag 2
-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))
-
--------------------------------------------------------------------------------
--- Advanced: Keychords
--------------------------------------------------------------------------------
--- Keychords allow you to bind multiple-key sequences (like Emacs or Vim)
--- Format: {{modifiers}, key1}, {{modifiers}, key2}, ...
--- Example: Press Mod4+Space, then release and press T to spawn a terminal
-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.spawn({ "slock" }))
-
--------------------------------------------------------------------------------
--- Autostart
--------------------------------------------------------------------------------
--- Commands to run once when OXWM starts
--- Uncomment and modify these examples, or add your own
-
--- oxwm.autostart("picom")
--- oxwm.autostart("feh --bg-scale ~/wallpaper.jpg")
--- oxwm.autostart("dunst")
--- oxwm.autostart("nm-applet")

oxwm/.config/oxwm/dark.lua

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

oxwm/.config/oxwm/light.lua

@@ -1,14 +0,0 @@
-return {
-	fg = "#1a1b26",
-	red = "#b94646",
-	bg = "#dddddd",
-	black = "#1a1b26",
-	cyan = "#4d8080",
-	green = "#9ece6a",
-	lavender = "#a9b1d6",
-	light_blue = "#7aa2f7",
-	grey = "#bbbbbb",
-	blue = "#6dade3",
-	purple = "#ad8ee6",
-	orange = "#d78042",
-}

shell/.config/shellconfig/aliases.sh

@@ -23,7 +23,6 @@ fi
 
 alias nocaps='setxkbmap pl -option ctrl:nocaps'
 alias fixdp='xrandr --output DP-0 --right-of DP-2'
-alias a4='COLORTERM=truecolor TERM=xterm-256color a4'
 
 tn() {
 	if [ $# -eq 0 ]; then

xsession/.Xresources

@@ -58,95 +58,50 @@ XTerm.vt100.color15:        #ECEFF4
 
 st.font: FiraCode Nerd Font:size=10
 
-! kanagawa wave colors from https://github.com/rebelot/kanagawa.nvim/blob/master/extras/alacritty/kanagawa_wave.toml
+! gruvebox colors from https://github.com/morhetz/gruvbox-contrib/tree/master/deepin-terminal
-! 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
+st.background: #282828
-st.foreground: #dcd7ba
+st.foreground: #d5c4a1
-st.cursorColor: #cbd9d8
+st.cursorColor: #bf8040
-st.reverse-cursor: #e6eaea
+st.reverse-cursor: #1f212e
-st.color0: #090618
+st.color0: #282828
-st.color1: #c34043
+st.color1: #cc241d
-st.color2: #76946a
+st.color2: #98971a
-st.color3: #c0a36e
+st.color3: #d79921
-st.color4: #7e9cd8
+st.color4: #458588
-st.color5: #957fb8
+st.color5: #b16286
-st.color6: #6a9589
+st.color6: #689d6a
-st.color7: #c8c093
+st.color7: #a89984
-st.color8: #727169
+st.color8: #928374
-st.color9: #e82424
+st.color9: #fb4934
-st.color10: #98bb6c
+st.color10: #b8bb26
-st.color11: #e6c384
+st.color11: #fabd2f
-st.color12: #7fb4ca
+st.color12: #83a598
-st.color13: #938aa9
+st.color13: #d3869b
-st.color14: #7aa89f
+st.color14: #8ec07c
-st.color15: #dcd7ba
+st.color15: #ebdbb2
-
-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
+st.background: #fbf1c7
-st.foreground: #3d2b5a
+st.foreground: #3c3836
-st.cursorColor: #643f61
+st.cursorColor: #bf8040
-st.reverse-cursor: #3d2b5a
+st.reverse-cursor: #1f212e
-st.color0: #352c24
+st.color0: #282828
-st.color1: #a5222f
+st.color1: #cc241d
-st.color2: #396847
+st.color2: #98971a
-st.color3: #ac5402
+st.color3: #d79921
-st.color4: #2848a9
+st.color4: #458588
-st.color5: #6e33ce
+st.color5: #b16286
-st.color6: #287980
+st.color6: #689d6a
-st.color7: #f2e9e1
+st.color7: #7c6f64
-st.color8: #534c45
+st.color8: #928374
-st.color9: #b3434e
+st.color9: #9d0006
-st.color10: #577f63
+st.color10: #79740e
-st.color11: #b86e28
+st.color11: #b57614
-st.color12: #4863b6
+st.color12: #076678
-st.color13: #8452d5
+st.color13: #8f3f71
-st.color14: #488d93
+st.color14: #427b58
-st.color15: #f4ece6
+st.color15: #3c3836
-
-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