]> git.r.bdr.sh - rbdr/dotfiles/commitdiff
Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
authorRuben Beltran del Rio <redacted>
Mon, 4 Mar 2024 20:55:38 +0000 (21:55 +0100)
committerRuben Beltran del Rio <redacted>
Mon, 4 Mar 2024 20:55:38 +0000 (21:55 +0100)
1  2 
config/nvim/init.lua
config/nvim/lazy-lock.json
config/nvim/lua/plugins.lua

Simple merge
index ba874a419dac9c25071e3031bfa71a2cf9fd421a,a233e4e1c1cac92b3434a65724bdaefefcb40365..18ee0da81eccbbb4a9907359b383dedae140ab77
@@@ -6,8 -6,7 +6,8 @@@
    "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" },
    "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
    "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
-   "nota.nvim": { "branch": "main", "commit": "503d09fc95a47c13141d097cf80dd243d1dce342" },
 +  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
+   "nota.nvim": { "branch": "main", "commit": "9e9e89d8556ecafa6b11ab21aa9ffab550f7f3ad" },
    "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
    "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
    "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
@@@ -20,4 -19,4 +20,4 @@@
    "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" },
    "vim-indent-object": { "branch": "master", "commit": "8ab36d5ec2a3a60468437a95e142ce994df598c6" },
    "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" }
--}
++}
Simple merge