diff options
31 files changed, 208 insertions, 154 deletions
diff --git a/fnl/aktersnurra.fnl b/fnl/config.fnl index cf50b2f..cf50b2f 100644 --- a/fnl/aktersnurra.fnl +++ b/fnl/config.fnl diff --git a/fnl/plugins/alpha.fnl b/fnl/plugins/alpha.fnl index a989749..4011bcd 100644 --- a/fnl/plugins/alpha.fnl +++ b/fnl/plugins/alpha.fnl @@ -27,20 +27,20 @@ (set dashboard.section.header.val ascii-art) (set dashboard.section.buttons.val [(dashboard.button :f (.. (. icons :search-files) " Find file") - ":Telescope find_files theme=ivy previewer=false<CR>") + ":Telescope find_files theme=dropdown previewer=false<CR>") (dashboard.button :g (.. (. icons :search-text) " Find text") - ":Telescope live_grep theme=ivy<CR>") + ":Telescope live_grep theme=dropdown<CR>") (dashboard.button :p (.. (. icons :search-project) " Find project") - ":Telescope projects theme=ivy<CR>") + ":Telescope projects theme=dropdown<CR>") (dashboard.button :r (.. (. icons :recent-files) " Recently used files") - ":Telescope oldfiles theme=ivy previewer=false<CR>") + ":Telescope oldfiles theme=dropdown previewer=false<CR>") (dashboard.button :t (.. (. icons :cog) " Configuration") ":e ~/.config/nvim/init.lua <CR>") (dashboard.button :o (.. (. icons :org) " Org") - ":Telescope find_files theme=ivy cwd=~/.local/share/org<CR>")]) + ":Telescope find_files theme=dropdown cwd=~/.local/share/org<CR>")]) (set dashboard.section.header.opts.hl :AlphaHeader) (set dashboard.section.buttons.opts.hl :AlphaButtons) (set dashboard.opts.opts.noautocmd true) diff --git a/fnl/plugins/bqf.fnl b/fnl/plugins/bqf.fnl index 38afd09..8d2ea2a 100644 --- a/fnl/plugins/bqf.fnl +++ b/fnl/plugins/bqf.fnl @@ -24,4 +24,4 @@ :ptoggleauto :a :ptogglemode :P}}) -{1 :kevinhwang91/nvim-bqf :event [:BufReadPost :BufNewFile] : opts} +{1 :kevinhwang91/nvim-bqf :event :VeryLazy : opts} diff --git a/fnl/plugins/cmp.fnl b/fnl/plugins/cmp.fnl index 1eb2e9e..a979633 100644 --- a/fnl/plugins/cmp.fnl +++ b/fnl/plugins/cmp.fnl @@ -3,8 +3,8 @@ (local opts {:keymap {:preset :default} :appearance {:use_nvim_cmp_as_default false :nerd_font_variant :mono} - :completion {:menu {:scrollbar false :border :none} - :documentation {:window {:border :none + :completion {:menu {:scrollbar false :border :single} + :documentation {:window {:border :single :scrollbar false}}} :signature {:enabled false :window {:scrollbar false}} :sources {:default [:lsp :path :snippets :buffer :dadbod] diff --git a/fnl/plugins/colorscheme.fnl b/fnl/plugins/colorscheme.fnl index 2d913ca..96ad95c 100644 --- a/fnl/plugins/colorscheme.fnl +++ b/fnl/plugins/colorscheme.fnl @@ -1,12 +1,16 @@ ;; Load neovim colorscheme. -(local opts {:styles {:type {:bold true} +(local opts {:theme :dark + :styles {:type {:bold true} :lsp {:underline true} :match_paren {:underline true}}}) (λ config [] (let [plugin (require :no-clown-fiesta)] - (plugin.setup opts) - (plugin.load))) + (plugin.load opts))) -{1 :aktersnurra/no-clown-fiesta.nvim :lazy false :priority 1000 : config} +{1 :aktersnurra/no-clown-fiesta.nvim + :lazy false + :priority 1000 + : config + :dev true} diff --git a/fnl/plugins/conform.fnl b/fnl/plugins/conform.fnl index b1b15ba..b84627d 100644 --- a/fnl/plugins/conform.fnl +++ b/fnl/plugins/conform.fnl @@ -17,7 +17,7 @@ :fennel [:fnlfmt] :haskell [:fourmolu] :html [:prettierd] - :http [:jq] + :http [:jq :kulala-fmt] :json [:jq] :lua [:stylua] :markdown [:prettierd] @@ -29,4 +29,4 @@ :toml [:taplo] :yaml [:yamlfmt]}}) -{1 :stevearc/conform.nvim : init : opts :event [:BufReadPost :BufNewFile]} +{1 :stevearc/conform.nvim : init : opts :event :BufRead} diff --git a/fnl/plugins/grug-far.fnl b/fnl/plugins/grug-far.fnl index 44da9b1..fdcf897 100644 --- a/fnl/plugins/grug-far.fnl +++ b/fnl/plugins/grug-far.fnl @@ -11,12 +11,12 @@ (when ?cword (set opts.prefills.search ?cword)) (when ?file - (set opts.prefills.flags ?file)) - (grug.grug_far opts))) + (set opts.prefills.paths ?file)) + (grug.open opts))) (λ visual-replace [] (let [grug (require :grug-far)] - (grug.with_visual_selection {:prefills {:flags (vim.fn.expand "%")}}))) + (grug.with_visual_selection {:prefills {:paths (vim.fn.expand "%")}}))) (λ config [] (let [{: create-auto-cmds} (require :util.cmds) @@ -24,23 +24,23 @@ (create-auto-cmds auto-cmds) (grug.setup))) -(local keys [{1 :<m-r> 2 :<cmd>GrugFar<cr> :desc "Find and Replace"} - {1 :<m-w> - 2 (λ [] - (replace (vim.fn.expand :<cword>))) - :desc "Find and replace word under cursor"} - {1 :<m-x> +(local keys [{1 :<m-w> 2 :<cmd>GrugFar<cr> :desc "Find and Replace"} + {1 :<m-s-w> 2 (λ [] (replace nil (vim.fn.expand "%"))) :desc "Find and replace in file"} - {1 :<m-a> + {1 :<m-r> 2 (λ [] - (replace (vim.fn.expand :<cword>) (vim.fn.expand "%"))) - :desc "Find and replace cword in file"} + (replace (vim.fn.expand :<cword>))) + :desc "Find and replace word under cursor"} {1 :<m-r> 2 (λ [] (visual-replace)) :desc "Find and Replace" - :mode [:v]}]) + :mode [:v]} + {1 :<m-s-r> + 2 (λ [] + (replace (vim.fn.expand :<cword>) (vim.fn.expand "%"))) + :desc "Find and replace cword in file"}]) {1 :MagicDuck/grug-far.nvim : keys : config} diff --git a/fnl/plugins/harpoon.fnl b/fnl/plugins/harpoon.fnl index 62ebf17..3f8f7ac 100644 --- a/fnl/plugins/harpoon.fnl +++ b/fnl/plugins/harpoon.fnl @@ -1,6 +1,9 @@ ;; Harpoon files for navigation. -(local opts {:ui_max_width 64 :title " ⇁ "}) +(local opts + {:ui_max_width 64 + :title " ⇁ " + :settings {:save_on_toggle true :sync_on_ui_close true}}) (local user-cmds [[:HarpoonAdd (λ [] @@ -40,8 +43,4 @@ (select 4)) :desc "Fourth Harpoon"}]) -{1 :ThePrimeagen/harpoon - :branch :harpoon2 - :event [:BufReadPost :BufNewFile] - : init - : keys} +{1 :ThePrimeagen/harpoon :branch :harpoon2 :event :BufRead : init : keys} diff --git a/fnl/plugins/kulala.fnl b/fnl/plugins/kulala.fnl new file mode 100644 index 0000000..f32ed5d --- /dev/null +++ b/fnl/plugins/kulala.fnl @@ -0,0 +1,41 @@ +;; Http client. + +(local icons (require :settings.icons)) + +(local global_keymaps {"Send request" {1 :<leader>rs + 2 (λ [] + (let [kulala (require :kulala)] + (kulala.run))) + :mode [:n :v] + :desc "Send request"} + "Send all requests" {1 :<leader>ra + 2 (λ [] + (let [kulala (require :kulala)] + (kulala.run_all))) + :mode [:n :v] + :ft :http} + "Replay the last request" {1 :<leader>rr + 2 (λ [] + (let [kulala (require :kulala)] + (kulala.replay))) + :ft :http} + "Select environment" {1 :<leader>re + 2 (λ [] + (let [kulala (require :kulala)] + (kulala.set_selected_env))) + :ft :http} + "Manage Auth Config" {1 :<leader>ru + 2 (λ [] + (let [kulala (require :kulala)] + (kulala.open_auth_config))) + :ft :http}}) + +(local ui {:icons {:inlay {:loading (. icons :hourglass) + :done (. icons :checkmark) + :error (. icons :error)} + :lualine (. icons :putty) + :textHighlight :WarningMsg}}) + +(local opts {: global_keymaps : ui}) + +{1 :mistweaverco/kulala.nvim :ft :http : opts} diff --git a/fnl/plugins/leap.fnl b/fnl/plugins/leap.fnl index 79b94c2..e7d3133 100644 --- a/fnl/plugins/leap.fnl +++ b/fnl/plugins/leap.fnl @@ -1,14 +1,14 @@ ;; Leap through text. (local dependencies [{1 :ggandor/flit.nvim - :event [:BufReadPost :BufNewFile] + :event :VimEnter :opts {:keys {:f :f :F :F :t :t :T :T} :labeled_modes :v :multiline true :opts {}}} - {1 :tpope/vim-repeat :event [:BufReadPost :BufNewFile]} + {1 :tpope/vim-repeat :event :VeryLazy} {1 :ggandor/leap-spooky.nvim - :event [:BufReadPost :BufNewFile] + :event :VeryLazy :opts {;; Additional text objects, to be merged with the default ones. ;; E.g.: {'iq', 'aq'} :extra_text_objects [:iq :aq] @@ -33,10 +33,10 @@ (λ config [] (let [leap (require :leap)] (leap.setup {}) - (leap.create_default_mappings) - (vim.keymap.set [:n :x :o] :gs "<Plug>(leap-from-window)"))) + (vim.keymap.set [:n :x :o] :s "<Plug>(leap-forward)") + (vim.keymap.set [:n :x :o] :S "<Plug>(leap-backward)") + (vim.keymap.set [:x :o] :x "<Plug>(leap-forward-till)") + (vim.keymap.set [:x :o] :X "<Plug>(leap-backward-till)") + (vim.keymap.set [:n] :gs "<Plug>(leap-from-window)"))) -{1 :ggandor/leap.nvim - : dependencies - :event [:BufReadPost :BufNewFile] - : config} +{1 :ggandor/leap.nvim : dependencies :event :VeryLazy : config} diff --git a/fnl/plugins/lsp/keymaps.fnl b/fnl/plugins/lsp/keymaps.fnl index 72e03cd..f312581 100644 --- a/fnl/plugins/lsp/keymaps.fnl +++ b/fnl/plugins/lsp/keymaps.fnl @@ -4,15 +4,15 @@ [[:n :gD "<cmd>lua vim.lsp.buf.declaration()<CR>" {:desc :Declaration}] [:n :gd - "<cmd>Telescope lsp_definitions theme=dropdown<cr>" + "<cmd>Telescope lsp_definitions theme=get_dropdown<cr>" {:desc :Definition}] [:n :gI - "<cmd>Telescope lsp_implementations theme=dropdown<cr>" + "<cmd>Telescope lsp_implementations theme=get_dropdown<cr>" {:desc :Implementation}] [:n :gr - "<cmd>Telescope lsp_references theme=dropdown<cr>" + "<cmd>Telescope lsp_references theme=get_dropdown<cr>" {:desc :References}] [:n :gl @@ -20,24 +20,24 @@ {:desc :Diagnostics}] [:n :gj - "<cmd>Telescope diagnostics theme=dropdown<cr>" + "<cmd>Telescope diagnostics theme=get_dropdown<cr>" {:desc "Telescope Diagnostics"}] [:n :gw - "<cmd>Telescope lsp_dynamic_workspace_symbols theme=dropdown<cr>" + "<cmd>Telescope lsp_dynamic_workspace_symbols theme=get_dropdown<cr>" {:desc "Workspace Symbols"}] [:n :gE - "<cmd>Telescope lsp_type_definitions theme=dropdown<cr>" - {:desc "Workspace Symbols"}] + "<cmd>Telescope lsp_type_definitions theme=get_dropdown<cr>" + {:desc "Type Definitions"}] [:n :gm "<cmd>lua vim.lsp.buf.signature_help()<CR>" {:desc :Signature}] [:n :gM - "<cmd>Telescope lsp_document_symbols theme=dropdown<cr>" + "<cmd>Telescope lsp_document_symbols theme=get_dropdown<cr>" {:desc "Document Symbols"}] [:n :gh "<cmd>lua vim.lsp.buf.code_action()<cr>" {:desc "Code Action"}] [:n :gb "<cmd>lua vim.lsp.codelens.run()<cr>" {:desc "Code Lens"}] - [:n :K "<cmd>lua vim.lsp.hover()<cr>" {:desc "Hover documentation"}] + [:n :K "<cmd>lua vim.lsp.buf.hover()<cr>" {:desc "Hover documentation"}] [:n :<leader>li :<cmd>LspInfo<cr> {:desc "Lsp Info"}]]) (λ on-attach [buffer] diff --git a/fnl/plugins/lsp/lspconfig.fnl b/fnl/plugins/lsp/lspconfig.fnl index 5cd25d4..192954c 100644 --- a/fnl/plugins/lsp/lspconfig.fnl +++ b/fnl/plugins/lsp/lspconfig.fnl @@ -17,7 +17,7 @@ (mason-lspconfig.setup))) {1 :neovim/nvim-lspconfig - :event [:BufReadPost :BufNewFile] + :event :BufNew :dependencies [:mason.nvim :williamboman/mason-lspconfig.nvim :b0o/schemastore.nvim diff --git a/fnl/plugins/lsp/mason-lspconfig.fnl b/fnl/plugins/lsp/mason-lspconfig.fnl index 429e948..48ea0b5 100644 --- a/fnl/plugins/lsp/mason-lspconfig.fnl +++ b/fnl/plugins/lsp/mason-lspconfig.fnl @@ -2,9 +2,8 @@ ;; setup hooks for client configurations. (local textDocument-handlers - {:textDocument/hover (vim.lsp.with vim.lsp.handlers.hover {:border :single}) - :textDocument/signatureHelp (vim.lsp.with vim.lsp.handlers.signature_help - {:border :single})}) + {:textDocument/hover (vim.lsp.with vim.lsp.handlers.hover) + :textDocument/signatureHelp (vim.lsp.with vim.lsp.handlers.signature_help)}) (λ capabilities [] (let [blink-cmp (require :blink.cmp)] diff --git a/fnl/plugins/lsp/servers.fnl b/fnl/plugins/lsp/servers.fnl index fea4e89..7d213a8 100644 --- a/fnl/plugins/lsp/servers.fnl +++ b/fnl/plugins/lsp/servers.fnl @@ -16,7 +16,6 @@ [(vim.fn.line "$" 0)]))]}}} :ocamllsp {} - :pyright {} :rust_analyzer {:settings {:rust-analyzer {:lens {:enable true} :checkOnSave {:command :clippy}}}} :lua_ls {:settings {:Lua {:completion {:callSnippet :Replace} @@ -25,6 +24,7 @@ :path (vim.split package.path ";")}}}} :taplo {} :texlab {} + :ty {} :vale_ls {:filetypes [:markdown :text :org]} :sqls {} :yamlls {:settings {:yaml {:schemastore {:enable false :url ""} diff --git a/fnl/plugins/lualine.fnl b/fnl/plugins/lualine.fnl index b2f7e14..b331e79 100644 --- a/fnl/plugins/lualine.fnl +++ b/fnl/plugins/lualine.fnl @@ -55,7 +55,7 @@ :timer {:progress_enddelay 500 :lsp_client_name_enddelay 500}}) (local opts {:options {:icons_enabled true - :theme :auto + :theme :no-clown-fiesta :component_separators "" :section_separators {:left "" :right ""} :disabled_filetypes disable @@ -79,6 +79,6 @@ (local dependencies [:arkav/lualine-lsp-progress]) {1 :nvim-lualine/lualine.nvim - :event [:BufReadPost :BufNewFile] + :event :VeryLazy : opts : dependencies} diff --git a/fnl/plugins/nvim-lint.fnl b/fnl/plugins/nvim-lint.fnl index e2ecdc0..2d1887d 100644 --- a/fnl/plugins/nvim-lint.fnl +++ b/fnl/plugins/nvim-lint.fnl @@ -26,4 +26,4 @@ :yaml [:yamllint] :zsh [:zsh]}))) -{1 :mfussenegger/nvim-lint : init : config :event [:BufReadPost :BufNewFile]} +{1 :mfussenegger/nvim-lint : init : config :event :BufNew} diff --git a/fnl/plugins/rest.fnl b/fnl/plugins/rest.fnl deleted file mode 100644 index d9b1270..0000000 --- a/fnl/plugins/rest.fnl +++ /dev/null @@ -1,17 +0,0 @@ -;; Http client. - -(local keys [{1 :<leader>rr - 2 "<cmd>Rest run<cr>" - :desc "Run request under the cursor"} - {1 :<localleader>rs - 2 "<cmd>Rest run last<cr>" - :desc "Re-run last request"} - {1 :<localleader>rt - 2 "<cmd>Telescope rest select_env theme=dropdown<cr>" - :desc "Select env"}]) - -{1 :rest-nvim/rest.nvim - :ft :http - : keys - :dependencies [{1 :vhyrro/luarocks.nvim :priority 1000 :config true} - {1 :j-hui/fidget.nvim}]} diff --git a/fnl/plugins/stay-in-place.fnl b/fnl/plugins/stay-in-place.fnl index de6deb7..69066d7 100644 --- a/fnl/plugins/stay-in-place.fnl +++ b/fnl/plugins/stay-in-place.fnl @@ -1,3 +1,3 @@ ;; Keep cursor at character when indenting. -{1 :gbprod/stay-in-place.nvim :event [:BufReadPost :BufNewFile] :config true} +{1 :gbprod/stay-in-place.nvim :event :BufRead :config true} diff --git a/fnl/plugins/surround.fnl b/fnl/plugins/surround.fnl index e8fda32..7b8b684 100644 --- a/fnl/plugins/surround.fnl +++ b/fnl/plugins/surround.fnl @@ -1,3 +1,19 @@ ;; Surround selections. -{1 :kylechui/nvim-surround :event :InsertEnter :config true} +(local keymaps {:insert :<C-g>s + :insert_line :<C-g>S + :normal :ys + :normal_cur :yss + :normal_line :yS + :normal_cur_line :ySS + :visual :mS + :visual_line :gS + :delete :ds + :change :cs + :change_line :cS}) + +(λ config [] + (let [surround (require :nvim-surround)] + (surround.setup {: keymaps}))) + +{1 :kylechui/nvim-surround :version :^3.0.0 :event :VeryLazy : config} diff --git a/fnl/plugins/telescope.fnl b/fnl/plugins/telescope.fnl index 0d9df3e..0facab9 100644 --- a/fnl/plugins/telescope.fnl +++ b/fnl/plugins/telescope.fnl @@ -30,65 +30,59 @@ :nvim-telescope/telescope-frecency.nvim {1 :nvim-orgmode/telescope-orgmode.nvim}]) -(local extensions [:fzf - :frecency - :orgmode - :projects - :git_worktree - :harpoon - :rest]) +(local extensions [:fzf :frecency :orgmode :projects :git_worktree :harpoon]) (λ load-extensions [telescope] (each [_ extension (ipairs extensions)] (telescope.load_extension extension))) (local keys [{1 :mf - 2 "<cmd>Telescope find_files theme=ivy previewer=false disable_devicons=true<cr>" + 2 "<cmd>Telescope find_files theme=dropdown previewer=false disable_devicons=true<cr>" :desc "Find Files"} {1 :mg 2 "<cmd>Telescope live_grep theme=dropdown<cr>" :desc "Find Text"} {1 :mb - 2 "<cmd>Telescope buffers theme=ivy previewer=true initial_mode=normal<cr>" + 2 "<cmd>Telescope buffers theme=dropdown previewer=true initial_mode=normal<cr>" :desc "Switch Buffer"} {1 :<leader>fC - 2 "<cmd>Telescope commands theme=ivy<cr>" + 2 "<cmd>Telescope commands theme=dropdown<cr>" :desc :Commands} {1 :<leader>fH 2 "<cmd>Telescope highlights<cr>" :desc :Highlights} {1 :<leader>fR - 2 "<cmd>Telescope registers theme=ivy<cr>" + 2 "<cmd>Telescope registers theme=dropdown<cr>" :desc :Registers} {1 :<leader>fS - 2 "<cmd>Telescope grep_string theme=ivy<cr>" + 2 "<cmd>Telescope grep_string theme=dropdown<cr>" :desc "Find String"} {1 :<leader>gb - 2 "<cmd>Telescope git_branches theme=ivy<cr>" + 2 "<cmd>Telescope git_branches theme=dropdown<cr>" :desc "Checkout Branch"} {1 :<leader>ff - 2 "<cmd>Telescope find_files theme=ivy<cr>" + 2 "<cmd>Telescope find_files theme=dropdown<cr>" :desc "Find files"} {1 :<leader>fh - 2 "<cmd>Telescope help_tags theme=ivy<cr>" + 2 "<cmd>Telescope help_tags theme=dropdown<cr>" :desc :Help} {1 :<leader>fk - 2 "<cmd>Telescope keymaps theme=ivy<cr>" + 2 "<cmd>Telescope keymaps theme=dropdown<cr>" :desc :Keymaps} {1 :<leader>fl - 2 "<cmd>Telescope resume theme=ivy<cr>" + 2 "<cmd>Telescope resume theme=dropdown<cr>" :desc "Last Search"} {1 :<leader>fp - 2 "<cmd>Telescope projects theme=ivy<cr>" + 2 "<cmd>Telescope projects theme=dropdown<cr>" :desc "Find Project"} {1 :<leader>fr - 2 "<cmd>Telescope oldfiles theme=ivy previewer=false<cr>" + 2 "<cmd>Telescope oldfiles theme=dropdown previewer=false<cr>" :desc "Recent File"} {1 :<leader>ft - 2 "<cmd>Telescope live_grep theme=ivy<cr>" + 2 "<cmd>Telescope live_grep theme=dropdown<cr>" :desc "Find Text"} {1 :<leader>gc - 2 "<cmd>Telescope git_commits theme=ivy<cr>" + 2 "<cmd>Telescope git_commits theme=dropdown<cr>" :desc "Checkout Commit"}]) (λ config [] diff --git a/fnl/plugins/textobjs.fnl b/fnl/plugins/textobjs.fnl index 025e2b5..0f3a1e1 100644 --- a/fnl/plugins/textobjs.fnl +++ b/fnl/plugins/textobjs.fnl @@ -1,5 +1,5 @@ ;; Various text objects. {1 :chrisgrieser/nvim-various-textobjs - :event [:BufReadPost :BufNewFile] + :event :VeryLazy :opts {:keymaps {:useDefaults true}}} diff --git a/fnl/plugins/treesitter.fnl b/fnl/plugins/treesitter.fnl index e2a4b96..b75eba3 100644 --- a/fnl/plugins/treesitter.fnl +++ b/fnl/plugins/treesitter.fnl @@ -20,10 +20,12 @@ :make :markdown :ocaml + :ocaml_interface :python :rust :sql :toml + :unison :vim :vimdoc :xml diff --git a/fnl/plugins/ts-comments.fnl b/fnl/plugins/ts-comments.fnl index d8ce85a..9c08fec 100644 --- a/fnl/plugins/ts-comments.fnl +++ b/fnl/plugins/ts-comments.fnl @@ -1,3 +1,3 @@ ;; Enhance comments with treesitter. -{1 :folke/ts-comments.nvim :opts {} :event [:BufReadPost :BufNewFile]} +{1 :folke/ts-comments.nvim :opts {} :event :VeryLazy} diff --git a/fnl/plugins/unison.fnl b/fnl/plugins/unison.fnl new file mode 100644 index 0000000..ba03ad7 --- /dev/null +++ b/fnl/plugins/unison.fnl @@ -0,0 +1,11 @@ +;; Unison lang support + +(λ config [plugin] + (vim.opt.rtp:append (.. plugin.dir :/editor-support/vim)) + ((. (require :lazy.core.loader) :packadd) (.. plugin.dir :/editor-support/vim))) + +(λ init [plugin] + ((. (require :lazy.core.loader) :ftdetect) (.. plugin.dir + :/editor-support/vim))) + +{1 :unisonweb/unison :branch :trunk : config : init} diff --git a/fnl/plugins/window-picker.fnl b/fnl/plugins/window-picker.fnl index 41225f0..68b7786 100644 --- a/fnl/plugins/window-picker.fnl +++ b/fnl/plugins/window-picker.fnl @@ -1,4 +1,4 @@ -;; Trim whitespaces on save. +;; Select buffer (local opts {:other_win_hl_color "#171717" :fg_color "#E1E1E1" @@ -16,4 +16,4 @@ (vim.keymap.set :n :mw (λ [] (pick-window)) {}))) -{1 :s1n7ax/nvim-window-picker :event [:BufReadPost :BufNewFile] :version :2.0.0 : config} +{1 :s1n7ax/nvim-window-picker :event :VeryLazy :version :2.0.0 : config} diff --git a/fnl/plugins/zen.fnl b/fnl/plugins/zen.fnl index fcaf114..caa7313 100644 --- a/fnl/plugins/zen.fnl +++ b/fnl/plugins/zen.fnl @@ -1,8 +1,8 @@ ;; Zen mode. -(local opts {:window {:backdrop 1 +(local opts {:window {:backdrop 0.98 :height 1 - :width 128 + :width 120 :options {:signcolumn :no :number false :relativenumber false}} diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl index 99f3e5b..c72d415 100644 --- a/fnl/settings/options.fnl +++ b/fnl/settings/options.fnl @@ -81,6 +81,7 @@ :guifont "monospace:h17" :splitkeep :screen :inccommand :split + :winborder :single :shada ["'10" :<0 :s10 :h]}) (each [k v (pairs opts)] @@ -17,6 +17,7 @@ end ensure("folke", "lazy.nvim") ensure("rktjmp", "hotpot.nvim") +vim.loader.enable() require("hotpot").setup { provide_require_fennel = true, compiler = { @@ -25,4 +26,4 @@ require("hotpot").setup { }, }, } -require "aktersnurra" +require "config" diff --git a/lazy-lock.json b/lazy-lock.json index a68603f..d745ad2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,65 +1,64 @@ { - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, - "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, - "dial.nvim": { "branch": "master", "commit": "34bbd9c387c358190e61ce71017faad3dffa7a74" }, + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" }, + "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, + "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, + "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, - "fidget.nvim": { "branch": "main", "commit": "3fa10de61546fd0a98faac3084a6c0db612adaf8" }, - "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "flit.nvim": { "branch": "main", "commit": "ef18183b22377741e154cffb5b914516381d3870" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "git-worktree.nvim": { "branch": "master", "commit": "666f84ba8dd9172f0a7b45c9f7c24bc5e55f6fc2" }, - "gitsigns.nvim": { "branch": "main", "commit": "9772ce68a9a6d156f3f2166bfd0a17a09ab37eba" }, - "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" }, - "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, - "hotpot.nvim": { "branch": "main", "commit": "8ffe314cc7d762983dc3690d8dab30342483548a" }, - "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, + "gitsigns.nvim": { "branch": "main", "commit": "6bd29494e3f79ff08be1d35bc1926ed23c22ed9a" }, + "grug-far.nvim": { "branch": "main", "commit": "794f03c97afc7f4b03fb6ec5111be507df1850cf" }, + "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, + "hotpot.nvim": { "branch": "main", "commit": "27cc1025960eae88ad1dd270376f69be7a2d9174" }, + "kulala.nvim": { "branch": "main", "commit": "cd3eaa83b8d60533837202dede73238334d71832" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "leap-spooky.nvim": { "branch": "main", "commit": "5f44a1f63dc1c4ce50244e92da5bc0d8d1f6eb47" }, - "leap.nvim": { "branch": "main", "commit": "be8e6eee2dabc68ce810ddf2e800c14bfda09fee" }, + "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, - "nvim-bqf": { "branch": "main", "commit": "ebb6d2689e4427452180f17c53f29f7e460236f1" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, + "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, + "nvim-bqf": { "branch": "main", "commit": "ba2b365969d7c2c6301d48e13aeee59568765529" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" }, - "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, - "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, - "nvim-treesitter": { "branch": "master", "commit": "9e0b5e7f0d148963d6ec71c48cec1a3f8607d619" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-various-textobjs": { "branch": "main", "commit": "05cedb32194e1fd8e2a3c7b678d68dee7e410cdf" }, - "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, + "nvim-lint": { "branch": "master", "commit": "1e6b2ac034d1a7588d11b0b8e862a7ad89368376" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b38bc74487e73489624d61396af7805af9cc75f" }, + "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-various-textobjs": { "branch": "main", "commit": "1532de4649c81b88ee0b4e53bdd17e551dd4589a" }, + "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" }, - "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" }, + "oil.nvim": { "branch": "master", "commit": "81b8a91735ad5cd24a6b3137f14a89f19176364f" }, "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" }, - "org-roam.nvim": { "branch": "main", "commit": "c32aa470a9f9c2aa9e63c91859b0425e45cb3d1d" }, - "orgmode": { "branch": "master", "commit": "8cdfc8d34bd9c5993ea8f933b5f5c306081ffb97" }, - "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "org-roam.nvim": { "branch": "main", "commit": "74276a94e9e4af463e7ba35c22259eeced9c90f9" }, + "orgmode": { "branch": "master", "commit": "3629625199b9a45bdb41fa734bc2c6ef86d251bd" }, + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, - "rest.nvim": { "branch": "main", "commit": "62606c3599bd304227457d6e20580965939b191e" }, - "schemastore.nvim": { "branch": "main", "commit": "a5a94907ea85e35a359be0763233e9055a325d36" }, - "sqlite.lua": { "branch": "master", "commit": "b487fcc8937b683942a1f7d9662fcf50ca5acd58" }, + "render-markdown": { "branch": "main", "commit": "da6a7b25471ab23824f3429225973186eb0b62d2" }, + "schemastore.nvim": { "branch": "main", "commit": "b0ed552048541cf1452c7ca08b1d372768f059b9" }, + "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, "stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "beb64492c825a8e42683949530bd086923e69b19" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, - "telescope-orgmode.nvim": { "branch": "main", "commit": "2cd2ea778726c6e44429fef82f23b63197dbce1b" }, - "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, - "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, - "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, - "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" }, + "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": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, + "undotree": { "branch": "master", "commit": "178d19e00a643f825ea11d581b1684745d0c4eda" }, + "unison": { "branch": "trunk", "commit": "23b831f6e3736d54a0516940dec3f56d143b9015" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, - "vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" }, - "vim-dadbod-completion": { "branch": "master", "commit": "c7f1be21a08b8fc9d927a19db89a4aa995402787" }, - "vim-dadbod-ui": { "branch": "master", "commit": "f4d37b7312ae6489e5c04bee654ca521baac188a" }, + "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, + "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, + "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, + "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" } } diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index cb1e6f2..11feb6c 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -82,3 +82,7 @@ charlist prepending Erlang erlang +unrepresentable +datatypes +validator +parsers diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl Binary files differindex efdc755..f0d4fed 100644 --- a/spell/en.utf-8.add.spl +++ b/spell/en.utf-8.add.spl |