update my nvim conf

diaz-rodrigo · diaz-rodrigo · commit c04d4dcdce7c · 2024-05-16T12:11:49.000+09:00
diff --git a/Dotfiles/nvim/lazy-lock.json b/Dotfiles/nvim/lazy-lock.json
@@ -21,7 +21,7 @@
   "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c3168b2a6a09722d4567ef4a37364b9b30bf7f20" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
   "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
@@ -32,11 +32,12 @@
   "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" },
   "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
   "nvim-tree.lua": { "branch": "master", "commit": "76db7ed0da3027882dd0a72de18643c2e26956dc" },
-  "nvim-treesitter": { "branch": "master", "commit": "d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a" },
+  "nvim-treesitter": { "branch": "master", "commit": "707b0dcf7641fa3a2aaad5053b215503f54f89aa" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
   "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
+  "oil.nvim": { "branch": "master", "commit": "f630887cd845a7341bc16488fe8aaecffe3aaa8a" },
   "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
   "substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
@@ -46,5 +47,6 @@
   "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
   "vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" },
   "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
+  "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
 }
diff --git a/Dotfiles/nvim/lua/ro/core/keymaps.lua b/Dotfiles/nvim/lua/ro/core/keymaps.lua
@@ -15,9 +15,8 @@ keymap.set("n", "<leader>-", "<C-x>", { desc = "Decrement number" }) -- decremen
 --personal ones
 keymap.set("n", "<C-s>", "<C-^>") -- toggle last file
 keymap.set("n", "zz", "<Esc>:update<cr>")
-keymap.set("i", "zz", "<Esc>:update<cr>")
+--keymap.set("i", "zz", "<Esc>:update<cr>")
 keymap.set("n", ";", "<S-$>") -- Go to end of line
-keymap.set("n", ",,", "<cmd>NvimTreeFindFileToggle<cr>")
 
 -- window management
 keymap.set("n", "<leader>sv", "<C-w>v", { desc = "Split window vertically" }) -- split window vertically
