nvim: support different dark and light colorschemes

WIP zoxide: use z not cd

alacritty/.config/alacritty/alacritty.toml

@@ -1,5 +1,3 @@
-import = ["~/.config/alacritty/dark.toml"]
-
 [colors]
 draw_bold_text_with_bright_colors = false
 
@@ -7,10 +5,13 @@ draw_bold_text_with_bright_colors = false
 TERM = "xterm-256color"
 
 [font]
-size = 9
+size = 10
 
 [font.bold]
 family = "Fira Code Nerd Font"
 
 [font.normal]
 family = "Fira Code Nerd Font"
+
+[general]
+import = ["~/.config/alacritty/dark.toml"]

alacritty/.config/alacritty/dark.toml

@@ -1,26 +1,71 @@
-# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_dark.toml
-# This file is auto-generated by shipwright.nvim
-[colors.bright]
-black = "#403833"
-red = "#E8838F"
-green = "#8BAE68"
-yellow = "#D68C67"
-blue = "#61ABDA"
-magenta = "#CF86C1"
-cyan = "#65B8C1"
-white = "#888F94"
-[colors.cursor]
-cursor = "#C4CACF"
-text = "#1C1917"
-[colors.normal]
-black = "#1C1917"
-blue = "#6099C0"
-cyan = "#66A5AD"
-green = "#819B69"
-magenta = "#B279A7"
-red = "#DE6E7C"
-white = "#B4BDC3"
-yellow = "#B77E64"
+# Nightfox Alacritty Colors
+## name: nightfox
+## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/alacritty.toml
+
 [colors.primary]
-background = "#141D1C"
-foreground = "#9BAFAC"
+background = "#2e3440" # changed
+foreground = "#eceff4" # changed
+dim_foreground = "#aeafb0"
+bright_foreground = "#d6d6d7"
+
+[colors.cursor]
+text = "#cdcecf"
+cursor = "#aeafb0"
+
+[colors.vi_mode_cursor]
+text = "#cdcecf"
+cursor = "#63cdcf"
+
+[colors.search.matches]
+foreground = "#cdcecf"
+background = "#3c5372"
+
+[colors.search.focused_match]
+foreground = "#cdcecf"
+background = "#81b29a"
+
+[colors.footer_bar]
+foreground = "#cdcecf"
+background = "#29394f"
+
+[colors.hints.start]
+foreground = "#cdcecf"
+background = "#f4a261"
+
+[colors.hints.end]
+foreground = "#cdcecf"
+background = "#29394f"
+
+[colors.selection]
+text = "#cdcecf"
+background = "#2b3b51"
+
+[colors.normal]
+black = "#393b44"
+red = "#c94f6d"
+green = "#81b29a"
+yellow = "#dbc074"
+blue = "#719cd6"
+magenta = "#9d79d6"
+cyan = "#63cdcf"
+white = "#dfdfe0"
+
+[colors.bright]
+black = "#575860"
+red = "#d16983"
+green = "#8ebaa4"
+yellow = "#e0c989"
+blue = "#86abdc"
+magenta = "#baa1e2"
+cyan = "#7ad5d6"
+white = "#e4e4e5"
+
+[colors.dim]
+black = "#30323a"
+red = "#ab435d"
+green = "#6e9783"
+yellow = "#baa363"
+blue = "#6085b6"
+magenta = "#8567b6"
+cyan = "#54aeb0"
+white = "#bebebe"

alacritty/.config/alacritty/light.toml

@@ -1,26 +1,30 @@
-# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_light.toml
-# This file is auto-generated by shipwright.nvim
-[colors.bright]
-black = "#CFC1BA"
-red = "#94253E"
-green = "#3F5A22"
-yellow = "#803D1C"
-blue = "#1D5573"
-magenta = "#7B3B70"
-cyan = "#2B747C"
-white = "#4F5E68"
-[colors.cursor]
-cursor = "#2C363C"
-text = "#F0EDEC"
-[colors.normal]
-black = "#F0EDEC"
-blue = "#286486"
-cyan = "#3B8992"
-green = "#4F6C31"
-magenta = "#88507D"
-red = "#A8334C"
-white = "#2C363C"
-yellow = "#944927"
+# Colors (Alabaster)
+# author tonsky
+
 [colors.primary]
-background = "#F0F1F1"
-foreground = "#141D1C"
+background = '#FFFFFF' # changed
+foreground = '#434343'
+
+[colors.cursor]
+text = '#F7F7F7'
+cursor = '#434343'
+
+[colors.normal]
+black = '#000000'
+red = '#AA3731'
+green = '#448C27'
+yellow = '#CB9000'
+blue = '#325CC0'
+magenta = '#7A3E9D'
+cyan = '#0083B2'
+white = '#BBBBBB'
+
+[colors.bright]
+black = '#777777'
+red = '#F05050'
+green = '#60CB00'
+yellow = '#FFBC5D'
+blue = '#007ACC'
+magenta = '#E64CE6'
+cyan = '#00AACB'
+white = '#FFFFFF'

awesome/.config/awesome/rc.lua

