summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fnl/plugins/alpha.fnl10
-rw-r--r--fnl/plugins/grug-far.fnl26
-rw-r--r--fnl/plugins/surround.fnl18
-rw-r--r--fnl/plugins/telescope.fnl28
-rw-r--r--fnl/plugins/zen.fnl4
-rw-r--r--lazy-lock.json83
6 files changed, 93 insertions, 76 deletions
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/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/surround.fnl b/fnl/plugins/surround.fnl
index e8fda32..2942bdb 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 :gS
+ :visual_line :gS
+ :delete :ds
+ :change :cs
+ :change_line :cS})
+
+(λ config []
+ (let [surround (require :nvim-surround)]
+ (surround.setup {: keymaps})))
+
+{1 :kylechui/nvim-surround :event :VeryLazy : config}
diff --git a/fnl/plugins/telescope.fnl b/fnl/plugins/telescope.fnl
index 0d9df3e..da692db 100644
--- a/fnl/plugins/telescope.fnl
+++ b/fnl/plugins/telescope.fnl
@@ -43,52 +43,52 @@
(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/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/lazy-lock.json b/lazy-lock.json
index a68603f..4c4f62a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,65 +1,66 @@
{
"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" },
+ "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
+ "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
+ "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" },
- "fidget.nvim": { "branch": "main", "commit": "3fa10de61546fd0a98faac3084a6c0db612adaf8" },
+ "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
"flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" },
- "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+ "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
"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": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d" },
+ "grug-far.nvim": { "branch": "main", "commit": "3bc6997724c6b9c10bc4bac86821c9061694ded3" },
+ "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
+ "hotpot.nvim": { "branch": "main", "commit": "c6026bedbc593ce5c00399ccfb1cf964180f529b" },
+ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"leap-spooky.nvim": { "branch": "main", "commit": "5f44a1f63dc1c4ce50244e92da5bc0d8d1f6eb47" },
- "leap.nvim": { "branch": "main", "commit": "be8e6eee2dabc68ce810ddf2e800c14bfda09fee" },
+ "leap.nvim": { "branch": "main", "commit": "03eaa2e0c0ec9436dea0e954bc47564ff3ca9196" },
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
- "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+ "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
"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" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+ "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+ "neogit": { "branch": "master", "commit": "97f83f1dc51dee41e08e3c7a8adf00e1083e3178" },
+ "no-clown-fiesta.nvim": { "branch": "master", "commit": "2f57d1115e246b62a1a81bba806fe79aaa53b610" },
+ "nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
"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": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
+ "nvim-lspconfig": { "branch": "master", "commit": "f9b6a702b7430aff0770c04771f2dba78163d2c6" },
+ "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
+ "nvim-treesitter": { "branch": "master", "commit": "7bbed4b548d9a81c14351bda93d16336edefd067" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" },
+ "nvim-various-textobjs": { "branch": "main", "commit": "e0083daa88c5bc99aef7afcc189835ac1257cb8d" },
+ "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
"nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" },
- "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
+ "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
"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": "d7ac6a394f5158984b29596aee4861fb93030e81" },
+ "orgmode": { "branch": "master", "commit": "e66a64183e211842c195f34fd6dcb97d7b534812" },
+ "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
+ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"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": "8bb0d4725cc4909a603158d44ff28b6158ad9278" },
+ "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" },
+ "schemastore.nvim": { "branch": "main", "commit": "992285058ce208825eb1b9ac82fa6be7d76ffcc1" },
+ "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-frecency.nvim": { "branch": "master", "commit": "df79efdce0edcb48cfe3cffd3ac00c449bc6407f" },
+ "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"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.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
+ "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+ "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
+ "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"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-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+ "vim-dadbod-ui": { "branch": "master", "commit": "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5" },
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
- "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" },
+ "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-17 10:32:46 +0000