Add neorg, update treesiter to 0.12 branch

1 files changed, 10 insertions, 8 deletions

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 8c4f304..1c57f00 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -50,11 +50,16 @@ vim.keymap.set('n', '<C-n>', function()
 end)
 
 -- Move lines / blocks up and down using Ctrl + Shift
-vim.keymap.set('n', '<C-S-j>', ':m .+1<CR>==')
-vim.keymap.set('n', '<C-S-k>', ':m .-2<CR>==')
+vim.keymap.set('n', '<C-S-j>', function()
+  return '<Cmd>m .+' .. vim.v.count1 .. '<CR>=='
+end, { expr = true, silent = true })
+
+vim.keymap.set('n', '<C-S-k>', function()
+  return '<Cmd>m .-' .. (vim.v.count1 + 1) .. '<CR>=='
+end, { expr = true, silent = true })
 vim.keymap.set('i', '<C-S-j>', '<Esc>:m .+1<CR>==gi')
 vim.keymap.set('i',  '<C-S-k>', '<Esc>:m .-2<CR>==gi')
-vim.keymap.set('v', '<C-S-j>', ':m \'>+1<CR>gv=gv')
+vim.keymap.set('v', '<C-S-j>', ':m \'>+2<CR>gv=gv')
 vim.keymap.set('v', '<C-S-k>', ':m \'<-2<CR>gv=gv')
 
 -- Navigate the location list
@@ -80,7 +85,7 @@ vim.api.nvim_create_autocmd({'BufNewFile', 'BufRead'}, {
 
 vim.api.nvim_create_autocmd({'BufNewFile', 'BufRead'}, {
   pattern = {'.plan'},
-  callback = function () vim.opt.filetype = 'markdown' end
+  callback = function () vim.opt.filetype = 'norg' end
 })
 
 -------------------------------------------------------------------------------
@@ -95,9 +100,6 @@ pcall(require, 'init_local')
 vim.keymap.set('n', '<c-P>',
   "<cmd>lua require('fzf-lua').files({cmd = \"rg --files --hidden -g !.git\"})<CR>", { silent = true })
 
--- Toggle Autosave
-vim.api.nvim_set_keymap('n', '<leader>n', ':ASToggle<CR>', {})
-
 -- Svelte Config
 vim.g.vim_svelte_plugin_use_typescript = true
 
@@ -112,4 +114,4 @@ require('plugins')
 require('treesitter_config')
 require('lsp')
 require('dap_config')
-require('calendar_tools')
+require('neorg_config')