@@ -51,7 +51,20 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-local theme = "theme_dark.lua"
+
+local function read_theme()
+  local theme = "theme_dark.lua"
+  local f = io.open(os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
+  if f then
+    if string.find(f:read('*all'), 'light') then
+      theme = 'theme_light.lua'
+    end
+    f:close()
+    return theme
+  end
+end
+
+local theme = read_theme()
 beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
 
 local function set_wallpaper(s)

awesome/.config/awesome/theme_dark.lua

@@ -5,22 +5,22 @@ local dpi                   = xresources.apply_dpi
 
 local theme                    = {}
 
-theme.font                  = "Fira Code Nerd Font 10.5"
+theme.font                     = "Fira Code Nerd Font 10"
 theme.tasklist_disable_icon    = true
 theme.wibar_height             = 40
 
-theme.bg_normal             = "#283538"
-theme.bg_focus              = "#36537d" -- hsl(215deg 40% 35%)
-theme.bg_urgent             = "#d8aeb5"
+theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
+theme.bg_focus                 = "#478575" -- hsl(165deg 30% 40%)
+theme.bg_urgent                = "#5c3d45" -- hsl(345deg 20% 30%)
 theme.bg_minimize              = "#363e49" -- hsl(215deg 15% 25%)
 theme.bg_systray               = theme.bg_normal
-theme.tasklist_bg_focus     = "#263c59" -- hsl(215deg 40% 25%)
+theme.tasklist_bg_focus        = "#3d5c54" -- hsl(165deg 20% 30%)
 
-theme.fg_normal             = "#9ea7aa"
+theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
 theme.fg_focus                 = "#b1babd"
 theme.fg_urgent                = theme.bg_focus
 theme.fg_minimize              = "#8a9294"
-theme.taglist_fg_empty      = "#798082"
+theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
 
 theme.useless_gap              = dpi(1)
 theme.border_width             = dpi(2)
@@ -30,6 +30,11 @@ theme.border_marked         = "#91231c"
 
 theme.bg_wallpaper             = "#424a4c"
 
+theme.hotkeys_font             = theme.font
+theme.hotkeys_description_font = theme.font
+theme.hotkeys_bg               = theme.bg_minimize
+theme.hotkeys_modifiers_fg     = theme.border_focus
+
 -- You can use your own layout icons like this:
 theme.layout_fairh             = themes_path .. "default/layouts/fairhw.png"
 theme.layout_fairv             = themes_path .. "default/layouts/fairvw.png"

awesome/.config/awesome/theme_light.lua

@@ -5,22 +5,22 @@ local dpi                   = xresources.apply_dpi
 
 local theme                    = {}
 
-theme.font                  = "Fira Code Nerd Font 10.5"
+theme.font                     = "Fira Code Nerd Font 10"
 theme.tasklist_disable_icon    = true
 theme.wibar_height             = 40
 
-theme.bg_normal             = "#283538"
-theme.bg_focus              = "#82a0c9" -- hsl(215deg 40% 65%)
-theme.bg_urgent             = "#d0426a"
-theme.bg_minimize           = "#7b899d" -- hsl(215deg 15% 55%)
+theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
+theme.bg_focus                 = "#a9d6ca" -- hsl(165deg 35% 75%)
+theme.bg_urgent                = "#bc8f9b" -- hsl(345deg 25% 65%)
+theme.bg_minimize              = "#62847b" -- hsl(165deg 15% 45%)
 theme.bg_systray               = theme.bg_normal
-theme.tasklist_bg_focus     = "#5e85ba" -- hsl(215deg 40% 55%)
+theme.tasklist_bg_focus        = "#8fbcb1" -- hsl(165deg 25% 65%)
 
-theme.fg_normal             = "#616c6f"
+theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
 theme.fg_focus                 = "#363d3e"
 theme.fg_urgent                = "#e9f2f5"
 theme.fg_minimize              = "#4b5456"
-theme.taglist_fg_empty      = "#566063"
+theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
 
 theme.useless_gap              = dpi(1)
 theme.border_width             = dpi(2)
@@ -30,6 +30,11 @@ theme.border_marked         = "#91231c"
 
 theme.bg_wallpaper             = "#b0bec2"
 
+theme.hotkeys_font             = theme.font
+theme.hotkeys_description_font = theme.font
+theme.hotkeys_bg               = theme.border_normal
+theme.hotkeys_modifiers_fg     = theme.bg_focus
+
 -- You can use your own layout icons like this:
 theme.layout_fairh             = themes_path .. "default/layouts/fairhw.png"
 theme.layout_fairv             = themes_path .. "default/layouts/fairvw.png"

hyprland/.config/hypr/hyprland.conf

@@ -19,7 +19,6 @@ dwindle {
 }
 
 decoration {
-    drop_shadow = true
     rounding = 4
 }
 

nvim/.config/nvim/lazy-lock.json

@@ -1,61 +1,80 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" },
-  "arrow.nvim": { "branch": "master", "commit": "fb8e2cf548f625f6e36cb44d3e65600656924234" },
-  "better-escape.nvim": { "branch": "master", "commit": "bb197e51a91a635deb88630813c3bfc284413697" },
-  "blame.nvim": { "branch": "main", "commit": "59cf695685c1d8d603d99b246cc8d42421937c09" },
-  "bookmarks.nvim": { "branch": "main", "commit": "42371a76cdd786452b537490926b1b6a041672e5" },
-  "ccc.nvim": { "branch": "main", "commit": "790aa881d7f47bc7cc07ad03f1216bb7caf9ef67" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
+  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
+  "blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" },
+  "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
-  "feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" },
-  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
-  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
   "global-note.nvim": { "branch": "main", "commit": "1e0d4bba425d971ed3ce40d182c574a25507115c" },
