diff --git a/.mise.toml b/.mise.toml
new file mode 100644
index 0000000..17f4d27
--- /dev/null
+++ b/.mise.toml
@@ -0,0 +1,4 @@
+[env]
+RIPGREP_CONFIG_PATH = "./.ripgreprc"
+
+# private configuration to go in .mise.local.toml
diff --git a/.ripgreprc b/.ripgreprc
new file mode 100644
index 0000000..a7f4c7c
--- /dev/null
+++ b/.ripgreprc
@@ -0,0 +1 @@
+--hidden
diff --git a/git/.gitconfig b/git/.gitconfig
index dfd17da..dbf627d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -23,7 +23,7 @@
   program = gpg
 
 [merge]
-  tool = vimdiff
+  tool = nvim -d
 
 [pull]
   rebase = false
diff --git a/nvim/.config/nvim/after/plugin/config.lua b/nvim/.config/nvim/after/plugin/config.lua
index 123cb8e..63d9c8e 100644
--- a/nvim/.config/nvim/after/plugin/config.lua
+++ b/nvim/.config/nvim/after/plugin/config.lua
@@ -4,20 +4,54 @@ vim.keymap.set("n", "<Leader>bd", function()
   require("bufdelete").bufdelete(0, true)
 end)
 
+--- gitblame.nvim
+vim.g.gitblame_use_blame_commit_file_urls = true
+vim.g.gitblame_display_virtual_text = 0
+
+require('gitblame').setup {enabled = true}
+
+vim.api.nvim_set_keymap('n', '<leader>gbo', ':GitBlameOpenCommitURL<CR>', {
+  noremap = true,
+  silent = true,
+})
+
 --- gitlinker.nvim
-require"gitlinker".setup()
-vim.keymap.set("n", "<Leader>gh", function()
-  require"gitlinker".get_buf_range_url(
-    "n",
-    { action_callback = require"gitlinker.actions".open_in_browser }
-  )
-end, { silent = true })
-vim.keymap.set("v", "<leader>gh", function()
-  require"gitlinker".get_buf_range_url(
-    "v",
-    { action_callback = require"gitlinker.actions".open_in_browser }
-  )
-end)
+require"gitlinker".setup({
+  router = {
+    browse = {
+      ["^git%.atomaka%.com"] = "https://git.atomaka.com/"
+        .. "{_A.ORG}/"
+        .. "{_A.REPO}/commit/"
+        .. "{_A.REV}/"
+    },
+    blame = {
+      ["^git%.atomaka%.com"] = "https://git.atomaka.com/"
+        .. "{_A.ORG}/"
+        .. "{_A.REPO}/blame/"
+        .. "branch/{_A.CURRENT_BRANCH}/"
+        .. "{_A.FILE}"
+    },
+  },
+})
+vim.keymap.set(
+  {"n", 'v'},
+  "<leader>gl",
+  function()
+    require("gitlinker").link({ action = require("gitlinker.actions").system })
+  end,
+  { silent = true, noremap = true, desc = "GitLink!" }
+)
+vim.keymap.set(
+  {"n", 'v'},
+  "<leader>glb",
+  function()
+    require("gitlinker").link({
+      router_type = "blame",
+      action = require("gitlinker.actions").system,
+    })
+  end,
+  { silent = true, noremap = true, desc = "GitLink! blame" }
+)
 
 --- gitsigns.nvim
 require("gitsigns").setup()
@@ -33,6 +67,10 @@ vim.g["git_messenger_always_into_popup"] = 1
 require("nvim-surround").setup()
 
 --- telescope.nvim