@@ -30,3 +29,6 @@ keymap.set("n", "<leader>tx", "<cmd>tabclose<CR>", { desc = "Close current tab"
 keymap.set("n", "<leader>tn", "<cmd>tabn<CR>", { desc = "Go to next tab" }) --  go to next tab
 keymap.set("n", "<leader>tp", "<cmd>tabp<CR>", { desc = "Go to previous tab" }) --  go to previous tab
 keymap.set("n", "<leader>tf", "<cmd>tabnew %<CR>", { desc = "Open current buffer in new tab" }) --  move current buffer to new tab
+
+-- ZenMode
+keymap.set("n", "<leader>zm", "<cmd>ZenMode<CR>", { desc = "Toggle ZenMode" })
diff --git a/Dotfiles/nvim/lua/ro/core/options.lua b/Dotfiles/nvim/lua/ro/core/options.lua
@@ -59,3 +59,14 @@ vim.filetype.add({
 vim.cmd([[if has("autocmd")
   au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 endif]])
+
+-- autoupdate file when changed on disk
+vim.o.autoread = true
+vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "CursorHoldI", "FocusGained" }, {
+  command = "if mode() != 'c' | checktime | endif",
+  pattern = { "*" },
+})
+vim.api.nvim_create_autocmd(
+  { "FileChangedShellPost" },
+  { command = 'echohl WarningMsg | echo "File changed on disk. Buffer reloaded." | echohl None', pattern = { "*" } }
+)
diff --git a/Dotfiles/nvim/lua/ro/plugins/git-blame.lua b/Dotfiles/nvim/lua/ro/plugins/git-blame.lua
@@ -0,0 +1,3 @@
+return {
+  "f-person/git-blame.nvim",
+}
diff --git a/Dotfiles/nvim/lua/ro/plugins/harpoon.lua b/Dotfiles/nvim/lua/ro/plugins/harpoon.lua
@@ -26,35 +26,41 @@ return {
         :find()
     end
 
-    vim.keymap.set("n", "<leader>fh", function()
+    vim.keymap.set("n", "<leader><leader>", function()
       toggle_telescope(harpoon:list())
     end, { desc = "Open harpoon window" })
 
     vim.keymap.set("n", "<leader>a", function()
       harpoon:list():add()
     end)
-    vim.keymap.set("n", "<C-e>", function()
+    vim.keymap.set("n", "<leader>hm", function()
       harpoon.ui:toggle_quick_menu(harpoon:list())
     end)
 
-    vim.keymap.set("n", "<C-j>", function()
+    vim.keymap.set("n", "<leader>ha", function()
       harpoon:list():select(1)
     end)
-    vim.keymap.set("n", "<C-k>", function()
+    vim.keymap.set("n", "<leader>hs", function()
       harpoon:list():select(2)
     end)
-    vim.keymap.set("n", "<C-l>", function()
+    vim.keymap.set("n", "<leader>hd", function()
       harpoon:list():select(3)
     end)
-    vim.keymap.set("n", "<C-;>", function()
+    vim.keymap.set("n", "<leader>hf", function()
       harpoon:list():select(4)
     end)
+    vim.keymap.set("n", "<leader>hg", function()
+      harpoon:list():select(5)
+    end)
+    vim.keymap.set("n", "<leader>hdd", function()
+      harpoon:list():remove()
+    end)
 
     -- Toggle previous & next buffers stored within Harpoon list
-    vim.keymap.set("n", "<C-n>", function()
+    vim.keymap.set("n", "<leader>p", function()
       harpoon:list():prev()
     end)
-    vim.keymap.set("n", "<C-p>", function()
+    vim.keymap.set("n", "<leader>n", function()
       harpoon:list():next()
     end)
   end,
diff --git a/Dotfiles/nvim/lua/ro/plugins/nvim-tree.lua b/Dotfiles/nvim/lua/ro/plugins/nvim-tree.lua
@@ -13,6 +13,14 @@ return {
         relativenumber = true,
         adaptive_size = true,
       },
+      update_focused_file = {
+        enable = true,
+        update_root = {
+          enable = false,
+          ignore_list = {},
+        },
+        exclude = false,
+      },
       -- change folder arrow icons
       renderer = {
         indent_markers = {
@@ -52,5 +60,6 @@ return {
     keymap.set("n", "<leader>ef", "<cmd>NvimTreeFindFileToggle<CR>", { desc = "Toggle file explorer on current file" }) -- toggle file explorer on current file
     keymap.set("n", "<leader>ec", "<cmd>NvimTreeCollapse<CR>", { desc = "Collapse file explorer" }) -- collapse file explorer
     keymap.set("n", "<leader>er", "<cmd>NvimTreeRefresh<CR>", { desc = "Refresh file explorer" }) -- refresh file explorer
+    keymap.set("n", ",,", "<cmd>NvimTreeFindFileToggle<cr>z.")
   end,
 }
diff --git a/Dotfiles/nvim/lua/ro/plugins/oil.lua b/Dotfiles/nvim/lua/ro/plugins/oil.lua
@@ -0,0 +1,8 @@
+return {
+  "stevearc/oil.nvim",
+  opts = {
+    vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" }),
+  },
+  -- Optional dependencies
+  dependencies = { "nvim-tree/nvim-web-devicons" },
+}
diff --git a/Dotfiles/nvim/lua/ro/plugins/recent-telescope.lua b/Dotfiles/nvim/lua/ro/plugins/recent-telescope.lua
@@ -0,0 +1,12 @@
+return {
+  "smartpde/telescope-recent-files",
+  conf = {
+    -- Map a shortcut to open the picker.
+    vim.api.nvim_set_keymap(
+      "n",
+      "<Leader>fr",
+      [[<cmd>lua require('telescope').extensions.recent_files.pick()<CR>]],
+      { noremap = true, silent = true }
+    ),
+  },
+}
diff --git a/Dotfiles/nvim/lua/ro/plugins/telescope.lua b/Dotfiles/nvim/lua/ro/plugins/telescope.lua
@@ -42,7 +42,7 @@ return {
     local keymap = vim.keymap -- for conciseness
 
     keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Fuzzy find files in cwd" })
-    keymap.set("n", "<leader><leader>", "<cmd>Telescope oldfiles<cr>", { desc = "Fuzzy find recent files" })
+    keymap.set("n", "<leader>fo", "<cmd>Telescope oldfiles<cr>", { desc = "Fuzzy find recent files" })
     keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>", { desc = "Find string in cwd" })
     keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>", { desc = "Find string under cursor in cwd" })
     keymap.set("n", "<leader>ft", "<cmd>TodoTelescope<cr>", { desc = "Find todos" })
diff --git a/Dotfiles/nvim/lua/ro/plugins/zen.lua b/Dotfiles/nvim/lua/ro/plugins/zen.lua
@@ -0,0 +1,4 @@
+return {
+  "folke/zen-mode.nvim",
+  opts = {},
+}
diff --git a/Dotfiles/nvim/lua/ro/scripts/git-branch-modified.sh b/Dotfiles/nvim/lua/ro/scripts/git-branch-modified.sh
@@ -0,0 +1,11 @@
+BRANCH="$PROJECT_MAIN_BRANCH"
+
+if [[ -z "$BRANCH" ]]; then
+    BRANCH="master"
+fi
+
+if [[ "$1" == "list" ]]; then
+    git diff --name-only --diff-filter=ACMR --relative $BRANCH
+elif [[ "$1" == "diff" ]]; then
+    git diff --diff-filter=ACMR --relative $BRANCH "$2"
+fi
diff --git a/Dotfiles/nvim/spell/en.utf-8.add b/Dotfiles/nvim/spell/en.utf-8.add
@@ -1,4 +1,3 @@
-thisasdf
 VScode
 Neovim
 dotfiles
@@ -9,4 +8,3 @@ craftzdog
 github
 const
 import
-import

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+return {`
	`2`	`+ "f-person/git-blame.nvim",`
	`3`	`+}`