Updated orgmode config for nvim

1 files changed, 207 insertions, 181 deletions

diff --git a/home/mun/programs/nvim.nix b/home/mun/programs/nvim.nix
index 9677c57..1440c65 100644
--- a/home/mun/programs/nvim.nix
+++ b/home/mun/programs/nvim.nix
@@ -77,183 +77,184 @@
     ];
 
     extraLuaConfig = ''
-      -------------------------------------------------
-      -- LEADER
-      -------------------------------------------------
-      vim.g.mapleader = " "
-
-      -------------------------------------------------
-      -- BASIC OPTIONS
-      -------------------------------------------------
-      vim.opt.number = true
-      vim.opt.relativenumber = true
-      vim.opt.clipboard = "unnamedplus"
-      vim.opt.showtabline = 2
-      vim.o.timeout = true
-      vim.o.timeoutlen = 300
-
-      -------------------------------------------------
-      -- THEME
-      -------------------------------------------------
-      require("catppuccin").setup({
-        flavour = "mocha",
-      })
-      vim.cmd.colorscheme("catppuccin")
+           -------------------------------------------------
+           -- LEADER
+           -------------------------------------------------
+           vim.g.mapleader = " "
+
+           -------------------------------------------------
+           -- BASIC OPTIONS
+           -------------------------------------------------
+           vim.opt.number = true
+           vim.opt.relativenumber = true
+           vim.opt.clipboard = "unnamedplus"
+           vim.opt.showtabline = 2
+           vim.o.timeout = true
+           vim.o.timeoutlen = 300
+
+           -------------------------------------------------
+           -- THEME
+           -------------------------------------------------
+           require("catppuccin").setup({
+             flavour = "mocha",
+           })
+           vim.cmd.colorscheme("catppuccin")
+
+           -------------------------------------------------
+           -- GITSIGNS
+           -------------------------------------------------
+           require("gitsigns").setup()
+
+           -------------------------------------------------
+           -- TREESITTER
+           -------------------------------------------------
+           require("nvim-treesitter.configs").setup({
+             highlight = { enable = true },
+             indent = { enable = true },
+           })
+
+           vim.opt.foldmethod = "expr"
+           vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+           vim.opt.foldenable = false
+
+           -------------------------------------------------
+           -- SNIPPETS
+           -------------------------------------------------
+           require("luasnip.loaders.from_vscode").lazy_load()
+
+           -------------------------------------------------
+           -- COMPLETION
+           -------------------------------------------------
+           local cmp = require("cmp")
+           local luasnip = require("luasnip")
+
+           cmp.setup({
+             snippet = {
+               expand = function(args)
+                 luasnip.lsp_expand(args.body)
+               end,
+             },
+             mapping = cmp.mapping.preset.insert({
+               ["<C-Space>"] = cmp.mapping.complete(),
+               ["<CR>"] = cmp.mapping.confirm({ select = true }),
+             }),
+             sources = {
+               { name = "nvim_lsp" },
+               { name = "luasnip" },
+             },
+           })
+
+           require("nvim-autopairs").setup({})
+
+           -------------------------------------------------
+           -- LSP
+           -------------------------------------------------
+           local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+           local servers = {
+             "lua_ls",
+             "nil_ls",
+             "rust_analyzer",
+             "pyright",
+             "bashls",
+             "texlab",
+           }
+
+           for _, server in ipairs(servers) do
+             vim.lsp.config(server, {
+               capabilities = capabilities
+             })
+             vim.lsp.enable(server)
+           end
+
+           -------------------------------------------------
+           -- LSP KEYMAPS
+           -------------------------------------------------
+           vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition)
+           vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration)
+           vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation)
+           vim.keymap.set("n", "<leader>lr", vim.lsp.buf.references)
+           vim.keymap.set("n", "lh", vim.lsp.buf.hover)
+           vim.keymap.set("n", "ln", vim.lsp.buf.rename)
+           vim.keymap.set("n", "la", vim.lsp.buf.code_action)
+           vim.keymap.set("n", "lf", function() vim.lsp.buf.format() end)
+
+           -------------------------------------------------
+           -- DIAGNOSTICS
+           -------------------------------------------------
+           vim.keymap.set("n", "lj", vim.diagnostic.goto_next)
+           vim.keymap.set("n", "lk", vim.diagnostic.goto_prev)
+           vim.keymap.set("n", "le", vim.diagnostic.open_float)
+
+           -------------------------------------------------
+           -- FORMATTER
+           -------------------------------------------------
+           require("conform").setup({
+             format_on_save = {
+               timeout_ms = 500,
+               lsp_format = "fallback",
+             },
+             formatters_by_ft = {
+               lua = { "stylua" },
+               nix = { "alejandra" },
+               rust = { "rustfmt" },
+               python = { "black" },
+               bash = { "shfmt" },
+             },
+           })
+
+           require("Comment").setup()
+
+           -------------------------------------------------
+           -- TELESCOPE
+           -------------------------------------------------
+           local builtin = require("telescope.builtin")
+
+           require("telescope").setup({
+             defaults = {
+               layout_strategy = "horizontal",
+               sorting_strategy = "ascending",
+               file_ignore_patterns = { "node_modules", ".git/" },
+             },
+           })
+
+           vim.keymap.set("n", "<leader><leader>", builtin.find_files)
+           vim.keymap.set("n", "<leader>fg", builtin.live_grep)
+           vim.keymap.set("n", "<leader>fb", builtin.buffers)
+
+           -------------------------------------------------
+           -- WHICH KEY
+           -------------------------------------------------
+           local wk = require("which-key")
+           wk.add({
+             { "<leader>l", desc = "LSP" }
+           })
+
+           -------------------------------------------------
+           -- NVIM TREE
+           -------------------------------------------------
+           require("nvim-tree").setup({})
+           vim.keymap.set("n", "<leader>e", "<cmd>NvimTreeToggle<CR>")
+
+           -------------------------------------------------
+           -- TERMINAL
+           -------------------------------------------------
+           require("toggleterm").setup({
+             direction = "float",
+           })
+
+           local Terminal = require("toggleterm.terminal").Terminal
+
+           local lazygit = Terminal:new({
+             cmd = "lazygit",
+             hidden = true,
+             direction = "float",
+           })
+
+           vim.keymap.set("n", "<leader>gg", function()
+             lazygit:toggle()
+           end)
 
