diff options
| -rw-r--r-- | fnl/plugins/core/hotpot.fnl (renamed from fnl/plugins/compiler/hotpot.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/alpha.fnl (renamed from fnl/plugins/ui/alpha.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/bqf.fnl (renamed from fnl/plugins/ui/bqf.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/diffview.fnl (renamed from fnl/plugins/tools/diffview.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/easyread.fnl (renamed from fnl/plugins/ui/easyread.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/lualine.fnl (renamed from fnl/plugins/ui/lualine.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/minibar.fnl (renamed from fnl/plugins/ui/minibar.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/neogit.fnl (renamed from fnl/plugins/tools/neogit.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/editor/orgmode.fnl (renamed from fnl/plugins/tools/orgmode.fnl) | 0 | ||||
| -rw-r--r-- | fnl/plugins/init.fnl | 25 | ||||
| -rw-r--r-- | fnl/util/cursorline.fnl | 6 | ||||
| -rw-r--r-- | lazy-lock.json | 9 | ||||
| -rw-r--r-- | spell/en.utf-8.add | 1 | ||||
| -rw-r--r-- | spell/en.utf-8.add.spl | bin | 490 -> 503 bytes |
14 files changed, 17 insertions, 24 deletions
diff --git a/fnl/plugins/compiler/hotpot.fnl b/fnl/plugins/core/hotpot.fnl index eba8083..eba8083 100644 --- a/fnl/plugins/compiler/hotpot.fnl +++ b/fnl/plugins/core/hotpot.fnl diff --git a/fnl/plugins/ui/alpha.fnl b/fnl/plugins/editor/alpha.fnl index c9dce50..c9dce50 100644 --- a/fnl/plugins/ui/alpha.fnl +++ b/fnl/plugins/editor/alpha.fnl diff --git a/fnl/plugins/ui/bqf.fnl b/fnl/plugins/editor/bqf.fnl index e2b0791..e2b0791 100644 --- a/fnl/plugins/ui/bqf.fnl +++ b/fnl/plugins/editor/bqf.fnl diff --git a/fnl/plugins/tools/diffview.fnl b/fnl/plugins/editor/diffview.fnl index c004199..c004199 100644 --- a/fnl/plugins/tools/diffview.fnl +++ b/fnl/plugins/editor/diffview.fnl diff --git a/fnl/plugins/ui/easyread.fnl b/fnl/plugins/editor/easyread.fnl index c456726..c456726 100644 --- a/fnl/plugins/ui/easyread.fnl +++ b/fnl/plugins/editor/easyread.fnl diff --git a/fnl/plugins/ui/lualine.fnl b/fnl/plugins/editor/lualine.fnl index 80adf55..80adf55 100644 --- a/fnl/plugins/ui/lualine.fnl +++ b/fnl/plugins/editor/lualine.fnl diff --git a/fnl/plugins/ui/minibar.fnl b/fnl/plugins/editor/minibar.fnl index ed80330..ed80330 100644 --- a/fnl/plugins/ui/minibar.fnl +++ b/fnl/plugins/editor/minibar.fnl diff --git a/fnl/plugins/tools/neogit.fnl b/fnl/plugins/editor/neogit.fnl index e9c6235..e9c6235 100644 --- a/fnl/plugins/tools/neogit.fnl +++ b/fnl/plugins/editor/neogit.fnl diff --git a/fnl/plugins/tools/orgmode.fnl b/fnl/plugins/editor/orgmode.fnl index bb67b88..bb67b88 100644 --- a/fnl/plugins/tools/orgmode.fnl +++ b/fnl/plugins/editor/orgmode.fnl diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl index 00be90b..2ab9d99 100644 --- a/fnl/plugins/init.fnl +++ b/fnl/plugins/init.fnl @@ -1,21 +1,14 @@ ;; Load all plugins. -(fn get-plugins [...] +(fn get-plugins [] (let [plugins [] - path (.. (vim.fn.stdpath :config) :/fnl/plugins)] - (each [_ m (ipairs [...])] - (let [module-path (.. path "/" m)] - (if (vim.loop.fs_stat module-path) - (do - (if (= :lsp m) - (table.insert plugins (require (.. :plugins. m))) - (each [fname (vim.fs.dir module-path)] - (let [fname (fname:match "^(.*)%.fnl$")] - (table.insert plugins - (require (.. :plugins. m "." fname)))))))))) - (vim.tbl_flatten plugins) + path (.. (vim.fn.stdpath :config) :/fnl/plugins/editor)] + (each [fname (vim.fs.dir path)] + (let [fname (fname:match "^(.*)%.fnl$")] + (table.insert plugins (require (.. :plugins.editor. fname))))) + (table.insert plugins (require :plugins.lsp)) plugins)) -(let [lazy (require :plugins.core.lazy) - plugins (get-plugins :compiler :editor :lsp :tools :ui)] - (lazy.setup plugins)) +(let [_ (require :plugins.core.hotpot) + lazy (require :plugins.core.lazy)] + (lazy.setup (get-plugins))) diff --git a/fnl/util/cursorline.fnl b/fnl/util/cursorline.fnl index e094a4a..cec76f2 100644 --- a/fnl/util/cursorline.fnl +++ b/fnl/util/cursorline.fnl @@ -1,12 +1,12 @@ -;; Functions for showing and hiding the cursorline. +;; Shows (hides) the cursorline in the (un)focused window. -(local ignore-filetypes [:neo-tree]) +(local ignored [:neo-tree]) (fn filetype [] vim.bo.filetype) (fn ignore [] - (vim.tbl_contains ignore-filetypes (filetype))) + (vim.tbl_contains ignored (filetype))) (fn show [] (let [(ok cl) (pcall vim.api.nvim_win_get_var 0 :auto-cursorline)] diff --git a/lazy-lock.json b/lazy-lock.json index e41a4dc..59b75dc 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, - "SchemaStore.nvim": { "branch": "main", "commit": "bdba0106f6e33fffb8e2ffea0162ce5565b18840" }, + "SchemaStore.nvim": { "branch": "main", "commit": "bfefae6563c7de12dc7eaa9351ae14d5f2c9fea4" }, "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -14,10 +14,9 @@ "diffview.nvim": { "branch": "main", "commit": "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c" }, "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, "flit.nvim": { "branch": "main", "commit": "5c9a78b97f7f4301473ea5e37501b5b1d4da167b" }, - "friendly-snippets": { "branch": "main", "commit": "6e0afe3be0ba43ef03d495a529de8fb22721c0d0" }, + "friendly-snippets": { "branch": "main", "commit": "ca668b7a4a2913ad1109b5e4aaf0013651956b13" }, "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, - "hotpot.nvim": { "branch": "master", "commit": "026eba9596b506ab6f807fd4aa93cd5f76255725" }, "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" }, "leap.nvim": { "branch": "main", "commit": "8facf2eb6a378fd7691dce8c8a7b2726823e2408" }, "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, @@ -29,7 +28,7 @@ "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da" }, "neogit": { "branch": "master", "commit": "1b6edb56e8c754494be1564912d33e50ddd8a023" }, - "no-clown-fiesta.nvim": { "branch": "master", "commit": "e2e49eab9a152b753fa1c4c39d209f1687c0077f" }, + "no-clown-fiesta.nvim": { "branch": "master", "commit": "907d247a6c8fd1932cf99b62c939e6f930b22760" }, "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" }, @@ -40,7 +39,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, "nvim-spectre": { "branch": "master", "commit": "6edac44e10b94b88bf3067fae937915172a3f825" }, "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" }, - "nvim-treesitter": { "branch": "master", "commit": "3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36" }, + "nvim-treesitter": { "branch": "master", "commit": "b4b94ec387525cb9df4b56eb1a8bf33231a0df47" }, "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, "nvim-window-picker": { "branch": "main", "commit": "6e9875711b9d5cefcf77cc6e30dcce53135b9cc5" }, "orgmode": { "branch": "master", "commit": "6f73b461b9f887968d0f69ab3aee6b4ceebe3445" }, diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index da591d5..fbf09d1 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -39,3 +39,4 @@ Olical folke Kalman cursorline +haskell diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl Binary files differindex b89002b..60bd34c 100644 --- a/spell/en.utf-8.add.spl +++ b/spell/en.utf-8.add.spl |