From: Ruben Beltran del Rio <redacted>
Date: Mon, 4 Mar 2024 20:55:38 +0000 (+0100)
Subject: Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/b662b6bcafaa991a0c1d470fb054dc5d88a58154?ds=inline;hp=-c

Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
---

b662b6bcafaa991a0c1d470fb054dc5d88a58154
diff --combined config/nvim/init.lua
index 49fedcc,7243f4a..674a55d
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@@ -75,11 -75,6 +75,11 @@@ vim.api.nvim_create_autocmd({'BufNewFil
    callback = function () vim.opt.filetype = 'snes' end
  })
  
 +vim.api.nvim_create_autocmd({'BufNewFile', 'BufRead'}, {
 +  pattern = {'.plan'},
 +  callback = function () vim.opt.filetype = 'markdown' end
 +})
 +
  -------------------------------------------------------------------------------
  -- Local Overrides
  -------------------------------------------------------------------------------
@@@ -113,3 -108,4 +113,4 @@@ require('plugins'
  require('treesitter_config')
  require('lsp')
  require('dap_config')
+ require('calendar_tools')
diff --combined config/nvim/lazy-lock.json
index ba874a4,a233e4e..18ee0da
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@@ -1,18 -1,17 +1,18 @@@
  {
    "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" },
    "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
 -  "coq_nvim": { "branch": "coq", "commit": "76fa95ea445b3d33968ff60bc6a3e2e8e0132551" },
 -  "fzf-lua": { "branch": "main", "commit": "d68d1cfde9bf82061dfdfe35b83fb8636e03766d" },
 +  "coq_nvim": { "branch": "coq", "commit": "b4c6d69749ed65c116a17e7234cd3aea1fef3939" },
 +  "fzf-lua": { "branch": "main", "commit": "ab4ce5031c52455468a1ac0606b38248aa919c7c" },
    "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" },
    "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
    "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
 +  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
-   "nota.nvim": { "branch": "main", "commit": "503d09fc95a47c13141d097cf80dd243d1dce342" },
+   "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" },
    "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
 -  "nvim-treesitter": { "branch": "master", "commit": "62b0bb4f24ad09f535efe44cc9d088f90dcd2498" },
 +  "nvim-treesitter": { "branch": "master", "commit": "e3e5ff4ebddcbfa8f5798253ebd1f9b449e8ee69" },
    "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" },
    "tree-sitter-api-notation": { "branch": "main", "commit": "3113c6077d9ed1e662a891714ac00e1ee3bb7657" },
    "vim-closer": { "branch": "master", "commit": "6007d9db0a35e983af246b667282606612076b07" },
@@@ -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" }
--}
++}
diff --combined config/nvim/lua/plugins.lua
index 24f77b5,4bbcc15..15aeb95
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@@ -46,7 -46,6 +46,7 @@@ require('lazy').setup(
    -- Syntaxes
    'ARM9/snes-syntax-vim',
    'https://git.sr.ht/~torresjrjr/gemini.vim',
 +  { "folke/neodev.nvim", opts = {} },
  
    -- Debugging
    'mfussenegger/nvim-dap',
@@@ -59,10 -58,6 +59,10 @@@
    'rstacruz/vim-closer',
    'michaeljsmith/vim-indent-object',
    'Pocco81/auto-save.nvim',
 +  {
 +    "danymat/neogen",
 +    config = true
 +  },
  
    -- Treesitter
    'nvim-treesitter/nvim-treesitter',
@@@ -77,6 -72,5 +77,5 @@@
    'tpope/vim-fugitive',
    'milkypostman/vim-togglelist',
  
-   -- Notes
-   { dir = '~/projects/plugins/nota.nvim' }
+   'https://git.sr.ht/~rbdr/nota.nvim'
  })