diff options
| -rw-r--r-- | .hotpot.fnl | 3 | ||||
| -rw-r--r-- | fnl/config.fnl | 6 | ||||
| -rw-r--r-- | fnl/plugins/compile-mode.fnl | 20 | ||||
| -rw-r--r-- | fnl/plugins/leap.fnl | 1 | ||||
| -rw-r--r-- | fnl/settings/autocmds.fnl | 6 | ||||
| -rw-r--r-- | fnl/settings/keymaps.fnl | 2 | ||||
| -rw-r--r-- | fnl/settings/options.fnl | 2 | ||||
| -rw-r--r-- | init.lua | 10 | ||||
| -rw-r--r-- | lazy-lock.json | 59 |
9 files changed, 68 insertions, 41 deletions
diff --git a/.hotpot.fnl b/.hotpot.fnl new file mode 100644 index 0000000..3df58ae --- /dev/null +++ b/.hotpot.fnl @@ -0,0 +1,3 @@ +{:schema :hotpot/2 + :target :cache + :compiler {:correlate true}} diff --git a/fnl/config.fnl b/fnl/config.fnl index cf50b2f..478bae2 100644 --- a/fnl/config.fnl +++ b/fnl/config.fnl @@ -7,12 +7,16 @@ (local {: apply-to-files} (require :util.load)) +(local api (require :hotpot.api)) +(local context (assert (api.context (vim.fn.stdpath :config)))) + (local opts {:install {:colorscheme [:no-clown-fiesta]} :debug false :defaults {:lazy false} :dev {:path (.. (vim.fn.expand :$HOME) :/projects)} :performance {:cache {:enabled true} - :rtp {:disabled_plugins [:gzip + :rtp {:paths [(context.locate :destination)] + :disabled_plugins [:gzip :matchit :netrwPlugin :tarPlugin diff --git a/fnl/plugins/compile-mode.fnl b/fnl/plugins/compile-mode.fnl new file mode 100644 index 0000000..b8d9c53 --- /dev/null +++ b/fnl/plugins/compile-mode.fnl @@ -0,0 +1,20 @@ +(local keys + [{1 :<m-c> 2 :<cmd>Compile<cr> :desc :Compile} + {1 :<m-C> 2 :<cmd>Recompile<cr> :desc :Recompile} + {1 "]e" 2 :<cmd>NextError<cr> :desc "Next compile error"} + {1 "[e" 2 :<cmd>PrevError<cr> :desc "Prev compile error"}]) + +(λ config [] + (set vim.g.compile_mode {:default_command {:ocaml "dune build"} + :bang_expansion true + :recompile_no_fail true + :auto_jump_to_first_error false + :ask_about_save true + :ask_to_interrupt true + :auto_scroll true})) + +{1 :ej-shafran/compile-mode.nvim + :version :^5.0.0 + :dependencies [:nvim-lua/plenary.nvim] + : config + : keys} diff --git a/fnl/plugins/leap.fnl b/fnl/plugins/leap.fnl index 3c846c5..397b873 100644 --- a/fnl/plugins/leap.fnl +++ b/fnl/plugins/leap.fnl @@ -40,6 +40,7 @@ (vim.keymap.set [:n] :gs "<Plug>(leap-from-window)"))) {:url "https://codeberg.org/andyg/leap.nvim" +:name :leap.nvim : dependencies :event :VeryLazy : config} diff --git a/fnl/settings/autocmds.fnl b/fnl/settings/autocmds.fnl index b2a065c..9b5eac5 100644 --- a/fnl/settings/autocmds.fnl +++ b/fnl/settings/autocmds.fnl @@ -12,7 +12,11 @@ [:FileType {:pattern [:gitcommit :markdown] :command "setlocal wrap"}] [:VimResized {:command "tabdo wincmd ="}] - [[:FocusGained :BufEnter] {:command :checktime}] + [[:FocusGained :BufEnter :CursorHold :CursorHoldI] + {:pattern "*" + :callback (fn [] + (when (= (vim.fn.mode) :n) + (vim.cmd :checktime)))}] [[:InsertLeave :WinEnter] {:callback (λ [] (let [cursorline (require :settings.cursorline)] diff --git a/fnl/settings/keymaps.fnl b/fnl/settings/keymaps.fnl index aa32316..14cd160 100644 --- a/fnl/settings/keymaps.fnl +++ b/fnl/settings/keymaps.fnl @@ -33,6 +33,8 @@ [:n :<c-u> :<c-u>zz {}] ;; Remove highlighted search [:n :<m-h> :<cmd>nohlsearch<CR> {}] + ;; jump to eol in insert mode + [:i :<c-e> :<c-o>$ {}] ;; Force refresh [:n :mj "<cmd>:e<CR>" {:desc :Refresh}]]) diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl index c72d415..e7ece5f 100644 --- a/fnl/settings/options.fnl +++ b/fnl/settings/options.fnl @@ -43,7 +43,7 @@ ;; enable persistent undo :undofile true ;; faster completion (4000ms default) - :updatetime 100 + :updatetime 1000 ;; if a file is being edited by another program (or was written ;; to file while editing with another program), it is not allowed ;; to be edited @@ -17,13 +17,5 @@ end ensure("folke", "lazy.nvim") ensure("rktjmp", "hotpot.nvim") -vim.loader.enable() -require("hotpot").setup { - provide_require_fennel = true, - compiler = { - modules = { - correlate = true, - }, - }, -} +require "hotpot" require "config" diff --git a/lazy-lock.json b/lazy-lock.json index a8fd5b2..2c11cae 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,58 +1,59 @@ { - "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "alpha-nvim": { "branch": "main", "commit": "a9d8fb72213c8b461e791409e7feabb74eb6ce73" }, - "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, - "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, + "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" }, + "alpha-nvim": { "branch": "main", "commit": "7563da4a861ee6b3ed674d0ee5c5c0bd19383a38" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, + "compile-mode.nvim": { "branch": "main", "commit": "ce34ad9e69cb6a2d9f71017f4cb090195fb9fc09" }, + "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, "flit.nvim": { "branch": "main", "commit": "ef18183b22377741e154cffb5b914516381d3870" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "git-worktree.nvim": { "branch": "master", "commit": "666f84ba8dd9172f0a7b45c9f7c24bc5e55f6fc2" }, - "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, - "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" }, + "gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" }, + "grug-far.nvim": { "branch": "main", "commit": "21604255d0e8f9968322f61f2b6c09e5efe1285a" }, "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, - "hotpot.nvim": { "branch": "main", "commit": "27cc1025960eae88ad1dd270376f69be7a2d9174" }, + "hotpot.nvim": { "branch": "main", "commit": "445ab013c73f48b75cb634be963da8481a97a056" }, "kulala.nvim": { "branch": "main", "commit": "6656c9d332735ca6a27725e0fb45a1715c4372d9" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "leap-spooky.nvim": { "branch": "main", "commit": "2d48433a81164aa102cc2c3fcbdb4d998be05570" }, - "leap.nvim": { "branch": "main", "commit": "9a26da7a14c09cd84c05a4e8326890ef0f92a590" }, + "leap.nvim": { "branch": "main", "commit": "b960d5038c5c505c52e56a54490f9bbb1f0e6ef6" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "21c2a84ce368e99b18f52ab348c4c02c32c02fcf" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "neogit": { "branch": "master", "commit": "df323856553d4c5e5c41117606c63f628b24a3b0" }, - "nvim-bqf": { "branch": "main", "commit": "f65fba733268ffcf9c5b8ac381287eca7c223422" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" }, + "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" }, + "neogit": { "branch": "master", "commit": "e06745228600a585b88726fc9fba44a373c15a47" }, + "nvim-bqf": { "branch": "main", "commit": "c282a62bec6c0621a1ef5132aa3f4c9fc4dcc2c7" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lint": { "branch": "master", "commit": "a3d17105a79fc12055c2a0d732665d9c2b1c2dc3" }, - "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" }, + "nvim-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" }, + "nvim-lspconfig": { "branch": "master", "commit": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-various-textobjs": { "branch": "main", "commit": "34ca4f6b54cf167554c5792cacc69c930b654136" }, - "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, + "nvim-various-textobjs": { "branch": "main", "commit": "ad78e9d925c95d675b32dd7ba6d253f96ce063fe" }, + "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" }, - "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" }, - "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" }, - "org-roam.nvim": { "branch": "main", "commit": "74276a94e9e4af463e7ba35c22259eeced9c90f9" }, - "orgmode": { "branch": "master", "commit": "26aa4fa26c570da6eb6798fb1b8df364204c3d99" }, + "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, + "org-bullets.nvim": { "branch": "main", "commit": "503fe053550879cc202086a40454e46a87c41ddb" }, + "org-roam.nvim": { "branch": "main", "commit": "6c21c867b178a80fb4ad243c445545e5583d8232" }, + "orgmode": { "branch": "master", "commit": "a214db3c8ed7eb68cb74924575b91ffc658e7d82" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" }, - "schemastore.nvim": { "branch": "main", "commit": "f59ce07433e466b6c7dca829e100a011fc23192f" }, + "render-markdown": { "branch": "main", "commit": "0fd43fb4b1f073931c4b481f5f3b7cea3749e190" }, + "schemastore.nvim": { "branch": "main", "commit": "0ce1f8aba51db6812382a4135f5b20a9f0c959ec" }, "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, "stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" }, "telescope-frecency.nvim": { "branch": "master", "commit": "fc6418bf663a182b72427487246b870f2ddbbbe2" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, - "telescope-orgmode.nvim": { "branch": "main", "commit": "bc9bf4f90d364ed5123fca1a3ee78242bcaa121d" }, - "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, + "telescope-orgmode.nvim": { "branch": "main", "commit": "0a9872f7932bcf4d08a8278b1493119ffcdc83c6" }, + "telescope.nvim": { "branch": "master", "commit": "471eebb1037899fd942cc0f52c012f8773505da1" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, - "undotree": { "branch": "master", "commit": "d8f99084d98c32f651860eb0baaf89759f91debc" }, - "unison": { "branch": "trunk", "commit": "3aea4e422bbd74c598aad12f96c85637a6b4ba3d" }, + "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, + "unison": { "branch": "trunk", "commit": "6f5937927d0fff6299052fffa22829a11ee80b8d" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" }, "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, |