-  "go.nvim": { "branch": "master", "commit": "841be1c3702c24de677955ca05f2de460484959f" },
-  "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
-  "hierarchy-tree-go.nvim": { "branch": "main", "commit": "9fab9ddefe81edab4a144824955d2d085db3f49a" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
-  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
-  "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" },
-  "lspsaga.nvim": { "branch": "main", "commit": "4ce44df854f447cf0a8972e5387b3aeb5efc798b" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "go.nvim": { "branch": "master", "commit": "0d426e87227dd14584881ecc595c173121456111" },
+  "godoc.nvim": { "branch": "main", "commit": "356f79853dbb3b3e200064367603751895153c29" },
+  "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
+  "hardtime.nvim": { "branch": "main", "commit": "f87c86d1aa1e05dcf3c6ecd97fbfd237e2de0bf5" },
+  "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
+  "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" },
+  "incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "b58cca003d1d3311213d6db0352f58d8e57bfff0" },
+  "lspsaga.nvim": { "branch": "main", "commit": "778d56ff9b387dacd14ae648ed5604394b486f51" },
+  "marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" },
+  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "melange-nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
+  "mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
+  "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
+  "nano-theme.nvim": { "branch": "main", "commit": "0b1158c4911f4bd9d5a1e2e7669ebff893435b64" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "neogit": { "branch": "master", "commit": "9bc4ee89bb42be31a2f0b1da41e36e3e6cab9bbb" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" },
-  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" },
-  "nvim-various-textobjs": { "branch": "main", "commit": "8dbc655f794202f45ab6a1cac1cb323a218ac6a1" },
-  "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" },
-  "oil.nvim": { "branch": "master", "commit": "1fe476daf0b3c108cb8ee1fc1226cc282fa2c9c1" },
-  "onenord.nvim": { "branch": "main", "commit": "057d7048e499b4de7cd4edaff94ec1890242a117" },
-  "orgmode": { "branch": "master", "commit": "e3500add486b17da58ce8e42a0f799161e5761c9" },
-  "persisted.nvim": { "branch": "main", "commit": "1673a295db295999aaf8de7c7a3afd45e0b83a46" },
-  "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope-git-grep.nvim": { "branch": "main", "commit": "814217cb30c076bc5edebe36e525b05a7c9eb4b2" },
+  "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
+  "nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
+  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" },
+  "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
+  "nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
+  "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
+  "onenord.nvim": { "branch": "main", "commit": "babdcc3da92f0c90703bb612a13a58e5f7669287" },
+  "orgmode": { "branch": "master", "commit": "145dce4d2f1bbaed5ff9e353822981b783627b32" },
+  "persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "quicker.nvim": { "branch": "master", "commit": "1798be71cdcb15fb84fa8054148a56e17fd391dc" },
+  "rabbit.nvim": { "branch": "master", "commit": "3a4ce048b8ecc48811d061220d0e86111adda20d" },
+  "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" },
+  "slimline.nvim": { "branch": "main", "commit": "326514876f6e5c051a7a2bf1e926659a74500016" },
+  "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
+  "tardis.nvim": { "branch": "main", "commit": "a6ee00a217529490e79d349b1f1a9cf5831180d3" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-git-grep.nvim": { "branch": "main", "commit": "cdd8215f15843a420b5c8e792395c403136626b6" },
   "telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "tree-sitter-nu": { "branch": "main", "commit": "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c" },
-  "tree-sitter-templ": { "branch": "master", "commit": "0524da9e1f14b9b7d7d6d36608293f85a550b263" },
-  "treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" },
-  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-ReplaceWithRegister": { "branch": "master", "commit": "aad1e8fa31cb4722f20fe40679caa56e25120032" },
-  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "aa003f514ba0b1250ba0f284f031d011bb9e83e8" },
+  "tmux.nvim": { "branch": "main", "commit": "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "tree-sitter-nu": { "branch": "main", "commit": "d5c71a10b4d1b02e38967b05f8de70e847448dd1" },
+  "tree-sitter-templ": { "branch": "master", "commit": "7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad" },
+  "treesj": { "branch": "main", "commit": "6c616638e3aa0087f2c267bb5990115b67105976" },
+  "treewalker.nvim": { "branch": "main", "commit": "43d3250007d2c5a2ed693c1edebf66d66af33407" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
+  "vim-ReplaceWithRegister": { "branch": "master", "commit": "b82bf59e5387b57d0125afb94fd7984061031136" },
+  "vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
-  "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" },
+  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "whaler": { "branch": "main", "commit": "9e0b67e36250cb80e679563adcd4b7451eae26b2" },
-  "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "yankbank-nvim": { "branch": "main", "commit": "ded8f01bd6a7887310e14d463c8aa55eb79ec281" },
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }

nvim/.config/nvim/lua/lupan/autocmd.lua

@@ -16,11 +16,3 @@ vim.api.nvim_create_autocmd('BufWritePre', {
   group = vim.api.nvim_create_augroup('BufWriteFormat', { clear = true }),
   pattern = { '*.go', '*.lua', '*.rs' },
 })
-
-vim.api.nvim_create_autocmd('ColorScheme', {
-  desc = 'Change feline theme',
-  group = vim.api.nvim_create_augroup('ChangeFelineTheme', { clear = true }),
-  callback = function()
-    require('feline').use_theme(vim.o.background)
-  end,
-})

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

@@ -31,7 +31,7 @@ vim.wo.signcolumn = 'yes'
 
 -- Decrease update time
 vim.o.updatetime = 250
-vim.o.timeoutlen = 300
+vim.o.timeout = false
 
 -- Set completeopt to have a better completion experience
 vim.o.completeopt = 'menuone,noselect'
@@ -52,3 +52,5 @@ vim.g.lightspeed_no_default_keymaps = true
 vim.o.cursorline = true
 
 vim.opt.foldcolumn = '1'
+
+vim.opt.laststatus = 3

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

@@ -10,8 +10,6 @@ key('v', '<Space>', '<Nop>', { silent = true })
 key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
-key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
-key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
 key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
 
 -- tabs
@@ -115,10 +113,4 @@ vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasn
 
 -- colors
 
-key('n', '<F6>', function()
-  if vim.o.background == "dark" then
-    vim.o.background = "light"
-  else
-    vim.o.background = "dark"
-  end
-end)
+key('n', '<F6>', function() require('lupan.utils').toggle_color_scheme() end, { desc = 'Toggle background' })

nvim/.config/nvim/lua/lupan/utils.lua

@@ -1,7 +1,15 @@
 local M = {}
 
