diff options
| -rw-r--r-- | fnl/plugins/editor/cmp.fnl | 1 | ||||
| -rw-r--r-- | fnl/plugins/editor/neo-tree.fnl | 58 | ||||
| -rw-r--r-- | fnl/plugins/editor/neorg.fnl | 38 | ||||
| -rw-r--r-- | fnl/plugins/editor/oil.fnl | 27 | ||||
| -rw-r--r-- | fnl/plugins/editor/treesitter.fnl | 1 | ||||
| -rw-r--r-- | lazy-lock.json | 34 |
6 files changed, 85 insertions, 74 deletions
diff --git a/fnl/plugins/editor/cmp.fnl b/fnl/plugins/editor/cmp.fnl index b79cd5a..ca09329 100644 --- a/fnl/plugins/editor/cmp.fnl +++ b/fnl/plugins/editor/cmp.fnl @@ -40,6 +40,7 @@ {:name :luasnip} {:name :spell} {:name :orgmode} + {:name :neorg} {:name :buffer :keyword_length 4} {:name :path :keyword_length 6} {:name :vim-dadbod-completion} diff --git a/fnl/plugins/editor/neo-tree.fnl b/fnl/plugins/editor/neo-tree.fnl deleted file mode 100644 index 153d3e5..0000000 --- a/fnl/plugins/editor/neo-tree.fnl +++ /dev/null @@ -1,58 +0,0 @@ -;; File manager. - -(local dependencies [:nvim-lua/plenary.nvim - :nvim-tree/nvim-web-devicons - :MunifTanjim/nui.nvim]) - -(local cursorline (require :util.cursorline)) - -(fn init [] - (set vim.g.neo_tree_remove_legacy_commands 1) - (if (= (vim.fn.argc) 1) - (let [stat (vim.loop.fs_stat (vim.fn.argv 1))] - (if (and stat (= stat.type :directory)) - (require :neo-tree))))) - -(fn deactivate [] - (vim.cmd "Neotree close")) - -(local opts {:sources [:filesystem :buffers :git_status :document_symbols] - :source_selector {:winbar false :statusline false} - :use_popups_for_input false - :enable_git_status false - :enable_diagnostics false - :open_files_do_not_replace_types [:terminal :Trouble :qf :Outline] - :filesystem {:bind_to_cwd false - :follow_current_file true - :hijack_netrw_behavior :open_default - :use_libuv_file_watcher true} - :icon {:folder_closed "" - :folder_open "" - :folder_empty "" - :default "*" - :highlight :NeoTreeFileIcon} - :window {:position :float - :popup {:position {:col "50%" :row :10}} - :mappings {:<space> :none - :P {1 :toggle_preview - :config {:use_float true}} - :l :open - :h :close_node - :. :toggle_hidden - :e :focus_preview}} - :default_component_configs {:indent {:with_expanders true - :expander_collapsed "" - :expander_expanded "" - :expander_highlight :NeoTreeExpander}} - :event_handlers [{:event :neo_tree_buffer_enter - :handler cursorline.show} - {:event :neo_tree_buffer_leave - :handler cursorline.show}]}) - -{1 :nvim-neo-tree/neo-tree.nvim - :keys [{1 "-" 2 "<cmd>Neotree filesystem reveal<cr>" :desc "Open Neotree"}] - :cmd :Neotree - : init - : deactivate - : opts - : dependencies} diff --git a/fnl/plugins/editor/neorg.fnl b/fnl/plugins/editor/neorg.fnl new file mode 100644 index 0000000..6e15a74 --- /dev/null +++ b/fnl/plugins/editor/neorg.fnl @@ -0,0 +1,38 @@ +;; Orgmode but better. + +(local opts {:load {:core.defaults {} + :core.concealer {} + :core.summary {} + :core.completion {:config {:engine :nvim-cmp}} + :core.presenter {:config {:zen_mode :zen-mode}} + :core.dirman {:config {:workspaces {:master "~/.local/share/norg" + :molecular-notes "~/.local/share/norg/molecular-notes" + :gtd "~/.local/share/norg/gtd"} + :autochdir false + :default_workspace :master}} + :core.integrations.telescope {}}}) + +(fn config [] + (let [neorg (require :neorg)] + (neorg.setup opts))) + +(local auto-cmds + [[:FileType + {:pattern :norg + :callback (fn [] + (tset vim.opt_local :conceallevel 3))}]]) + +(fn init [] + (let [cmds (require :util.cmds)] + (cmds.create-auto-cmds auto-cmds))) + +{1 :nvim-neorg/neorg + :build ":Neorg sync-parsers" + :keys [{1 :<cr> 2 :VBox<cr> :mode :v}] + :ft :norg + :cmd :Norg + : init + : config + :dependencies [:nvim-lua/plenary.nvim + :nvim-neorg/neorg-telescope + :jbyuki/venn.nvim]} diff --git a/fnl/plugins/editor/oil.fnl b/fnl/plugins/editor/oil.fnl new file mode 100644 index 0000000..e326663 --- /dev/null +++ b/fnl/plugins/editor/oil.fnl @@ -0,0 +1,27 @@ +;; File explorer that lets you edit your filesystem. + +(local keymaps {:g? :actions.show_help + :<CR> :actions.select + :<C-s> :actions.select_vsplit + :<C-h> :actions.select_split + :<C-t> :actions.select_tab + :<C-p> :actions.preview + :<C-c> :actions.close + :<C-l> :actions.refresh + :- :actions.parent + :_ :actions.open_cwd + "`" :actions.cd + "~" :actions.tcd + :gs :actions.change_sort + :gx :actions.open_external + :g. :actions.toggle_hidden + "g\\\\" :actions.toggle_trash}) + +(fn config [] + (let [oil (require :oil)] + (oil.setup {: keymaps}) + (vim.keymap.set :n "-" (fn [] + (oil.open)) + {:desc "Open parent directory"}))) + +{1 :stevearc/oil.nvim : config :event :VeryLazy} diff --git a/fnl/plugins/editor/treesitter.fnl b/fnl/plugins/editor/treesitter.fnl index e1718be..0062ba1 100644 --- a/fnl/plugins/editor/treesitter.fnl +++ b/fnl/plugins/editor/treesitter.fnl @@ -15,6 +15,7 @@ :lua :make :markdown + :norg :ocaml :org :python diff --git a/lazy-lock.json b/lazy-lock.json index 4959cf5..5d1492b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "cab667e2674881001a86a7478fff7dc7791c63f5" }, - "SchemaStore.nvim": { "branch": "main", "commit": "6316dc88db89d97d190f24547adddd13569fb746" }, + "LuaSnip": { "branch": "master", "commit": "df58ee1664cfda71479cd2bbd56114f56599eba6" }, + "SchemaStore.nvim": { "branch": "main", "commit": "54a4ea14b70cd3fc9db8217bb4ac9e1f78bfa390" }, "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -15,7 +15,7 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, "flit.nvim": { "branch": "main", "commit": "f4e9af572a62c808c8de214da672f2a115a98c35" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitsigns.nvim": { "branch": "main", "commit": "5fc573f2d2a49aec74dd6dc977e8b137429d1897" }, @@ -26,45 +26,47 @@ "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3d9e06ca604185ea5675d3c2ffd4284e0c2c7ffc" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4f81a9213fab94d4c074341acdf7118aaf959275" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, - "neogit": { "branch": "master", "commit": "809187dae9c7df368d08ba95cf034c7929574fa2" }, + "neogit": { "branch": "master", "commit": "3c4db5d1040909879136ea49ca67d68896f5a3b1" }, + "neorg": { "branch": "main", "commit": "7115898688f8fdac4d421ba3225532eb46f8b7bc" }, + "neorg-telescope": { "branch": "main", "commit": "6a7a677c40fa3c348924a4e2a06a513e0b34c056" }, "no-clown-fiesta.nvim": { "branch": "master", "commit": "ecf3e186d336e03b5ce7ed4e8f7f72ad983947df" }, - "none-ls.nvim": { "branch": "main", "commit": "358dd357a753f81412397b8a4cc01a2f41a1b594" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "none-ls.nvim": { "branch": "main", "commit": "fc0f6013ced00fbd61a1ee079427ad445eea0e4b" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-bqf": { "branch": "main", "commit": "8784eebf34371049b641646d00232c2603215297" }, "nvim-bufdel": { "branch": "main", "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" }, + "nvim-lspconfig": { "branch": "master", "commit": "daaf00a77805e113acf8ccc02dd8c3403d691683" }, "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" }, "nvim-surround": { "branch": "main", "commit": "0855a89e00a5822c3a482a82e5223fcf2e9ede13" }, - "nvim-treesitter": { "branch": "master", "commit": "71bdf97bf6dafc776ad957169533f2f669a8c562" }, + "nvim-treesitter": { "branch": "master", "commit": "b8fbd13277aae47fecdf7ec63731fa1f9918ac07" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, - "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, + "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" }, + "oil.nvim": { "branch": "master", "commit": "e89a8f8adeef2dfab851fd056d38ee7afc97c249" }, "orgmode": { "branch": "master", "commit": "cbb10d4c7514680e90f791d62f1168cb87aad0ce" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "daf59744f60e34cbb48a40a092e9e735553b6f21" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "ca5fa5326fc2b2ebd3269176594c4341ad720ac5" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-orgmode.nvim": { "branch": "main", "commit": "eabff061c3852a9aa94e672a7d2fa4a1ef63f9e2" }, - "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, + "telescope.nvim": { "branch": "master", "commit": "84c5a71d825b6687a55aed6f41e98b92fd8e5454" }, "toggleterm.nvim": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" }, "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, + "venn.nvim": { "branch": "main", "commit": "e4d68341a73dd56c64955058821a58295fb337b1" }, "vim-dadbod": { "branch": "master", "commit": "738cfc2ea6a1510fe23cba9006fef9291be70f7b" }, "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, - "vim-dadbod-ui": { "branch": "master", "commit": "95fd22469507e86b78aa55d868c14108adee2881" }, + "vim-dadbod-ui": { "branch": "master", "commit": "9ddb0623e69d696b7a8355b93e3950a8dc6e00a0" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, |