nvim: change harpoon keys

the theme is read from file so this also works in tmux

alacritty/.config/alacritty/alacritty.toml

@@ -10,10 +10,10 @@ TERM = "xterm-256color"
 size = 10.5
 
 [font.bold]
-family = "GoMono Nerd Font"
+family = "Fira Code Nerd Font"
 
 [font.normal]
-family = "GoMono Nerd Font"
+family = "Fira Code Nerd Font"
 
 [keyboard]
 bindings = [

alacritty/.config/alacritty/alacritty.yml

@@ -296,9 +296,9 @@ colors: *dark
 font:
   size: 10.5
   normal:
-    family: GoMono Nerd Font
+    family: Fira Code Nerd Font
   bold:
-    family: GoMono Nerd Font
+    family: Fira Code Nerd Font
 
 key_bindings:
    - key: F6

alacritty/.config/alacritty/dark.toml

@@ -1,3 +1,3 @@
 import = [
-    "~/.config/alacritty/themes/themes/nord.toml"
+    "~/.config/alacritty/themes/themes/deep_space.toml"
 ]

alacritty/.config/alacritty/light.toml

@@ -1,3 +1,3 @@
 import = [
-    "~/.config/alacritty/themes/themes/ayu_light.toml"
+    "~/.config/alacritty/themes/themes/night_owlish_light.toml"
 ]

awesome/.config/awesome/theme_dark.lua

@@ -5,7 +5,7 @@ local dpi                   = xresources.apply_dpi
 
 local theme                 = {}
 
-theme.font                  = "GoMono Nerd Font 10.5"
+theme.font                  = "Fira Code Nerd Font 10.5"
 theme.tasklist_disable_icon = true
 theme.wibar_height          = 40
 

awesome/.config/awesome/theme_light.lua

@@ -5,7 +5,7 @@ local dpi                   = xresources.apply_dpi
 
 local theme                 = {}
 
-theme.font                  = "GoMono Nerd Font 10.5"
+theme.font                  = "Fira Code Nerd Font 10.5"
 theme.tasklist_disable_icon = true
 theme.wibar_height          = 40
 

foot/.config/foot/foot.ini

@@ -1,4 +1,4 @@
 [main]
-font = GoMono Nerd Font:size=11
+font = Fira Code Nerd Font:size=11
 
 include = /usr/share/foot/themes/nord

hyprland/.config/hypr/white.conf

@@ -4,5 +4,5 @@ env = GBM_BACKEND,nvidia-drm
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 env = WLR_NO_HARDWARE_CURSORS,1
 
-monitor=DP-2,highres,0x0,2
+monitor=DP-1,highres,0x0,2
-monitor=DP-1,highres,1920x0,2
+monitor=DP-2,highres,1920x0,2

hyprland/.config/waybar/style.css

@@ -1,5 +1,5 @@
 * {
-    font-family: GoMono Nerd Font;
+    font-family: Fira Code Nerd Font;
     font-size: 14;
     background-color: #263c59;
     color: #7b899d;

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

@@ -1,39 +1,40 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
-  "NeoSolarized.nvim": { "branch": "master", "commit": "5c0335123ce2ddf0e98546312e4c120df9cf502f" },
+  "bamboo.nvim": { "branch": "master", "commit": "f10e56db7b0a3312bff2500f7d74c03300b363ed" },
   "blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" },
+  "bookmarks.nvim": { "branch": "main", "commit": "42371a76cdd786452b537490926b1b6a041672e5" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "everforest-nvim": { "branch": "main", "commit": "93ae58039f565ef51252e1177e00946bd6258228" },
+  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
   "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" },
   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
   "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
   "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" },
+  "go.nvim": { "branch": "master", "commit": "fca26b05699ad06c077721823a0b1a8e02539d5c" },
+  "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "hierarchy-tree-go.nvim": { "branch": "main", "commit": "9fab9ddefe81edab4a144824955d2d085db3f49a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
-  "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
+  "lazy.nvim": { "branch": "main", "commit": "4c6479e98ad643cd584e9e7c4095c463e0d810eb" },
-  "leap.nvim": { "branch": "main", "commit": "0d15057cc47fa49f6609bf364f5ad3842f08c58c" },
+  "leap.nvim": { "branch": "main", "commit": "24935d06c7e06bf8929feb24a3525cd128fc0cc4" },
   "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
   "neogit": { "branch": "master", "commit": "71eb98630b5cb2277636fdccc74a7358e910c01b" },
-  "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
   "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
