alacritty/.config/alacritty/dark.toml

@@ -1,71 +1,31 @@
-# Nightfox Alacritty Colors
+# Colors (Gruvbox dark)
-## name: nightfox
-## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/alacritty.toml
 
+# Default colors
 [colors.primary]
-background = "#2e3440" # changed
+# hard contrast background = = '#1d2021'
-foreground = "#eceff4" # changed
+# background = '#282828'
-dim_foreground = "#aeafb0"
+# soft contrast background = = '#32302f'
-bright_foreground = "#d6d6d7"
+background = '#292522'
-
+foreground = '#ebdbb2'
-[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"
 
+# Normal colors
 [colors.normal]
-black = "#393b44"
+black   = '#282828'
-red = "#c94f6d"
+red     = '#cc241d'
-green = "#81b29a"
+green   = '#98971a'
-yellow = "#dbc074"
+yellow  = '#d79921'
-blue = "#719cd6"
+blue    = '#458588'
-magenta = "#9d79d6"
+magenta = '#b16286'
-cyan = "#63cdcf"
+cyan    = '#689d6a'
-white = "#dfdfe0"
+white   = '#a89984'
 
+# Bright colors
 [colors.bright]
-black = "#575860"
+black   = '#928374'
-red = "#d16983"
+red     = '#fb4934'
-green = "#8ebaa4"
+green   = '#b8bb26'
-yellow = "#e0c989"
+yellow  = '#fabd2f'
-blue = "#86abdc"
+blue    = '#83a598'
-magenta = "#baa1e2"
+magenta = '#d3869b'
-cyan = "#7ad5d6"
+cyan    = '#8ec07c'
-white = "#e4e4e5"
+white   = '#ebdbb2'
-
-[colors.dim]
-black = "#30323a"
-red = "#ab435d"
-green = "#6e9783"
-yellow = "#baa363"
-blue = "#6085b6"
-magenta = "#8567b6"
-cyan = "#54aeb0"
-white = "#bebebe"

alacritty/.config/alacritty/light.toml

@@ -2,7 +2,7 @@
 # author tonsky
 
 [colors.primary]
-background = '#FFFFFF' # changed
+background = '#F1F1F1' # changed
 foreground = '#434343'
 
 [colors.cursor]

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

@@ -32,7 +32,6 @@
   "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": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
   "nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
@@ -42,6 +41,7 @@
   "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
   "nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
+  "nvim-various-textobjs": { "branch": "main", "commit": "5d9c77cc79a53c168679d36ac66ce2ae44c3e91a" },
   "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
   "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
   "onenord.nvim": { "branch": "main", "commit": "babdcc3da92f0c90703bb612a13a58e5f7669287" },

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

@@ -113,4 +113,10 @@ vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasn
 
 -- colors
 
-key('n', '<F6>', function() require('lupan.utils').toggle_color_scheme() end, { desc = 'Toggle background' })
+key('n', '<F6>', function()
+  if vim.o.background == "dark" then
+    vim.o.background = "light"
+  else
+    vim.o.background = "dark"
+  end
+end)

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

@@ -2,12 +2,6 @@ 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, filename)
   if ok then
@@ -20,29 +14,11 @@ 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()
+    vim.o.background = M.terminalbg()
     w:stop()
     watch(fname)
   end))

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

@@ -11,23 +11,9 @@ return {
   },
   {
     "savq/melange-nvim",
-  },
-  {
-    'ronisbr/nano-theme.nvim',
     config = function()
-      local nano = require('nano-theme.colors')
+      vim.o.background = require('lupan.utils').terminalbg()
-      local nano_get = nano.get
+      vim.cmd.colorscheme('melange')
-      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/editing.lua

@@ -27,6 +27,12 @@ return {
     },
   },
 
+  {
+    "chrisgrieser/nvim-various-textobjs",
+    lazy = false,
+    opts = { keymaps = { useDefaults = true } },
+  },
+
   {
     'ggandor/leap.nvim',
     opts = {

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

@@ -18,7 +18,7 @@ return {
       harpoon = { switch = 'f' },
     },
     colors = {
-      file = '#EBCB8B',
+      file = '#5a418a',
     },
   },
   keys = {