+vim.api.nvim_set_keymap('n', '<leader>t', ':Telescope<CR>', {
+  noremap = true,
+  silent = true,
+})
 vim.keymap.set("n", "<C-p>", function()
     require("telescope.builtin").find_files({
       file_ignore_patterns = {".git/", "node_modules/"},
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 30eb51a..7f0d74c 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,60 +1,26 @@
 {
-  "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" },
+  "LazyVim": { "branch": "main", "commit": "a1c3ec4cd43fe61e3b614237a46ac92771191c81" },
   "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
-  "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" },
-  "catppuccin": { "branch": "main", "commit": "f8564054831b45bac52f91bb8d12c68631b13e1a" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "0f4f299dfea09d2adfd7a1da05149a0844ac8eee" },
-  "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
-  "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
-  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
-  "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
-  "grug-far.nvim": { "branch": "main", "commit": "22f1571d2c60883b3fbf05e90f04cabde056fe3e" },
+  "git-blame.nvim": { "branch": "master", "commit": "8c56e864d448e84e0162872c381dd2715824dce2" },
+  "git-messenger.vim": { "branch": "master", "commit": "edc603d4cda7894a743e383e16c638e206d03148" },
+  "gitlinker.nvim": { "branch": "master", "commit": "a221c13fc3c7f5b8799933f4966ee8e618287292" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
   "gruvbox": { "branch": "master", "commit": "143a3b8babcfd2bce6c99d6ba496942647c3e30b" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
-  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" },
+  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" },
-  "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" },
-  "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
-  "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" },
-  "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
-  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lint": { "branch": "master", "commit": "906cd0012be2acbf98de87a3c25154abe7da0478" },
-  "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f4fef355efa3c5d0813512480ee7b2c050b09fe4" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
-  "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" },
-  "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
-  "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" },
-  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" },
   "typescript-vim": { "branch": "master", "commit": "8d169e16b5487771f6568125d4c63e6086e524d9" },
   "vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" },
-  "vim-go": { "branch": "master", "commit": "a64d097a1af1772c24d13f34529b9be2a34b7721" },
+  "vim-go": { "branch": "master", "commit": "105c4591c99ab152fac967ef4a566c97e071104e" },
   "vim-markdown": { "branch": "master", "commit": "f405b47fd8774ecd5e808e6de9c85d9029da251c" },
-  "vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" },
+  "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" },
   "vim-ruby": { "branch": "master", "commit": "f06f069ce67bdda6f2cd408f8859cdf031e5b6b4" },
   "vim-terraform": { "branch": "master", "commit": "24de93afb05078bac6a2e966402cc1f672277708" },
   "vim-zoom": { "branch": "master", "commit": "01c737005312c09e0449d6518decf8cedfee32c7" },
-  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
-  "whitespace.nvim": { "branch": "master", "commit": "e196282cd6b01ff0ce736751146fd4db49a42205" }
+  "whitespace.nvim": { "branch": "master", "commit": "f7d14be0f23a9c1e8021aca70d280aea26649b68" }
 }
diff --git a/nvim/.config/nvim/lua/plugins/current.lua b/nvim/.config/nvim/lua/plugins/current.lua
index 91b7d23..33f6899 100644
--- a/nvim/.config/nvim/lua/plugins/current.lua
+++ b/nvim/.config/nvim/lua/plugins/current.lua
@@ -9,7 +9,8 @@ return {
   -- "FabijanZulj/blame.nvim",
   {"rhysd/git-messenger.vim"},
   {"lewis6991/gitsigns.nvim"},
-  {"ruifm/gitlinker.nvim"},
+  {"linrongbin16/gitlinker.nvim"},
+  {"f-person/git-blame.nvim"},
   {"tpope/vim-eunuch"},
 
   {"gruvbox-community/gruvbox"},
diff --git a/zsh/.config/zsh/aliases b/zsh/.config/zsh/aliases
index 09e2d77..b828a07 100644
--- a/zsh/.config/zsh/aliases
+++ b/zsh/.config/zsh/aliases
@@ -15,6 +15,7 @@ alias c="clear"
 alias cs="toggle-color-mode"
 alias cdr="git-root"
 alias dc="docker-compose-call"
+alias docker="podman"
 alias g="g" # overwrite g alias
 alias ga="git add"
 alias gaa="git add --all"