From 9f5b90a43211aaf760b946c1e88fa3277ac35ad4 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Tue, 12 Mar 2024 11:19:52 -0500 Subject: [PATCH 1/6] test startify configurationw --- lazy-lock.json | 37 +++++++++++++++++++------------------ lua/plugins/startify.lua | 4 ++++ 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 lua/plugins/startify.lua diff --git a/lazy-lock.json b/lazy-lock.json index 664127b3..b40d721e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,35 +1,36 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c" }, - "catppuccin": { "branch": "main", "commit": "64dc309bc157779691be38bbfc5123584e0a4a85" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "fidget.nvim": { "branch": "main", "commit": "7b9c383438a2e490e37d57b07ddeae3ab4f4cf69" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "fidget.nvim": { "branch": "main", "commit": "a3e1e79116ceb93d4c8c0ff432bf506b3213a24d" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "neodev.nvim": { "branch": "main", "commit": "ef351fae5df2559956398923c5d38c9b64e7d898" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "84f2dd42efffa20d505ac44c78568d778ca7e0a1" }, - "nvim-treesitter": { "branch": "master", "commit": "ab818bf5a2ee21515ade9afcf428e98056b6197b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "oil.nvim": { "branch": "master", "commit": "24027ed8d7f3ee5c38cfd713915e2e16d89e79b3" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, + "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/startify.lua b/lua/plugins/startify.lua new file mode 100644 index 00000000..b87a2ebe --- /dev/null +++ b/lua/plugins/startify.lua @@ -0,0 +1,4 @@ +-- startup screen +return { + 'mhinz/vim-startify' +} From 8365e20434b44f3b3f3feed1ab7316ef6f4da634 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Tue, 12 Mar 2024 11:32:45 -0500 Subject: [PATCH 2/6] install and test mini starter --- lazy-lock.json | 2 +- lua/plugins/ministarter.lua | 7 +++++++ lua/plugins/startify.lua | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 lua/plugins/ministarter.lua diff --git a/lazy-lock.json b/lazy-lock.json index b40d721e..efe6452b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,6 +15,7 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, @@ -30,7 +31,6 @@ "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua new file mode 100644 index 00000000..89c17150 --- /dev/null +++ b/lua/plugins/ministarter.lua @@ -0,0 +1,7 @@ +-- startup screen +return { + 'echasnovski/mini.nvim', + config = function() + require('mini.starter').setup(); + end +} diff --git a/lua/plugins/startify.lua b/lua/plugins/startify.lua index b87a2ebe..531b40ff 100644 --- a/lua/plugins/startify.lua +++ b/lua/plugins/startify.lua @@ -1,4 +1,4 @@ -- startup screen return { - 'mhinz/vim-startify' + -- 'mhinz/vim-startify' } From d69f78eac1987a173a87a4a2964fc1bb7fbb95a9 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Tue, 12 Mar 2024 11:56:53 -0500 Subject: [PATCH 3/6] initial mini starter configuration --- lua/plugins/ministarter.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua index 89c17150..85ac0ad6 100644 --- a/lua/plugins/ministarter.lua +++ b/lua/plugins/ministarter.lua @@ -2,6 +2,19 @@ return { 'echasnovski/mini.nvim', config = function() - require('mini.starter').setup(); + local mini = require('mini.starter'); + mini.setup({ + items = { + -- FIX: either install telescope browser extension, or remove browser from telescope options + mini.sections.telescope(), + mini.sections.recent_files(5, true, true), + mini.sections.builtin_actions(), + }, + content_hooks = { + mini.gen_hook.adding_bullet('-'), + mini.gen_hook.aligning('center', 'center'), + }, + footer = '', + }) end } From 4dc0fad655c0b197ff39396acbc42d57591508ea Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Tue, 12 Mar 2024 12:10:33 -0500 Subject: [PATCH 4/6] remove startify and set open starter keybinding --- lua/plugins/ministarter.lua | 5 +++++ lua/plugins/startify.lua | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 lua/plugins/startify.lua diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua index 85ac0ad6..32469a3f 100644 --- a/lua/plugins/ministarter.lua +++ b/lua/plugins/ministarter.lua @@ -1,3 +1,4 @@ +-- TODO: Look into mini starter sessions? -- startup screen return { 'echasnovski/mini.nvim', @@ -16,5 +17,9 @@ return { }, footer = '', }) + + vim.keymap.set('n', '=', function() + mini.open() + end, { desc = 'Open starter' }) end } diff --git a/lua/plugins/startify.lua b/lua/plugins/startify.lua deleted file mode 100644 index 531b40ff..00000000 --- a/lua/plugins/startify.lua +++ /dev/null @@ -1,4 +0,0 @@ --- startup screen -return { - -- 'mhinz/vim-startify' -} From e1eb3f70d1db3f95f94dd18581791bc2f98de197 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Tue, 12 Mar 2024 12:26:36 -0500 Subject: [PATCH 5/6] set bullet point glyph --- lua/plugins/ministarter.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua index 32469a3f..e9be8ce3 100644 --- a/lua/plugins/ministarter.lua +++ b/lua/plugins/ministarter.lua @@ -12,7 +12,7 @@ return { mini.sections.builtin_actions(), }, content_hooks = { - mini.gen_hook.adding_bullet('-'), + mini.gen_hook.adding_bullet(' '), mini.gen_hook.aligning('center', 'center'), }, footer = '', From 9649f0d65911246fae07d12678195a663dd3bf7f Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Mon, 3 Jun 2024 10:45:26 -0500 Subject: [PATCH 6/6] include telescope file browser as a dependency --- lazy-lock.json | 1 + lua/plugins/ministarter.lua | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index efe6452b..1284b171 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,6 +25,7 @@ "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "1280db1f835bd6b73a485d6f1149e02df67533c4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua index e9be8ce3..c88ad161 100644 --- a/lua/plugins/ministarter.lua +++ b/lua/plugins/ministarter.lua @@ -1,12 +1,13 @@ --- TODO: Look into mini starter sessions? -- startup screen return { 'echasnovski/mini.nvim', + dependencies = { + 'nvim-telescope/telescope-file-browser.nvim', + }, config = function() local mini = require('mini.starter'); mini.setup({ items = { - -- FIX: either install telescope browser extension, or remove browser from telescope options mini.sections.telescope(), mini.sections.recent_files(5, true, true), mini.sections.builtin_actions(),