update
This commit is contained in:
+175
-15
@@ -2,7 +2,8 @@
|
||||
;; This file is compiled to lua/plugins/init.lua by nfnl
|
||||
|
||||
(local repo 1) ;; lazy.nvim spec index for the git repo (e.g., "folke/plugin")
|
||||
(local lhs 1) ;; which-key spec index for the key sequence (see which-key below)
|
||||
(local lhs 1) ;; lazy.nvim/which-key spec index for key sequence
|
||||
(local rhs 2) ;; lazy.nvim keys spec index for command/action
|
||||
|
||||
[;; Tokyonight - Colorscheme
|
||||
{repo "folke/tokyonight.nvim"
|
||||
@@ -23,34 +24,192 @@
|
||||
;; Enable HUD floating window
|
||||
(set vim.g.conjure#log#hud#enabled true))}
|
||||
|
||||
;; nvim-parinfer - Automatic parenthesis balancing
|
||||
;; Works alongside paredit: parinfer handles passive balancing,
|
||||
;; paredit provides explicit structural commands
|
||||
{repo "gpanders/nvim-parinfer"
|
||||
:ft ["fennel" "clojure" "lisp" "scheme" "racket" "carp" "timl"]
|
||||
:keys [{lhs "<leader>tpi"
|
||||
rhs "<cmd>ParinferToggle<CR>"
|
||||
:desc "Toggle Parinfer"}]}
|
||||
|
||||
;; nvim-paredit - Structural editing for Lisp
|
||||
;; Default keybindings: >)/<) slurp/barf forward, <(/>( slurp/barf backward
|
||||
;; >e/<e drag element, >f/<f drag form, E/W/B element motions
|
||||
;; Configured with vim-sexp + vim-sexp-mappings-for-regular-people compatible bindings
|
||||
;;
|
||||
;; Default paredit bindings (from nvim-paredit):
|
||||
;; >)/<) slurp/barf forwards <(/>( slurp/barf backwards
|
||||
;; >e/<e drag element >f/<f drag form
|
||||
;; >p/<p drag pairs (/) parent form start/end
|
||||
;; af/if around/in form aF/iF around/in top-level form
|
||||
;; ae/ie around/in element <localleader>@ splice
|
||||
;; <localleader>o/O raise form/element
|
||||
;;
|
||||
;; Additional bindings added below for vim-sexp compatibility
|
||||
{repo "julienvincent/nvim-paredit"
|
||||
:ft ["fennel" "clojure" "lisp" "scheme" "racket"]
|
||||
:config (fn []
|
||||
(local paredit (require :nvim-paredit))
|
||||
;; Use default keybindings (>), <), <(, >(, etc.)
|
||||
(local api paredit.api)
|
||||
(local wrap paredit.wrap)
|
||||
(local cursor paredit.cursor)
|
||||
(local keymap vim.keymap.set)
|
||||
|
||||
;; Use default keybindings
|
||||
(paredit.setup {})
|
||||
|
||||
;; Additional vim-sexp compatible bindings
|
||||
(local keymap vim.keymap.set)
|
||||
(local api paredit.api)
|
||||
;; ============================================================
|
||||
;; vim-sexp-mappings-for-regular-people (tpope) style bindings
|
||||
;; ============================================================
|
||||
|
||||
;; dsf - Splice (delete surrounding form)
|
||||
;; dsf - Splice (delete surrounding form) - alias for <localleader>@
|
||||
(keymap :n "dsf" api.unwrap_form_under_cursor {:desc "Splice (delete surrounding form)"})
|
||||
|
||||
;; cse( cse) - Wrap in parens
|
||||
;; cse* - Surround element (no insert mode, surround.vim style)
|
||||
(keymap :n "cseb" #(api.wrap_element_under_cursor "(" ")") {:desc "Wrap element in ()"})
|
||||
(keymap :n "cse(" #(api.wrap_element_under_cursor "(" ")") {:desc "Wrap element in ()"})
|
||||
(keymap :n "cse)" #(api.wrap_element_under_cursor "(" ")") {:desc "Wrap element in ()"})
|
||||
|
||||
;; cse[ cse] - Wrap in brackets
|
||||
(keymap :n "cse[" #(api.wrap_element_under_cursor "[" "]") {:desc "Wrap element in []"})
|
||||
(keymap :n "cse]" #(api.wrap_element_under_cursor "[" "]") {:desc "Wrap element in []"})
|
||||
|
||||
;; cse{ cse} - Wrap in braces
|
||||
(keymap :n "cse{" #(api.wrap_element_under_cursor "{" "}") {:desc "Wrap element in {}"})
|
||||
(keymap :n "cse}" #(api.wrap_element_under_cursor "{" "}") {:desc "Wrap element in {}"}))}
|
||||
(keymap :n "cse}" #(api.wrap_element_under_cursor "{" "}") {:desc "Wrap element in {}"})
|
||||
|
||||
;; <I / >I - Insert at form head/tail (tpope style)
|
||||
(keymap :n "<I"
|
||||
(fn []
|
||||
(api.move_to_parent_form_start)
|
||||
(vim.cmd "normal! l")
|
||||
(vim.cmd "startinsert"))
|
||||
{:desc "Insert at form head"})
|
||||
(keymap :n ">I"
|
||||
(fn []
|
||||
(api.move_to_parent_form_end)
|
||||
(vim.cmd "startinsert"))
|
||||
{:desc "Insert at form tail"})
|
||||
|
||||
;; W/B/E/gE - Element-wise motions (override WORD motions)
|
||||
(each [_ mode (ipairs [:n :x :o])]
|
||||
(keymap mode "W" api.move_to_next_element_head {:desc "Next element head"})
|
||||
(keymap mode "B" api.move_to_prev_element_head {:desc "Previous element head"})
|
||||
(keymap mode "E" api.move_to_next_element_tail {:desc "Next element tail"})
|
||||
(keymap mode "gE" api.move_to_prev_element_tail {:desc "Previous element tail"}))
|
||||
|
||||
;; ============================================================
|
||||
;; vim-sexp (guns) style LocalLeader bindings
|
||||
;; ============================================================
|
||||
|
||||
;; <localleader>w/W - Wrap element + insert at head/tail
|
||||
(keymap :n "<localleader>w"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "( " ")")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap element, insert head"})
|
||||
(keymap :n "<localleader>W"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "(" ")")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap element, insert tail"})
|
||||
|
||||
;; <localleader>i/I - Wrap form + insert at head/tail
|
||||
(keymap :n "<localleader>i"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "( " ")")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap form, insert head"})
|
||||
(keymap :n "<localleader>I"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "(" ")")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap form, insert tail"})
|
||||
|
||||
;; <localleader>[ ] { } - Wrap form in brackets/braces + insert
|
||||
(keymap :n "<localleader>["
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "[ " "]")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap form in [], insert head"})
|
||||
(keymap :n "<localleader>]"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "[" "]")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap form in [], insert tail"})
|
||||
(keymap :n "<localleader>{"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "{ " "}")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap form in {}, insert head"})
|
||||
(keymap :n "<localleader>}"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_enclosing_form_under_cursor "{" "}")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap form in {}, insert tail"})
|
||||
|
||||
;; <localleader>e[ e] e{ e} - Wrap element in brackets/braces + insert
|
||||
(keymap :n "<localleader>e["
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "[ " "]")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap element in [], insert head"})
|
||||
(keymap :n "<localleader>e]"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "[" "]")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap element in [], insert tail"})
|
||||
(keymap :n "<localleader>e{"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "{ " "}")
|
||||
{:placement "inner_start" :mode "insert"}))
|
||||
{:desc "Wrap element in {}, insert head"})
|
||||
(keymap :n "<localleader>e}"
|
||||
(fn []
|
||||
(cursor.place_cursor
|
||||
(wrap.wrap_element_under_cursor "{" "}")
|
||||
{:placement "inner_end" :mode "insert"}))
|
||||
{:desc "Wrap element in {}, insert tail"})
|
||||
|
||||
;; <localleader>h/l - Insert at list head/tail (vim-sexp originals)
|
||||
;; Same as <I/>I but with localleader
|
||||
(keymap :n "<localleader>h"
|
||||
(fn []
|
||||
(api.move_to_parent_form_start)
|
||||
(vim.cmd "normal! l")
|
||||
(vim.cmd "startinsert"))
|
||||
{:desc "Insert at list head"})
|
||||
(keymap :n "<localleader>l"
|
||||
(fn []
|
||||
(api.move_to_parent_form_end)
|
||||
(vim.cmd "startinsert"))
|
||||
{:desc "Insert at list tail"})
|
||||
|
||||
;; [[ / ]] - Move to prev/next top-level form
|
||||
(each [_ mode (ipairs [:n :x :o])]
|
||||
(keymap mode "]]"
|
||||
(fn []
|
||||
;; Go to current top-level, then find next
|
||||
(api.move_to_parent_form_end)
|
||||
(api.move_to_next_element_head))
|
||||
{:desc "Next top-level form"})
|
||||
(keymap mode "[["
|
||||
(fn []
|
||||
;; Go to current top-level start, then find prev
|
||||
(api.move_to_parent_form_start)
|
||||
(api.move_to_prev_element_head))
|
||||
{:desc "Previous top-level form"})))}
|
||||
|
||||
;; Clojure-Typst - Syntax highlighting for #t"" Typst literals in Clojure
|
||||
;; Injects Typst highlighting into tagged literals, ~() switches back to Clojure
|
||||
{:dir "/home/ajet/repos/clojure-typst/editors/nvim"
|
||||
:ft ["clojure"]}
|
||||
|
||||
;; Mason - Package manager for LSP servers, DAP servers, linters, formatters
|
||||
;; Run :MasonInstall clojure_lsp lua_ls to install servers
|
||||
@@ -71,4 +230,5 @@
|
||||
[{lhs "<leader>f" :group "find"}
|
||||
{lhs "<leader>b" :group "buffer"}
|
||||
{lhs "<leader>r" :group "refactor"}
|
||||
{lhs "<leader>c" :group "code"}]))}]
|
||||
{lhs "<leader>c" :group "code"}
|
||||
{lhs "<leader>t" :group "toggle"}]))}]
|
||||
|
||||
Reference in New Issue
Block a user