-  "nvim-treesitter": { "branch": "master", "commit": "9636d5a3f4f531256fba147a30b882c44f28fae1" },
+  "nvim-treesitter": { "branch": "master", "commit": "9d68e876cce94fc9f8f8819da0c956a4429a3766" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "oil.nvim": { "branch": "master", "commit": "c82b26eb4ba35c0eb7ec38d88dd400597fb34883" },
+  "oil.nvim": { "branch": "master", "commit": "b77ed915ab1e53720a6283702816cea2695a2638" },
-  "onenord.nvim": { "branch": "main", "commit": "70b716fd36a18284ad768402523b79ccdadafedf" },
+  "orgmode": { "branch": "master", "commit": "cc51c1914e3f0bf20bd543a7176df5bab12ec247" },
-  "orgmode": { "branch": "master", "commit": "c5a3446f47e0956ad0cab9dc7acfcf2ea2e11bad" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-git-grep.nvim": { "branch": "main", "commit": "814217cb30c076bc5edebe36e525b05a7c9eb4b2" },
@@ -43,7 +44,7 @@
   "tree-sitter-nu": { "branch": "main", "commit": "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c" },
   "tree-sitter-templ": { "branch": "master", "commit": "cf84ea53e2e2531f23009d676ac206090c1e2392" },
   "treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" },
-  "trouble.nvim": { "branch": "main", "commit": "60b0ac3772e991bc194207afc28368a5f15d913a" },
+  "trouble.nvim": { "branch": "main", "commit": "58a3acfc6d8d819324dab4c87068596319032e64" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },

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

@@ -112,10 +112,8 @@ vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasn
 
 key('n', '<F6>', function()
   if vim.o.background == "dark" then
-    vim.cmd.colorscheme("dayfox")
+    vim.o.background = "light"
-    -- vim.o.background = "light"
   else
-    vim.cmd.colorscheme("duskfox")
+    vim.o.background = "dark"
-    -- vim.o.background = "dark"
   end
 end)

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

@@ -1,39 +1,29 @@
-local function cwd()
+local function termnalbg()
-  return vim.fn.getcwd()
+  local ok, lines = pcall(io.lines, os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
+  if ok then
+    for line in lines do
+      if string.find(line, 'light.toml') then
+        return "light"
+      end
+    end
+  end
+  return "dark"
 end
 
 return {
   -- Colorscheme
   {
-    'rmehri01/onenord.nvim',
+    'ribru17/bamboo.nvim',
-    config = function()
-      -- vim.cmd.colorscheme("onenord")
-    end
-  },
-  {
-    "neanias/everforest-nvim",
-    version = false,
     lazy = false,
     priority = 1000,
     config = function()
-      -- vim.cmd.colorscheme("everforest")
+      require('bamboo').setup {
+        -- optional configuration here
+      }
+      require('bamboo').load()
+      vim.o.background = termnalbg()
     end,
   },
-  {
-    "Tsuzat/NeoSolarized.nvim",
-    lazy = false,
-    priority = 1000,
-    config = function()
-      -- vim.cmd.colorscheme("NeoSolarized")
-    end
-  },
-  {
-    "EdenEast/nightfox.nvim",
-    config = function()
-      vim.cmd.colorscheme("duskfox")
-    end
-  },
-
   {
     -- Statusline
     'freddiehaddad/feline.nvim',

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

@@ -0,0 +1,14 @@
+vim.keymap.set({ "n", "v" }, "mm", "<cmd>BookmarksMark<cr>", { desc = "Mark current line into active BookmarkList." })
+vim.keymap.set({ "n", "v" }, "mo", "<cmd>BookmarksGoto<cr>", { desc = "Go to bookmark at current active BookmarkList" })
+vim.keymap.set({ "n", "v" }, "ma", "<cmd>BookmarksCommands<cr>", { desc = "Find and trigger a bookmark command." })
+vim.keymap.set({ "n", "v" }, "mg", "<cmd>BookmarksGotoRecent<cr>", { desc = "Go to latest visited/created Bookmark" })
+vim.keymap.set({ "n", "v" }, "ms", "<cmd>BookmarksSetActiveList<cr>", { desc = "Go to latest visited/created Bookmark" })
+
+return {
+  "LintaoAmons/bookmarks.nvim",
+  tag = "v0.5.3", -- optional, pin the plugin at specific version for stability
+  dependencies = {
+    { "nvim-telescope/telescope.nvim" },
+    { "stevearc/dressing.nvim" } -- optional: to have the same UI shown in the GIF
+  }
+}

nvim/.config/nvim/lua/plugins/go.lua

@@ -0,0 +1,13 @@
+return {
+  "ray-x/go.nvim",
+  dependencies = {
+    "ray-x/guihua.lua",
+    "neovim/nvim-lspconfig",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  config = function()
+    require("go").setup()
+  end,
+  event = { "CmdlineEnter" },
+  ft = { "go", 'gomod' },
+}

nvim/.config/nvim/lua/plugins/harpoon.lua

@@ -9,9 +9,12 @@ return {
       vim.keymap.set('n', '<leader>i', function() harpoon:list():add() end, { desc = "Harpoon add new [I]tem" })
       vim.keymap.set('n', '<leader>m', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
         { desc = "Harpoon [M]enu" })
-      for i = 1, 9, 1 do
+      vim.keymap.set('n', '<leader>1', function() harpoon:list():select(1) end)
-        vim.keymap.set('n', '<M-' .. i .. '>', function() harpoon:list():select(i) end)
+      vim.keymap.set('n', '<leader>2', function() harpoon:list():select(2) end)
-      end
+      vim.keymap.set('n', '<leader>3', function() harpoon:list():select(3) end)
+      vim.keymap.set('n', '<leader>4', function() harpoon:list():select(4) end)
+      vim.keymap.set('n', '<leader>5', function() harpoon:list():prev() end)
+      vim.keymap.set('n', '<leader>6', function() harpoon:list():next() end)
     end
   },
 }

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

@@ -30,9 +30,6 @@ return {
           map('K', '<cmd>Lspsaga hover_doc<CR>', 'Hover Documentation')
           map('<leader>K', vim.lsp.buf.signature_help, 'Signature Documentation')
           map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-          vim.keymap.set('n', '[d', '<cmd>Lspsaga diagnostic_jump_prev<CR>',
-            { desc = 'Go to previous [D]iagnostic message' })
-          vim.keymap.set('n', ']d', '<cmd>Lspsaga diagnostic_jump_next<CR>', { desc = 'Go to next [D]iagnostic message' })
 
           -- Highlight references under cursor (clear highlight when cursor moves).
           local client = vim.lsp.get_client_by_id(event.data.client_id)