+local filename = os.getenv('HOME') .. '/.config/alacritty/alacritty.toml'
+
+local colorschemes = nil
+
+function M.set_color_schemes(dark, light)
+  colorschemes = { dark = dark, light = light }
+end
+
 function M.terminalbg()
-  local ok, lines = pcall(io.lines, os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
+  local ok, lines = pcall(io.lines, filename)
   if ok then
     for line in lines do
       if string.find(line, 'light.toml') then
@@ -12,4 +20,34 @@ function M.terminalbg()
   return "dark"
 end
 
+function M.update_color_scheme()
+  vim.o.background = M.terminalbg()
+  if colorschemes then
+    vim.cmd.colorscheme(colorschemes[vim.o.background])
+  end
+end
+
+function M.toggle_color_scheme()
+  if vim.o.background == "dark" then
+    vim.o.background = "light"
+  else
+    vim.o.background = "dark"
+  end
+  if colorschemes then
+    vim.cmd.colorscheme(colorschemes[vim.o.background])
+  end
+end
+
+local w = vim.uv.new_fs_event()
+
+local function watch(fname)
+  w:start(filename, {}, vim.schedule_wrap(function(...)
+    M.update_color_scheme()
+    w:stop()
+    watch(fname)
+  end))
+end
+
+watch(filename)
+
 return M

nvim/.config/nvim/lua/plugins/appearance.lua

@@ -1,9 +1,33 @@
 return {
+  {
+    "ramojus/mellifluous.nvim",
+    branch = "v1",
+  },
   {
     'rmehri01/onenord.nvim',
+  },
+  {
+    'AlexvZyl/nordic.nvim',
+  },
+  {
+    "savq/melange-nvim",
+  },
+  {
+    'ronisbr/nano-theme.nvim',
     config = function()
-      vim.o.background = require('lupan.utils').terminalbg()
-      vim.cmd.colorscheme('onenord')
+      local nano = require('nano-theme.colors')
+      local nano_get = nano.get
+      function nano.get()
+        local t = nano_get()
+        local light = vim.o.background == 'light'
+        if not light then
+          t.nano_strong.fg = '#ECEFF4'
+        end
+        return t
+      end
+
+      require('lupan.utils').set_color_schemes('nano-theme', 'nano-theme')
+      require('lupan.utils').update_color_scheme()
     end
   },
   {

nvim/.config/nvim/lua/plugins/arrow.lua

@@ -1,22 +0,0 @@
-return {
-  {
-    "otavioschwanck/arrow.nvim",
-    opts = {
-      show_icons = true,
-      leader_key = '<leader>;',
-      buffer_leader_key = '<leader>m',
-    },
-    keys = {
-      { "<leader>1", function() require("arrow.persist").go_to(1) end },
-      { "<leader>2", function() require("arrow.persist").go_to(2) end },
-      { "<leader>3", function() require("arrow.persist").go_to(3) end },
-      { "<leader>4", function() require("arrow.persist").go_to(4) end },
-      { "<leader>5", function() require("arrow.persist").go_to(5) end },
-      { "<leader>6", function() require("arrow.persist").go_to(6) end },
-      { "<leader>7", function() require("arrow.persist").go_to(7) end },
-      { "<leader>8", function() require("arrow.persist").go_to(8) end },
-      { "<leader>9", function() require("arrow.persist").go_to(9) end },
-      { "<leader>0", function() require("arrow.persist").go_to(10) end },
-    }
-  }
-}

nvim/.config/nvim/lua/plugins/bookmarks.lua

@@ -1,18 +1,12 @@
 return {
   {
-    "LintaoAmons/bookmarks.nvim",
-    tag = "v0.5.3",                -- optional, pin the plugin at specific version for stability
-    dependencies = {
-      { "stevearc/dressing.nvim" } -- optional: to have the same UI shown in the GIF
-    },
-    event = 'VimEnter',
+    "chentoast/marks.nvim",
+    event = "VeryLazy",
+    config = true,
     keys = {
-      { "mm", "<cmd>BookmarksMark<cr>",          mode = { "n", "v" }, desc = "Mark current line into active BookmarkList." },
-      { "mo", "<cmd>BookmarksGoto<cr>",          mode = { "n", "v" }, desc = "Go to bookmark at current active BookmarkList" },
-      { "ma", "<cmd>BookmarksCommands<cr>",      mode = { "n", "v" }, desc = "Find and trigger a bookmark command." },
-      { "mg", "<cmd>BookmarksGotoRecent<cr>",    mode = { "n", "v" }, desc = "Go to latest visited/created Bookmark" },
-      { "ms", "<cmd>BookmarksSetActiveList<cr>", mode = { "n", "v" }, desc = "Go to latest visited/created Bookmark" },
+      { '<leader>ma', '<cmd>MarksListAll<CR>' },
+      { '<leader>mb', '<cmd>MarksListBuf<CR>' },
+      { '<leader>mg', '<cmd>MarksListGlobal<CR>' },
     },
   },
-  { "nvim-telescope/telescope.nvim", lazy = true },
 }

nvim/.config/nvim/lua/plugins/convenience.lua

@@ -2,6 +2,10 @@ return {
   {
     'folke/which-key.nvim',
     event = 'VimEnter',
+    opts = {
+      preset = 'helix',
+      delay = 1000,
+    },
     config = function(_, opts)
       require('which-key').setup(opts)
 
@@ -22,4 +26,26 @@ return {
       require("better_escape").setup(opts)
     end,
   },
+  {
+    "folke/zen-mode.nvim",
+    opts = {
+      window = { width = 180 },
+      plugins = {
+        tmux = { enabled = true },
+      },
+      on_open = function()
+        vim.opt.laststatus = 1
+        require('incline').disable()
+        vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
+        vim.system({ 'awesome-client', 'client.focus.fullscreen = true' })
+      end,
+      on_close = function()
+        vim.opt.laststatus = 3
+        require('incline').enable()
+        vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
+        vim.system({ 'awesome-client', 'client.focus.fullscreen = false' })
+      end
+    },
+    keys = { { "<leader>z", "<cmd>ZenMode<CR>" } },
+  },
 }

nvim/.config/nvim/lua/plugins/editing.lua

@@ -13,24 +13,82 @@ return {
 
   {
     "kylechui/nvim-surround",
-    version = "*", -- Use for stability; omit to use `main` branch for the latest features
+    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
     event = "VeryLazy",
-    config = function(_, opts)
-      require("nvim-surround").setup(opts)
-    end
+    config = true,
   },
 
   {
     'inkarkat/vim-ReplaceWithRegister',
     keys = {
-      { '<leader>r',  '<Plug>ReplaceWithRegisterOperator' },
-      { '<leader>rr', '<Plug>ReplaceWithRegisterLine' },
-      { '<leader>r',  '<Plug>ReplaceWithRegisterVisual',  mode = 'x' },
+      { 'gp',  '<Plug>ReplaceWithRegisterOperator' },
+      { 'gpp', '<Plug>ReplaceWithRegisterLine' },
+      { 'gp',  '<Plug>ReplaceWithRegisterVisual',  mode = 'x' },
     },
   },
+
   {
-    "chrisgrieser/nvim-various-textobjs",
-    lazy = false,
-    opts = { useDefaultKeymaps = true },
+    'ggandor/leap.nvim',
+    opts = {
+      safe_labels = {},
+    },
+    dependencies = {
+      "tpope/vim-repeat",
+    },
+    keys = {
+      { '\\', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
+      { 'gs', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
+    }
+  },
+
+  {
+    'Wansmer/treesj',
+    dependencies = { 'nvim-treesitter/nvim-treesitter' },
+    opts = {
+      use_default_keymaps = false,
+    },
+    keys = {
+      { '<leader>tg', function() require('treesj').toggle() end, desc = "[T]ree to[g]gle one-line" },
+      { '<leader>tj', function() require('treesj').join() end,   desc = "[T]ree [J]oin one-line" },
+      { '<leader>ts', function() require('treesj').split() end,  desc = "[T]ree [S]plit one-line" },
+    },
+  },
+
+  -- rehighlight search on n or N
+  {
+    'nvimdev/hlsearch.nvim',
+    event = 'BufRead',
+    config = true,
+  },
+
+  {
+    'mizlan/iswap.nvim',
+    event = 'VeryLazy',
+    keys = {
+      { '<leader>cs', '<cmd>ISwapWith<CR>',     desc = 'I[S]wap' },
+      { '<leader>cS', '<cmd>ISwap<CR>',         desc = 'I[S]wapWith' },
+      { '<leader>cn', '<cmd>ISwapNodeWith<CR>', desc = 'ISwap[N]ode' },
+      { '<leader>cN', '<cmd>ISwapNode<CR>',     desc = 'ISwap[N]ode' },
+    },
+  },
+
+  {
+    'aaronik/treewalker.nvim',
+    keys = {
+      { '<leader>ch', '<cmd>Treewalker Left<CR>',     desc = 'Tree Left' },
+      { '<leader>cj', '<cmd>Treewalker Down<CR>',     desc = 'Tree Down' },
+      { '<leader>ck', '<cmd>Treewalker Up<CR>',       desc = 'Tree Up' },
+      { '<leader>cl', '<cmd>Treewalker Right<CR>',    desc = 'Tree Right' },
+      { '<leader>cJ', '<cmd>Treewalker SwapDown<CR>', desc = 'Tree Swap Down' },
+      { '<leader>cK', '<cmd>Treewalker SwapUp<CR>',   desc = 'Tree Swap Up' },
+    },
+  },
+
+  {
+    'echasnovski/mini.nvim',
+    version = '*',
+    config = function()
+      require('mini.ai').setup()
+    end
   },
 }

nvim/.config/nvim/lua/plugins/feline.lua

@@ -1,243 +0,0 @@
-local function feline_config(_, opts)
-  local feline = require('feline')
-
-  local dark_theme = {
-    bg = '#5a605f',
-    bg2 = '#2b3231',
-    black = '#403833',
-    skyblue = '#61abda',
-    cyan = '#65b8c1',
-    fg = '#9bafac',
-    green = '#8bae68',
-    oceanblue = '#6099c0',
-    magenta = '#cf86c1',
-    orange = '#d68c67',
-    red = '#e8838f',
-    violet = '#b279a7',
-    white = '#b4bdc3',
-    yellow = '#b77e64',
-  }
-  feline.add_theme('dark', dark_theme)
-
-  local light_theme = {
-    bg = '#dde4e3',
-    bg2 = '#b3cbc8',
-    black = '#c4b6af',
-    skyblue = '#1d5573',
-    cyan = '#2b747c',
-    fg = '#2c3131',
-    green = '#3f5a22',
-    oceanblue = '#286486',
-    magenta = '#7b3b70',
-    orange = '#803d1c',
-    red = '#94253e',
-    violet = '#88507d',
-    white = '#4f5e68',
-    yellow = '#944927',
-  }
-  feline.add_theme('light', light_theme)
-
-  local statusline = require('arrow.statusline')
-  local vimode = require('feline.providers.vi_mode')
-  local c = {
-    vi_mode = {
-      provider = 'vi_mode',
-      hl = function()
-        return {
-          name = vimode.get_mode_highlight_name(),
-          fg = vimode.get_mode_color(),
-          bg = 'bg2',
-          style = 'bold',
-        }
-      end,
-      left_sep = {
-        str = ' █',
-        always_visible = true,
-        hl = {
-          fg = 'bg2',
-        },
-      },
-      right_sep = {
-        str = '',
-        always_visible = true,
-        hl = {
-          fg = 'bg2',
-        },
-      }
-    },
-    file_info = {
-      provider = 'file_info',
-      hl = {
-        fg = 'fg',
-      },
-      left_sep = {
-        str = '  ',
-      },
-      right_sep = {
-        str = '  ',
-      },
-    },
-    arrow = {
-      provider = function() return statusline.text_for_statusline_with_icons() end,
-      hl = {
-        fg = 'red',
-        style = 'bold',
-      },
-    },
-    file_size = {
-      provider = 'file_size',
-      hl = {
-        fg = 'fg',
-        bg = 'bg2',
-        style = 'bold',
-      },
-      left_sep = {
-        str = '  █',
-        always_visible = true,
-        hl = {
-          fg = 'bg2',
-        },
-      },
-    },
-    line_percentage = {
-      provider = 'line_percentage',
-      hl = {
-        fg = 'fg',
-        bg = 'bg2',
-        style = 'bold',
-      },
-      left_sep = {
-        str = ' │ ',
-        hl = {
-          fg = 'fg',
-          bg = 'bg2',
-        },
-      },
-      right_sep = {
-        str = ' │ ',
-        hl = {
-          fg = 'fg',
-          bg = 'bg2',
-        },
-      },
-    },
-    position = {
-      provider = 'position',
-      hl = {
-        fg = 'fg',
-        bg = 'bg2',
-        style = 'bold',
-      },
-      right_sep = {
-        str = '█ ',
-        always_visible = true,
-        hl = {
-          fg = 'bg2',
-        },
-      }
-    },
-
-    diagnostic_errors = {
-      provider = 'diagnostic_errors',
-      hl = {
-        fg = 'red',
-      },
-    },
-    diagnostic_warnings = {
-      provider = 'diagnostic_warnings',
-      hl = {
-        fg = 'yellow',
-      },
-    },
-    diagnostic_hints = {
-      provider = 'diagnostic_hints',
-      hl = {
-        fg = 'cyan',
-      },
-    },
-    diagnostic_info = {
-      provider = 'diagnostic_info',
-      hl = {
-        fg = 'skyblue',
-      },
-    },
-
-    git_diff_added = {
-      provider = 'git_diff_added',
-      hl = {
-        fg = 'green',
-      },
-    },
-    git_diff_removed = {
-      provider = 'git_diff_removed',
-      hl = {
-        fg = 'red',
-      },
-    },
-    git_diff_changed = {
-      provider = 'git_diff_changed',
-      hl = {
-        fg = 'yellow',
-      },
-    },
-    git_branch = {
-      provider = 'git_branch',
-      hl = {
-        fg = 'fg',
-        bg = 'bg2',
-        style = 'bold',
-      },
-      left_sep = {
-        str = '  █',
-        hl = {
-          fg = 'bg2',
-        },
-      },
-      right_sep = {
-        str = ' ',
-        hl = {
-          fg = 'bg2',
-        },
-      }
-    },
-  }
-
-  local active = {
-    {
-      c.vi_mode,
-      c.file_info,
-      c.arrow,
-      c.file_size,
-      c.line_percentage,
-      c.position,
-      c.diagnostic_errors,
-      c.diagnostic_warnings,
-      c.diagnostic_info,
-      c.diagnostic_hints,
-    },
-    {
-      c.git_diff_added,
-      c.git_diff_removed,
-      c.git_diff_changed,
-      c.git_branch,
-    },
-  }
-
-  local inactive = {
-    {
-      c.file_info,
-    },
-    {},
-  }
-
-  opts.components = { active = active, inactive = inactive }
-  feline.setup(opts)
-  feline.use_theme(require('lupan.utils').terminalbg())
-end
-
-return {
-  -- Statusline
-  'freddiehaddad/feline.nvim',
-  opts = {},
-  config = feline_config,
-}

nvim/.config/nvim/lua/plugins/file-explorer.lua

@@ -0,0 +1,13 @@
+return {
+  {
+    'stevearc/oil.nvim',
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    opts = {
+      default_file_explorer = true,
+      delete_to_trash = true,
+    },
+    keys = {
+      { "<leader>-", "<cmd>Oil<CR>", desc = "Open parent directory" },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/godoc.lua

@@ -0,0 +1,24 @@
+return {
+  {
+    'fredrikaverpil/godoc.nvim',
+    version = '*',
+    dependencies = {
+      { 'nvim-telescope/telescope.nvim' },
+      {
+        'nvim-treesitter/nvim-treesitter',
+        opts = {
+          ensure_installed = { 'go' },
+        },
+      },
+    },
+    event = 'VeryLazy',
+    cmd = 'GoDoc',
+    keys = {
+      { '<leader>gd', '<cmd>GoDoc<CR>', desc = '[G]o[D]oc' },
+    },
+    build = 'go install github.com/lotusirous/gostdsym/stdsym@latest',
+    opts = {
+      picker = { type = 'telescope' },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/hardtime.lua

@@ -0,0 +1,7 @@
+return {
+  {
+    "m4xshen/hardtime.nvim",
+    dependencies = { "MunifTanjim/nui.nvim" },
+    opts = {}
+  },
+}

nvim/.config/nvim/lua/plugins/http.lua

@@ -0,0 +1,16 @@
+return {
+  {
+    "rest-nvim/rest.nvim",
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter",
+      opts = function(_, opts)
+        opts.ensure_installed = opts.ensure_installed or {}
+        table.insert(opts.ensure_installed, "http")
+      end,
+    },
+    ft = 'http',
+    keys = {
+      { '<leader>S', '<cmd>Rest run<CR>', ft = 'http' },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/init.lua

@@ -1,51 +0,0 @@
-return {
-  {
-    'crusj/hierarchy-tree-go.nvim',
-    dependencies = 'neovim/nvim-lspconfig',
-    lazy = true,
-  },
-
-  {
-    'ggandor/leap.nvim',
-    opts = {
-      safe_labels = {},
-    },
-    dependencies = {
-      "tpope/vim-repeat",
-    },
-    keys = {
-      { 'gs', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
-      { 'gS', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
-    }
-  },
-
-  {
-    "folke/trouble.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-  },
-
-  {
-    'stevearc/oil.nvim',
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    opts = {
-      default_file_explorer = true,
-      delete_to_trash = true,
-    },
-    keys = {
-      { "-", "<cmd>Oil<CR>", desc = "Open parent directory" },
-    },
-  },
-
-  {
-    'Wansmer/treesj',
-    dependencies = { 'nvim-treesitter/nvim-treesitter' },
-    opts = {
-      use_default_keymaps = false,
-    },
-    keys = {
-      { '<leader>tg', function() require('treesj').toggle() end, desc = "[T]ree to[g]gle one-line" },
-      { '<leader>tj', function() require('treesj').join() end,   desc = "[T]ree [J]oin one-line" },
-      { '<leader>ts', function() require('treesj').split() end,  desc = "[T]ree [S]plit one-line" },
-    },
-  },
-}

nvim/.config/nvim/lua/plugins/line.lua

@@ -0,0 +1,25 @@
+vim.opt.fillchars = {
+  stl = "─",
+}
+
+return {
+  {
+    "sschleemilch/slimline.nvim",
+    opts = {
+      spaces = {
+        components = "─",
+        left = "─",
+        right = "─",
+      },
+    },
+  },
+
+  {
+    'b0o/incline.nvim',
+    config = function()
+      require('incline').setup()
+    end,
+    -- Optional: Lazy load Incline
+    event = 'VeryLazy',
+  },
+}

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

@@ -120,6 +120,7 @@ return {
       }
     end,
   },
+
   {
     'nvimdev/lspsaga.nvim',
     dependencies = {
@@ -154,4 +155,19 @@ return {
       vim.keymap.set({ 'n', 't' }, '<C-_>', '<cmd>Lspsaga term_toggle<CR>', { desc = "[L]spsaga [T]erm toggle" })
     end,
   },
+
+  {
+    "folke/trouble.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    opts = {},
+    cmd = 'Trouble'
+  },
+
+  {
+    "ray-x/lsp_signature.nvim",
+    event = "InsertEnter",
+    opts = {
+      -- cfg options
+    },
+  }
 }

nvim/.config/nvim/lua/plugins/quicker.lua

@@ -0,0 +1,7 @@
+return {
+  'stevearc/quicker.nvim',
+  event = "FileType qf",
+  ---@module "quicker"
+  ---@type quicker.SetupOptions
+  opts = {},
+}

nvim/.config/nvim/lua/plugins/rabbit.lua

@@ -0,0 +1,36 @@
+local function rabbit_select(n)
+  require('rabbit').Switch('harpoon').func.select(n)
+end
+
+return {
+  'VoxelPrismatic/rabbit.nvim',
+  event = 'VeryLazy',
+  opts = {
+    window = {
+      float = 'center',
+      plugin_name_position = 'title',
+    },
+    default_keys = {
+      open = { '-', '<leader>;' },
+    },
+    plugin_opts = {
+      history = { switch = ';' },
+      harpoon = { switch = 'f' },
+    },
+    colors = {
+      file = '#EBCB8B',
+    },
+  },
+  keys = {
+    { '<leader>1', function() rabbit_select(1) end },
+    { '<leader>2', function() rabbit_select(2) end },
+    { '<leader>3', function() rabbit_select(3) end },
+    { '<leader>4', function() rabbit_select(4) end },
+    { '<leader>5', function() rabbit_select(5) end },
+    { '<leader>6', function() rabbit_select(6) end },
+    { '<leader>7', function() rabbit_select(7) end },
+    { '<leader>8', function() rabbit_select(8) end },
+    { '<leader>9', function() rabbit_select(9) end },
+    { '<leader>0', function() rabbit_select(10) end },
+  },
+}

nvim/.config/nvim/lua/plugins/tardis.lua

@@ -0,0 +1,5 @@
+return {
+  'fredeeb/tardis.nvim',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  config = true,
+}

nvim/.config/nvim/lua/plugins/tmux.lua

@@ -0,0 +1,25 @@
+return {
+  {
+    'aserowy/tmux.nvim',
+    opts = {
+      navigation = {
+        enable_default_keybindings = false,
+      },
+      resize = {
+        enable_default_keybindings = false,
+      },
+    },
+    keys = {
+      { '<M-h>', [[<cmd>lua require("tmux").move_left()<cr>]] },
+      { '<M-j>', [[<cmd>lua require("tmux").move_bottom()<cr>]] },
+      { '<M-k>', [[<cmd>lua require("tmux").move_top()<cr>]] },
+      { '<M-l>', [[<cmd>lua require("tmux").move_right()<cr>]] },
+      { '<M-n>', [[<cmd>lua require("tmux").next_window()<cr>]] },
+      { '<M-p>', [[<cmd>lua require("tmux").previous_window()<cr>]] },
+      { '<M-H>', [[<cmd>lua require("tmux").resize_left()<cr>]] },
+      { '<M-J>', [[<cmd>lua require("tmux").resize_bottom()<cr>]] },
+      { '<M-K>', [[<cmd>lua require("tmux").resize_top()<cr>]] },
+      { '<M-L>', [[<cmd>lua require("tmux").resize_right()<cr>]] },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/toggleterm.lua

@@ -0,0 +1,9 @@
+return {
+  'akinsho/toggleterm.nvim',
+  version = '*',
+  config = true,
+  keys = {
+    { '<F2>',  '<cmd>ToggleTerm size=25<CR>', mode = { 'n', 'i', 't', }, },
+    { '<C-w>', [[<C-\><C-n><C-w>]],           mode = 't' },
+  }
+}

nvim/.config/nvim/lua/plugins/treesitter.lua

@@ -15,7 +15,7 @@ return {
 
       ---@diagnostic disable-next-line: missing-fields
       require('nvim-treesitter.configs').setup {
-        ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'org', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
+        ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
         auto_install = false,
         highlight = {
           enable = true,

nvim/.config/nvim/lua/plugins/yankbank.lua

@@ -0,0 +1,12 @@
+return {
+  "ptdewey/yankbank-nvim",
+  dependencies = "kkharji/sqlite.lua",
+  config = function()
+    require('yankbank').setup({
+      persist_type = "sqlite",
+    })
+  end,
+  keys = {
+    { "<leader>b", "<cmd>YankBank<CR>", desc = "Yank[B]ank" },
+  },
+}

shell/.zshrc

@@ -19,13 +19,19 @@ plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-syntax-highlighting"
 plug "MichaelAquilina/zsh-you-should-use"
 plug "zsh-users/zsh-history-substring-search"
-plug "agkozak/zsh-z"
+
+if which zoxide > /dev/null; then
+    eval "$(zoxide init zsh)"
+else
+    plug "agkozak/zsh-z"
+    ZSHZ_ECHO=1
+    setopt autocd
+fi
 
 ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
 ZSH_HIGHLIGHT_STYLES[comment]=fg=blue
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=bg=magenta,fg=black,bold
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=bg=red,fg=black,bold
-ZSHZ_ECHO=1
 
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
@@ -66,7 +72,6 @@ setopt share_history
 
 # Convenience.
 
-setopt autocd
 bindkey -M vicmd '^[h' run-help
 bindkey -M viins '^[h' run-help
 

tmux/.tmux.conf

@@ -3,15 +3,6 @@ set -g status-fg colour7
 
 set -sg escape-time 0
 
-bind-key -n M-j select-pane -D
-bind-key -n M-k select-pane -U
-bind-key -n M-h select-pane -L
-bind-key -n M-l select-pane -R
-bind-key -n M-J switch-client -n
-bind-key -n M-K switch-client -p
-bind-key -n M-H previous-window
-bind-key -n M-L next-window
-
 bind-key -n M-1 select-window -t 1
 bind-key -n M-2 select-window -t 2
 bind-key -n M-3 select-window -t 3
@@ -56,3 +47,39 @@ set -g status-left " #[fg=green]#[bg=green]#[fg=black] #H #[bg=default]#[fg=g
 set -g status-left-length 50
 set -g status-right "#[fg=green]#[bg=green]#[fg=black] %H:%M #[bg=default]#[fg=green] "
 set-window-option -g window-status-current-format '#[fg=green]#[bg=green]#[fg=black] #I:#W#F #[fg=green]#[bg=black]'
+
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?\.?(view|n?vim?x?)(-wrapped)?(diff)?$'"
+
+bind-key -n 'M-h' if-shell "$is_vim" 'send-keys M-h' 'select-pane -L'
+bind-key -n 'M-j' if-shell "$is_vim" 'send-keys M-j' 'select-pane -D'
+bind-key -n 'M-k' if-shell "$is_vim" 'send-keys M-k' 'select-pane -U'
+bind-key -n 'M-l' if-shell "$is_vim" 'send-keys M-l' 'select-pane -R'
+bind-key -n 'M-n' if-shell "$is_vim" 'send-keys M-n' 'select-window -n'
+bind-key -n 'M-p' if-shell "$is_vim" 'send-keys M-p' 'select-window -p'
+
+bind-key -T copy-mode-vi 'M-h' select-pane -L
+bind-key -T copy-mode-vi 'M-j' select-pane -D
+bind-key -T copy-mode-vi 'M-k' select-pane -U
+bind-key -T copy-mode-vi 'M-l' select-pane -R
+bind-key -T copy-mode-vi 'M-n' select-window -n
+bind-key -T copy-mode-vi 'M-p' select-window -p
+
+bind -n 'M-H' if-shell "$is_vim" 'send-keys M-H' 'resize-pane -L 1'
+bind -n 'M-J' if-shell "$is_vim" 'send-keys M-J' 'resize-pane -D 1'
+bind -n 'M-K' if-shell "$is_vim" 'send-keys M-K' 'resize-pane -U 1'
+bind -n 'M-L' if-shell "$is_vim" 'send-keys M-L' 'resize-pane -R 1'
+
+bind-key -T copy-mode-vi M-H resize-pane -L 1
+bind-key -T copy-mode-vi M-J resize-pane -D 1
+bind-key -T copy-mode-vi M-K resize-pane -U 1
+bind-key -T copy-mode-vi M-L resize-pane -R 1
+
+bind -n 'C-M-h' if-shell "$is_vim" 'send-keys C-M-h' 'swap-pane -s "{left-of}"'
+bind -n 'C-M-j' if-shell "$is_vim" 'send-keys C-M-j' 'swap-pane -s "{down-of}"'
+bind -n 'C-M-k' if-shell "$is_vim" 'send-keys C-M-k' 'swap-pane -s "{up-of}"'
+bind -n 'C-M-l' if-shell "$is_vim" 'send-keys C-M-l' 'swap-pane -s "{right-of}"'
+
+bind-key -T copy-mode-vi C-M-h swap-pane -s "{left-of}"
+bind-key -T copy-mode-vi C-M-j swap-pane -s "{down-of}"
+bind-key -T copy-mode-vi C-M-k swap-pane -s "{up-of}"
+bind-key -T copy-mode-vi C-M-l swap-pane -s "{right-of}"

xsession/.xsession

@@ -7,6 +7,7 @@ fi
 xset b off
 xrandr --auto
 xrandr --output HDMI1 --right-of DP1
+xrandr --output DP-0 --left-of DP-2
 xrdb -merge ~/.Xresources
 setxkbmap pl -option ctrl:nocaps