From 6e7f3533aa6b6e658f3882ac4f333ffcc0a154f3 Mon Sep 17 00:00:00 2001 From: Proctor Date: Thu, 22 Sep 2022 08:36:06 -0500 Subject: [PATCH] Add nvim-orgmode plugin --- nvim/.config/nvim/fnl/dotfiles/mapping.fnl | 4 +++- nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl | 1 + nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl | 3 ++- nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl | 8 ++++++++ nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl | 6 +++++- nvim/.config/nvim/fnl/dotfiles/plugins.fnl | 1 + 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl diff --git a/nvim/.config/nvim/fnl/dotfiles/mapping.fnl b/nvim/.config/nvim/fnl/dotfiles/mapping.fnl index 9ac3218..f0a1732 100644 --- a/nvim/.config/nvim/fnl/dotfiles/mapping.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/mapping.fnl @@ -1,7 +1,9 @@ (module dotfiles.mapping {autoload {nvim aniseed.nvim nu aniseed.nvim.util - core aniseed.core}}) + core aniseed.core + util dotfiles.util + }}) (defn- noremap [mode from to] "Sets a mapping with {:noremap true}." diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl index 20195c2..f59e5e5 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl @@ -25,6 +25,7 @@ :nvim_lsp true :nvim_lua true :conjure true + :orgmode true :vsnip true :vim_dadbod_completion true}}))) diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl index 63bbab5..3d16180 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl @@ -44,7 +44,8 @@ :ca "lua vim.lsp.buf.code_action()" :cl "lua vim.lsp.codelens.run()" :ic "lua vim.lsp.buf.incoming_calls()" - :oc "lua vim.lsp.buf.outgoing_calls()" + ;; TODO: think of new mapping; conficts with org mode + ;; :oc "lua vim.lsp.buf.outgoing_calls()" :sld "lua vim.diagnostic.open_float(nil, {source = 'always'})" :rn "lua vim.lsp.buf.rename()" :fa "lua vim.lsp.buf.formatting_sync()" diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl new file mode 100644 index 0000000..af4d803 --- /dev/null +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl @@ -0,0 +1,8 @@ +(module dotfiles.plugin.orgmode + {autoload {orgmode orgmode}}) + +(orgmode.setup_ts_grammar) + +(orgmode.setup + {:org_agenda_files ["~/Dropbox/org/*" "~/my-orgs/**/*"] + :org_default_notes_file "~/Dropbox/org/refile.org" }) diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl index 8fa9905..a8e3f69 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl @@ -3,7 +3,11 @@ (treesitter.setup {:highlight {:enable true - :additional_vim_regex_highlighting false} + ;; :additional_vim_regex_highlighting false + :additional_vim_regex_highlighting [:org] + } + + :ensure_installed [:org] :rainbow {:enable true :extended_mode true ; Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl index 109aeaa..04a787c 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl @@ -52,6 +52,7 @@ :kristijanhusak/vim-dadbod-ui {} :neovim/nvim-lspconfig {:mod :lspconfig} ; NeoVim lsp config :norcalli/nvim-colorizer.lua {:mode :colorizer} + :nvim-orgmode/orgmode { :mod :orgmode } :nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim] [:nvim-lua/plenary.nvim]] :mod :telescope} :nvim-treesitter/nvim-treesitter {:run ":TSUpdate" :mod :treesitter} :p00f/nvim-ts-rainbow {}