-      -------------------------------------------------
-      -- GITSIGNS
-      -------------------------------------------------
-      require("gitsigns").setup()
-
-      -------------------------------------------------
-      -- TREESITTER
-      -------------------------------------------------
-      require("nvim-treesitter.configs").setup({
-        highlight = { enable = true },
-        indent = { enable = true },
-      })
-
-      vim.opt.foldmethod = "expr"
-      vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-      vim.opt.foldenable = false
-
-      -------------------------------------------------
-      -- SNIPPETS
-      -------------------------------------------------
-      require("luasnip.loaders.from_vscode").lazy_load()
-
-      -------------------------------------------------
-      -- COMPLETION
-      -------------------------------------------------
-      local cmp = require("cmp")
-      local luasnip = require("luasnip")
-
-      cmp.setup({
-        snippet = {
-          expand = function(args)
-            luasnip.lsp_expand(args.body)
-          end,
-        },
-        mapping = cmp.mapping.preset.insert({
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        }),
-        sources = {
-          { name = "nvim_lsp" },
-          { name = "luasnip" },
-        },
-      })
-
-      require("nvim-autopairs").setup({})
-
-      -------------------------------------------------
-      -- LSP
-      -------------------------------------------------
-      local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-      local servers = {
-        "lua_ls",
-        "nil_ls",
-        "rust_analyzer",
-        "pyright",
-        "bashls",
-        "texlab",
-      }
-
-      for _, server in ipairs(servers) do
-        vim.lsp.config(server, {
-          capabilities = capabilities
-        })
-        vim.lsp.enable(server)
-      end
-
-      -------------------------------------------------
-      -- LSP KEYMAPS
-      -------------------------------------------------
-      vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition)
-      vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration)
-      vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation)
-      vim.keymap.set("n", "<leader>lr", vim.lsp.buf.references)
-      vim.keymap.set("n", "lh", vim.lsp.buf.hover)
-      vim.keymap.set("n", "ln", vim.lsp.buf.rename)
-      vim.keymap.set("n", "la", vim.lsp.buf.code_action)
-      vim.keymap.set("n", "lf", function() vim.lsp.buf.format() end)
-
-      -------------------------------------------------
-      -- DIAGNOSTICS
-      -------------------------------------------------
-      vim.keymap.set("n", "lj", vim.diagnostic.goto_next)
-      vim.keymap.set("n", "lk", vim.diagnostic.goto_prev)
-      vim.keymap.set("n", "le", vim.diagnostic.open_float)
-
-      -------------------------------------------------
-      -- FORMATTER
-      -------------------------------------------------
-      require("conform").setup({
-        format_on_save = {
-          timeout_ms = 500,
-          lsp_format = "fallback",
-        },
-        formatters_by_ft = {
-          lua = { "stylua" },
-          nix = { "alejandra" },
-          rust = { "rustfmt" },
-          python = { "black" },
-          bash = { "shfmt" },
-        },
-      })
-
-      require("Comment").setup()
-
-      -------------------------------------------------
-      -- TELESCOPE
-      -------------------------------------------------
-      local builtin = require("telescope.builtin")
-
-      require("telescope").setup({
-        defaults = {
-          layout_strategy = "horizontal",
-          sorting_strategy = "ascending",
-          file_ignore_patterns = { "node_modules", ".git/" },
-        },
-      })
-
-      vim.keymap.set("n", "<leader><leader>", builtin.find_files)
-      vim.keymap.set("n", "<leader>fg", builtin.live_grep)
-      vim.keymap.set("n", "<leader>fb", builtin.buffers)
-
-      -------------------------------------------------
-      -- WHICH KEY
-      -------------------------------------------------
-      local wk = require("which-key")
-      wk.add({
-        { "<leader>l", desc = "LSP" }
-      })
-
-      -------------------------------------------------
-      -- NVIM TREE
-      -------------------------------------------------
-      require("nvim-tree").setup({})
-      vim.keymap.set("n", "<leader>e", "<cmd>NvimTreeToggle<CR>")
-
-      -------------------------------------------------
-      -- TERMINAL
-      -------------------------------------------------
-      require("toggleterm").setup({
-        direction = "float",
-      })
-
-      local Terminal = require("toggleterm.terminal").Terminal
-
-      local lazygit = Terminal:new({
-        cmd = "lazygit",
-        hidden = true,
-        direction = "float",
-      })
-
-      vim.keymap.set("n", "<leader>gg", function()
-        lazygit:toggle()
-      end)
 
       -------------------------------------------------
       -- ORGMODE
