diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl index 8a763d7..5d63c34 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl @@ -16,31 +16,14 @@ ;; (use (core.assoc opts 1 name)))))) ;; ;; (local packages { -;; :Olical/nfnl {} -;; :Olical/conjure {:mod :conjure} -;; :Olical/fennel.vim {} ;; :ahmedkhalf/project.nvim {} -;; :airblade/vim-gitgutter {} ;; :akinsho/toggleterm.nvim {:mod :toggleterm} ;; :clojure-vim/vim-jack-in {} ;; :christianrondeau/vim-base64 {} ;; :dhruvasagar/vim-table-mode {} ;; :folke/lsp-colors.nvim {} -;; :folke/which-key.nvim {:mod :whichkey} ;; :gbprod/yanky.nvim {:mod :yanky} ;; :hashivim/vim-terraform {} -;; :HiPhish/rainbow-delimiters.nvim {} -;; :hrsh7th/nvim-cmp {:requires [:hrsh7th/cmp-buffer -;; :hrsh7th/cmp-emoji -;; :hrsh7th/cmp-nvim-lsp -;; :hrsh7th/cmp-nvim-lua -;; :hrsh7th/cmp-path -;; :hrsh7th/cmp-vsnip -;; :hrsh7th/vim-vsnip-integ -;; :L3MON4D3/LuaSnip -;; :PaterJason/cmp-conjure -;; :saadparwaiz1/cmp_luasnip] -;; :mod :cmp} ;; :hrsh7th/vim-vsnip {} ;; :hrsh7th/vim-vsnip-integ {} ;; :Iron-E/nvim-soluarized {} @@ -48,30 +31,16 @@ ;; :nvimtools/none-ls.nvim {:mod :null-ls ;; :requires [:nvim-lua/plenary.nvim]} ;; :junegunn/vim-easy-align {:mod :easyalign} -;; :kovisoft/paredit {:mod :paredit -;; :require [:nvim-treesitter/nvim-treesitter]} ;; :kristijanhusak/vim-dadbod-completion {} ;; :kristijanhusak/vim-dadbod-ui {} ;; :L3MON4D3/LuaSnip {:mod :luasnip} ;; :lifepillar/vim-solarized8 {} ;; :lukas-reineke/headlines.nvim {:mod :headlines} ;; ; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun} -;; :mrjones2014/smart-splits.nvim {:mod :smartsplits} ;; :mechatroner/rainbow_csv {} -;; :MunifTanjim/nui.nvim {} ;; :neovim/nvim-lspconfig {:mod :lspconfig} ;; :norcalli/nvim-colorizer.lua {:mod :colorizer} -;; :nvim-neo-tree/neo-tree.nvim {:branch :v3.x -;; :require [:nvim-lua/plenary.nvim -;; :nvim-tree/nvim-web-devicons -;; ; not strictly required, but recommended -;; :MunifTanjim/nui.nvim -;; ; :3rd/image.nvim, ; Optional image support in preview window: See `# Preview Mode` for more information -;; ]} ;; :nvim-orgmode/orgmode {:mod :orgmode} -;; :nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim] -;; [:nvim-lua/plenary.nvim]] -;; :mod :telescope} ;; :nvim-tree/nvim-web-devicons {} ;; :nvim-treesitter/nvim-treesitter {:run ":TSUpdate" ;; :mod :treesitter} @@ -83,22 +52,7 @@ ;; ;; :tjdevries/sg.nvim {:run "cargo build --workspace" ;; ;; :dependencies [:nvim-lua/plenary.nvim]} ;; ;; :tpope/vim-classpath {} -;; :tpope/vim-dadbod {} -;; :tpope/vim-dispatch {} -;; :tpope/vim-fugitive {:mod :fugitive} -;; :tpope/vim-git {} -;; :tpope/vim-pathogen {} -;; :tpope/vim-rails {} -;; :tpope/vim-repeat {} -;; :tpope/vim-rhubarb {} -;; :tpope/vim-surround {} -;; :tpope/vim-unimpaired {} -;; :tpope/vim-vinegar {} -;; :wbthomason/packer.nvim {:mod :packer} ;; ;; :williamboman/nvim-lsp-installbuilder {} -;; :williamboman/mason.nvim {:mod :mason -;; :requires [:williamboman/mason-lspconfig.nvim -;; :neovim/nvim-lspconfig]} ;; ; NeoVim lsp server installs ;; ; :p00f/nvim-ts-rainbow {} ;; ; :luochen1990/rainbow {} diff --git a/nvim/.config/nvim/fnl/plugins/asyncrun.fnl b/nvim/.config/nvim/fnl/plugins/asyncrun.fnl new file mode 100644 index 0000000..823953e --- /dev/null +++ b/nvim/.config/nvim/fnl/plugins/asyncrun.fnl @@ -0,0 +1,3 @@ +(import-macros {: tx} :config.macros) + +(tx :skywind3000/asyncrun.vim {}) diff --git a/nvim/.config/nvim/fnl/plugins/autopairs.fnl b/nvim/.config/nvim/fnl/plugins/autopairs.fnl new file mode 100644 index 0000000..89e082a --- /dev/null +++ b/nvim/.config/nvim/fnl/plugins/autopairs.fnl @@ -0,0 +1,5 @@ +(import-macros {: tx} :config.macros) + +(tx "windwp/nvim-autopairs" + {:event "InsertEnter" + :config true }) diff --git a/nvim/.config/nvim/fnl/plugins/colorscheme.fnl b/nvim/.config/nvim/fnl/plugins/colorscheme.fnl index e401626..707fcd1 100644 --- a/nvim/.config/nvim/fnl/plugins/colorscheme.fnl +++ b/nvim/.config/nvim/fnl/plugins/colorscheme.fnl @@ -1,3 +1,3 @@ (import-macros {: tx} :config.macros) -(tx :lifepillar/vim-solarized8 {}) +(tx "https://codeberg.org/lifepillar/vim-solarized8/" {:branch "neovim"}) diff --git a/nvim/.config/nvim/fnl/plugins/gitgutter.fnl b/nvim/.config/nvim/fnl/plugins/gitgutter.fnl new file mode 100644 index 0000000..dc8ce43 --- /dev/null +++ b/nvim/.config/nvim/fnl/plugins/gitgutter.fnl @@ -0,0 +1,3 @@ +(import-macros {: tx} :config.macros) + +(tx :airblade/vim-gitgutter {}) diff --git a/nvim/.config/nvim/fnl/plugins/lsp.fnl b/nvim/.config/nvim/fnl/plugins/lsp.fnl index 45f30ad..26c1a47 100644 --- a/nvim/.config/nvim/fnl/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/plugins/lsp.fnl @@ -5,7 +5,8 @@ (vim.diagnostic.config {:signs {:text {vim.diagnostic.severity.ERROR "☢️" vim.diagnostic.severity.WARN "⚠️" vim.diagnostic.severity.INFO "ℹ️" - vim.diagnostic.severity.HINT "🔎"} + vim.diagnostic.severity.HINT "🔎" + } ;; :linehl {vim.diagnostic.severity.ERROR :ErrorMsg} ;; :numhl {vim.diagnostic.severity.WARN :WarningMsg} }}) @@ -49,9 +50,18 @@ [(lambda [] (vim.fn.input "Binding name: "))]] :pf [:promote-fn [(lambda [] (vim.fn.input "Function name: "))]] - :sc [:change-collection - [(lambda [] (vim.fn.input "")) - "input('Collection type: ')"]] + :sc [:change-coll + [(lambda [] + (let [coll-types [:map :list :set :vector] + a (require :nfnl.core) + choice (vim.fn.inputlist (a.concat ["Collection Type:"] + (a.map-indexed (fn [[k + v]] + (.. (tostring k) + ". " + v)) + coll-types)))] + (a.get coll-types choice)))]] :sm [:sort-map []] :tf [:thread-first-all []] :tF [:thread-first []] @@ -220,7 +230,6 @@ a (require :nfnl.core) u (require :dotfiles.util) lsp (require :vim.lsp) - lspconfig (require :lspconfig) cmp_nvim_lsp (require :cmp_nvim_lsp)] (vim.lsp.enable :gleam) diff --git a/nvim/.config/nvim/fnl/plugins/toggle-term.fnl b/nvim/.config/nvim/fnl/plugins/toggle-term.fnl new file mode 100644 index 0000000..541eec4 --- /dev/null +++ b/nvim/.config/nvim/fnl/plugins/toggle-term.fnl @@ -0,0 +1,29 @@ +(import-macros {: tx} :config.macros) + +(fn set-terminal-keymaps [] + (vim.keymap.set :t : "") + (vim.keymap.set :t :jk "") + (vim.keymap.set :t : "wincmd h") + (vim.keymap.set :t : "wincmd j") + (vim.keymap.set :t : "wincmd k") + (vim.keymap.set :t : "wincmd l") + (vim.keymap.set :t : "")) + +(vim.api.nvim_create_user_command :SetTerminalKeymaps set-terminal-keymaps {}) + +(vim.api.nvim_create_autocmd [:TermOpen] + {:pattern "term://*" + :callback set-terminal-keymaps}) + +(tx :akinsho/toggleterm.nvim {:lazy false + :opts {:open_mapping "" + :start_in_insert true + :insert_mappings true + ;; whether or not the open mapping applies in insert mode + :terminal_mappings true + ;; whether or not the open mapping applies in the opened terminals + :persist_size true + :persist_mode true + ;; if set to true (default) the previous terminal mode will be remembered + :autochdir true} + :keys []}) diff --git a/nvim/.config/nvim/fnl/plugins/tree-sitter.fnl b/nvim/.config/nvim/fnl/plugins/tree-sitter.fnl index 3a08288..91a3e3e 100644 --- a/nvim/.config/nvim/fnl/plugins/tree-sitter.fnl +++ b/nvim/.config/nvim/fnl/plugins/tree-sitter.fnl @@ -6,20 +6,14 @@ (tx :nvim-treesitter/nvim-treesitter {:branch :main - :build (fn [] - (let [TS (require :nvim-treesitter)] - (when (not TS.get_installed) - (LazyVim.error "Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")) - ; make sure we're using the latest treesitter util - (set package.loaded.lazyvim.util.treesitter nil) - (LazyVim.treesitter.build (fn [] - (TS.update nil {:summary true}))))) + :build ":TSUpdate" :opts {:indent {:enable true} :highlight {:enable true} :folds {:enable true} :ensure_installed [:bash :clojure :diff + :elm :fennel :html :javascript @@ -31,6 +25,7 @@ :markdown :markdown_inline :regex + :ruby :toml :vim :vimdoc diff --git a/nvim/.config/nvim/fnl/plugins/whichkey.fnl b/nvim/.config/nvim/fnl/plugins/whichkey.fnl new file mode 100644 index 0000000..0b096ec --- /dev/null +++ b/nvim/.config/nvim/fnl/plugins/whichkey.fnl @@ -0,0 +1,3 @@ +(import-macros {: tx} :config.macros) + +(tx :folke/which-key.nvim {:event "VeryLazy"}) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index e741551..b1ba8ac 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,11 +1,12 @@ { + "asyncrun.vim": { "branch": "master", "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, - "conjure": { "branch": "main", "commit": "42048ce74a7d86dd85091d7d8cebb78d25761da3" }, + "conjure": { "branch": "main", "commit": "5dddccee789f65606387c991f5efadea7af52cb7" }, "fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, @@ -15,29 +16,33 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, "nfnl": { "branch": "main", "commit": "f39a7ec6fe0ace2b2ea108ce04d954549e36c76d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-lspconfig": { "branch": "master", "commit": "d8bf4c47385340ab2029402201d4d7c9f99f437a" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, + "nvim-lspconfig": { "branch": "master", "commit": "46204c8fdaa36a9aa3768780450e4bc7a210025f" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-treesitter": { "branch": "main", "commit": "5cb05e1b0fa3c469958a2b26f36b3fe930af221c" }, - "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, + "nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "01993eb20c6cdc1d33e7e98252368840309f99b9" }, - "smart-splits.nvim": { "branch": "master", "commit": "25bf40abf79720ebfa98e09259b7c42942055f4c" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "607a438d8c647a355749973fd295e33505afafde" }, + "smart-splits.nvim": { "branch": "master", "commit": "96afd5d3b029ac354aaa369fb33b4613a0bbf2f0" }, "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, + "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" }, "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" }, + "vim-gitgutter": { "branch": "main", "commit": "55b368d4c68541775b4b253d3c98d3145b695c24" }, "vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" }, "vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, - "vim-solarized8": { "branch": "master", "commit": "345e6b423a6df53e41324ff633d62265f465edec" }, + "vim-solarized8": { "branch": "neovim", "commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" }, "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, "vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" }, - "vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" } + "vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/nvim/.config/nvim/lua/plugins/asyncrun.lua b/nvim/.config/nvim/lua/plugins/asyncrun.lua new file mode 100644 index 0000000..3aae214 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/asyncrun.lua @@ -0,0 +1,2 @@ +-- [nfnl] fnl/plugins/asyncrun.fnl +return {"skywind3000/asyncrun.vim"} diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/.config/nvim/lua/plugins/autopairs.lua new file mode 100644 index 0000000..1638600 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/autopairs.lua @@ -0,0 +1,2 @@ +-- [nfnl] fnl/plugins/autopairs.fnl +return {"windwp/nvim-autopairs", config = true, event = "InsertEnter"} diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua index d23bd2c..ec1dc11 100644 --- a/nvim/.config/nvim/lua/plugins/colorscheme.lua +++ b/nvim/.config/nvim/lua/plugins/colorscheme.lua @@ -1,2 +1,2 @@ -- [nfnl] fnl/plugins/colorscheme.fnl -return {"lifepillar/vim-solarized8"} +return {"https://codeberg.org/lifepillar/vim-solarized8/", branch = "neovim"} diff --git a/nvim/.config/nvim/lua/plugins/gitgutter.lua b/nvim/.config/nvim/lua/plugins/gitgutter.lua new file mode 100644 index 0000000..2367375 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/gitgutter.lua @@ -0,0 +1,2 @@ +-- [nfnl] fnl/plugins/gitgutter.fnl +return {"airblade/vim-gitgutter"} diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 3f5e9f6..d2fab92 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -33,9 +33,18 @@ local function _10_() return vim.fn.input("Function name: ") end local function _11_() - return vim.fn.input("") + local coll_types = {"map", "list", "set", "vector"} + local a = require("nfnl.core") + local choice + local function _13_(_12_) + local k = _12_[1] + local v = _12_[2] + return (tostring(k) .. ". " .. v) + end + choice = vim.fn.inputlist(a.concat({"Collection Type:"}, a["map-indexed"](_13_, coll_types))) + return a.get(coll_types, choice) end -client_command_lnmappings = {clojure_lsp = {ai = {"add-import-to-namespace", {_1_}}, am = {"add-missing-libspec", {}}, as = {"add-require-suggestion", {_2_, _3_, _4_}}, cc = {"cycle-coll", {}}, cn = {"clean-ns", {}}, cp = {"cycle-privacy", {}}, ct = {"create-test", {}}, df = {"drag-forward", {}}, db = {"drag-backward", {}}, dk = {"destructure-keys", {}}, ed = {"extract-to-def", {_5_}}, ref = {"extract-function", {_6_}}, el = {"expand-let", {}}, fe = {"create-function", {}}, il = {"introduce-let", {_7_}}, is = {"inline-symbol", {}}, ma = {"resolve-macro-as", {}}, mf = {"move-form", {_8_}}, ml = {"move-to-let", {_9_}}, pf = {"promote-fn", {_10_}}, sc = {"change-collection", {_11_, "input('Collection type: ')"}}, sm = {"sort-map", {}}, tf = {"thread-first-all", {}}, tF = {"thread-first", {}}, tl = {"thread-last-all", {}}, tL = {"thread-last", {}}, ua = {"unwind-all", {}}, uw = {"unwind-thread", {}}}} +client_command_lnmappings = {clojure_lsp = {ai = {"add-import-to-namespace", {_1_}}, am = {"add-missing-libspec", {}}, as = {"add-require-suggestion", {_2_, _3_, _4_}}, cc = {"cycle-coll", {}}, cn = {"clean-ns", {}}, cp = {"cycle-privacy", {}}, ct = {"create-test", {}}, df = {"drag-forward", {}}, db = {"drag-backward", {}}, dk = {"destructure-keys", {}}, ed = {"extract-to-def", {_5_}}, ref = {"extract-function", {_6_}}, el = {"expand-let", {}}, fe = {"create-function", {}}, il = {"introduce-let", {_7_}}, is = {"inline-symbol", {}}, ma = {"resolve-macro-as", {}}, mf = {"move-form", {_8_}}, ml = {"move-to-let", {_9_}}, pf = {"promote-fn", {_10_}}, sc = {"change-coll", {_11_}}, sm = {"sort-map", {}}, tf = {"thread-first-all", {}}, tF = {"thread-first", {}}, tl = {"thread-last-all", {}}, tL = {"thread-last", {}}, ua = {"unwind-all", {}}, uw = {"unwind-thread", {}}}} local vim = _G.vim local lsps = {"clojure_lsp", "lua_ls", "jsonls", "yamlls", "marksman", "html", "terraformls", "dockerls", "docker_compose_language_service", "bashls", "sqlls"} local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruff_organize_imports", "ruff_format"}, rust = {"rustfmt"}, toml = {"taplo"}, json = {"prettierd"}, javascript = {"prettierd"}, typescript = {"prettierd"}, jsx = {"prettierd"}, html = {"prettierd"}, css = {"prettierd"}, yaml = {"prettierd"}, markdown = {"prettierd"}, fennel = {"fnlfmt"}, sql = {"sqlfmt"}, gleam = {"gleam"}, _ = {lsp_format = "prefer"}, ["*"] = {"trim_whitespace", "trim_newlines"}} @@ -43,12 +52,12 @@ local formatter__3epackage = {ruff_organize_imports = "ruff", ruff_format = "ruf local disable_formatter_on_save = {fennel = true, sql = true} local disable_formatter_auto_install = {cljfmt = true, fnlfmt = true, rustfmt = true, trim_whitespace = true, trim_newlines = true, gleam = true} vim.lsp.enable({"clojure", "fennel-ls", "typedclojure"}) -local function _12_(_, opts) +local function _14_(_, opts) local conform = require("conform") local registry = require("mason-registry") local formatters_for_mason = {} conform.formatters.shfmt = {prepend_args = {"-i", "2", "-ci"}} - local function _13_() + local function _15_() for _ft, formatters in pairs(filetype__3eformatters) do for _idx, formatter in ipairs(formatters) do if not disable_formatter_auto_install[formatter] then @@ -67,13 +76,13 @@ local function _12_(_, opts) end return nil end - vim.schedule(_13_) + vim.schedule(_15_) vim.g.dotfiles_format_on_save = true conform.setup(opts) vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" return nil end -local function _16_() +local function _18_() if (nil == vim.b.dotfiles_format_on_save) then vim.b.dotfiles_format_on_save = false else @@ -81,24 +90,23 @@ local function _16_() end return vim.notify(("Set vim.b.dotfiles_format_on_save to " .. tostring(vim.b.dotfiles_format_on_save))) end -local function _18_() +local function _20_() vim.g.dotfiles_format_on_save = not vim.g.dotfiles_format_on_save return vim.notify(("Set vim.g.dotfiles_format_on_save to " .. tostring(vim.g.dotfiles_format_on_save))) end -local function _19_(_buf) +local function _21_(_buf) if (vim.g.dotfiles_format_on_save and ((nil == vim.b.dotfiles_format_on_save) or vim.b.dotfiles_format_on_save) and not disable_formatter_on_save[vim.bo.filetype]) then return {timeout_ms = 500, lsp_format = "fallback"} else return nil end end -local function _21_() +local function _23_() local caps = require("cmp_nvim_lsp").default_capabilities() local mlsp = require("mason-lspconfig") local a = require("nfnl.core") local u = require("dotfiles.util") local lsp = require("vim.lsp") - local lspconfig = require("lspconfig") local cmp_nvim_lsp = require("cmp_nvim_lsp") vim.lsp.enable("gleam") local function bufmap(mode, from, to, opts) @@ -135,24 +143,24 @@ local function _21_() local lsp_cmd = a.first(command_mapping) local mapping = ("" .. lnmapping) local cmd - local function _23_() + local function _25_() local opts do local s = "" for _i, opt in ipairs(a.second(command_mapping)) do - local _24_ + local _26_ if ("function" == type(opt)) then - _24_ = opt() + _26_ = opt() else - _24_ = opt + _26_ = opt end - s = (s .. _24_) + s = (s .. _26_) end opts = s end return lsp_execute_command(client, lsp_cmd, opts) end - cmd = _23_ + cmd = _25_ nbufmap(mapping, cmd, {desc = ("LSP command `" .. lsp_cmd .. "`")}) end return nil @@ -168,35 +176,35 @@ local function _21_() vim.api.nvim_set_hl(0, hlgroup, a.merge(vim.api.nvim_get_hl_by_name(base_group, true), {italic = true, foreground = "#6c71c4", background = "NONE"})) end local group = vim.api.nvim_create_augroup("LspDocumentHighlight", {clear = true}) - local function _27_() + local function _29_() return vim.lsp.buf.document_highlight() end - vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "", callback = _27_}) - local function _28_() + vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "", callback = _29_}) + local function _30_() return vim.lsp.buf.clear_references() end - vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "", callback = _28_}) + vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "", callback = _30_}) else end if client.server_capabilities.documentFormattingProvider then - local function _30_() + local function _32_() return require("conform").format() end - vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "", callback = _30_}) + vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "", callback = _32_}) else end return print("LSP Client Attached.") end - local function _32_(server_name) + local function _34_(server_name) vim.lsp.config(server_name, {capabilities = caps, on_attach = on_attach}) return vim.lsp.enable(server_name) end - return mlsp.setup_handlers({_32_}) + return mlsp.setup_handlers({_34_}) end -local function _33_() +local function _35_() return vim.lsp.buf.code_action() end -local function _34_() +local function _36_() return require("conform").format() end -return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"stevearc/conform.nvim", config = _12_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"tbf", _16_, desc = "Toggle buffer formatting"}, {"tgf", _18_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _19_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _21_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"ca", _33_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"fa", _34_, desc = "LSP format"}, {"rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}} +return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"stevearc/conform.nvim", config = _14_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"tbf", _18_, desc = "Toggle buffer formatting"}, {"tgf", _20_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _21_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _23_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"ca", _35_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"fa", _36_, desc = "LSP format"}, {"rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}} diff --git a/nvim/.config/nvim/lua/plugins/toggle-term.lua b/nvim/.config/nvim/lua/plugins/toggle-term.lua new file mode 100644 index 0000000..b1f225e --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/toggle-term.lua @@ -0,0 +1,13 @@ +-- [nfnl] fnl/plugins/toggle-term.fnl +local function set_terminal_keymaps() + vim.keymap.set("t", "", "") + vim.keymap.set("t", "jk", "") + vim.keymap.set("t", "", "wincmd h") + vim.keymap.set("t", "", "wincmd j") + vim.keymap.set("t", "", "wincmd k") + vim.keymap.set("t", "", "wincmd l") + return vim.keymap.set("t", "", "") +end +vim.api.nvim_create_user_command("SetTerminalKeymaps", set_terminal_keymaps, {}) +vim.api.nvim_create_autocmd({"TermOpen"}, {pattern = "term://*", callback = set_terminal_keymaps}) +return {"akinsho/toggleterm.nvim", keys = {}, lazy = false, opts = {open_mapping = "", start_in_insert = true, insert_mappings = true, terminal_mappings = true, persist_size = true, persist_mode = true, autochdir = true}} diff --git a/nvim/.config/nvim/lua/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/plugins/tree-sitter.lua index 1ce90ab..bcdf1af 100644 --- a/nvim/.config/nvim/lua/plugins/tree-sitter.lua +++ b/nvim/.config/nvim/lua/plugins/tree-sitter.lua @@ -9,16 +9,4 @@ local function _1_() return vim.schedule(_2_) end vim.api.nvim_create_autocmd("FileType", {pattern = {"*"}, callback = _1_}) -local function _4_() - local TS = require("nvim-treesitter") - if not TS.get_installed then - LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.") - else - end - package.loaded.lazyvim.util.treesitter = nil - local function _6_() - return TS.update(nil, {summary = true}) - end - return LazyVim.treesitter.build(_6_) -end -return {"nvim-treesitter/nvim-treesitter", branch = "main", build = _4_, opts = {indent = {enable = true}, highlight = {enable = true}, folds = {enable = true}, ensure_installed = {"bash", "clojure", "diff", "fennel", "html", "javascript", "jsdoc", "json", "lua", "luadoc", "luap", "markdown", "markdown_inline", "regex", "toml", "vim", "vimdoc", "xml", "yaml"}}} +return {"nvim-treesitter/nvim-treesitter", branch = "main", build = ":TSUpdate", opts = {indent = {enable = true}, highlight = {enable = true}, folds = {enable = true}, ensure_installed = {"bash", "clojure", "diff", "elm", "fennel", "html", "javascript", "jsdoc", "json", "lua", "luadoc", "luap", "markdown", "markdown_inline", "regex", "ruby", "toml", "vim", "vimdoc", "xml", "yaml"}}} diff --git a/nvim/.config/nvim/lua/plugins/whichkey.lua b/nvim/.config/nvim/lua/plugins/whichkey.lua new file mode 100644 index 0000000..dc8ece1 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/whichkey.lua @@ -0,0 +1,2 @@ +-- [nfnl] fnl/plugins/whichkey.fnl +return {"folke/which-key.nvim", event = "VeryLazy"}