@@ -267,13 +268,38 @@
 
       require("orgmode").setup({
         org_agenda_files = projects,
-        org_default_notes_file = "~/INBOX.org"
+        org_default_notes_file = "~/ORG/inbox.org",  -- move inbox inside ~/ORG
+
+        org_capture_templates = {
+          t = {
+            description = "Todo",
+            template = "* TODO %?\n  SCHEDULED: %t",
+            target = "~/ORG/todos.org",
+          },
+          i = {
+            description = "Idea",
+            template = "* %? :idea:\n  %U",
+            target = "~/ORG/ideas.org",
+          },
+          n = {
+            description = "Note",
+            template = "* %?\n  %U",
+            target = "~/ORG/inbox.org",
+          },
+          j = {
+            description = "Journal",
+            template = "* %<%Y-%m-%d>\n  %?",
+            target = "~/ORG/journal.org",
+          },
+        },
       })
 
-      -------------------------------------------------
-      -- VIMTEX
-      -------------------------------------------------
-      vim.g.vimtex_view_method = "zathura"
+      vim.keymap.set("n", "<leader>oc", function() require("orgmode").action("capture.prompt") end, { desc = "Org Capture" })
+      vim.keymap.set("n", "<leader>oa", function() require("orgmode").action("agenda.prompt") end, { desc = "Org Agenda" })
+           -------------------------------------------------
+           -- VIMTEX
+           -------------------------------------------------
+           vim.g.vimtex_view_method = "zathura"
     '';
   };
 }