From 4751ecc2ef431cebcc88898d74d01df5b5fcda81 Mon Sep 17 00:00:00 2001 From: aleidk Date: Thu, 17 Apr 2025 12:03:21 -0400 Subject: [PATCH] fix some config in nvim_unstable --- Configs/git/.config/git/ignore | 3 + .../.config/nvim_unstable/lazy-lock.json | 3 +- .../lua/aleidk/plugins/formatter.lua | 2 +- .../nvim_unstable/lua/aleidk/plugins/fzf.lua | 6 +- .../nvim_unstable/lua/aleidk/plugins/mini.lua | 30 ++++++++- .../lua/aleidk/plugins/smart-splits.lua | 64 +++++++++++++++++++ Configs/zsh/.config/zsh/aliases/nvim.zsh | 4 +- 7 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/smart-splits.lua diff --git a/Configs/git/.config/git/ignore b/Configs/git/.config/git/ignore index 6417329..df7b329 100644 --- a/Configs/git/.config/git/ignore +++ b/Configs/git/.config/git/ignore @@ -4,3 +4,6 @@ # PHP Stuff vendor .php-cs-fixer.cache + +# Neovim +Session.vim diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json b/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json index ddcd7d2..78fc60e 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json +++ b/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json @@ -1,7 +1,7 @@ { "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, - "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" }, + "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, @@ -19,6 +19,7 @@ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "remote-sshfs.nvim": { "branch": "main", "commit": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8" }, "render-markdown": { "branch": "main", "commit": "92256e02db70c474f97fc461b6b6bc4aff7a499a" }, + "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-node-action": { "branch": "master", "commit": "bfaa787cc85d753af3c19245b4142ed727a534b5" }, diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua index 2cb4e71..66311e9 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua +++ b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua @@ -73,7 +73,7 @@ return { print("Autoformat set to: " .. tostring(not vim.b.disable_autoformat)) end - MAP("n", "uf", toggleAutoFormat, "Toggle auto format") + vim.keymap.set("n", "uf", toggleAutoFormat, { desc = "Toggle auto format", silent = true }) vim.api.nvim_create_user_command("Fmt", function(args) local range = nil diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/fzf.lua b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/fzf.lua index 991d804..a5d3db3 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/fzf.lua +++ b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/fzf.lua @@ -1,7 +1,11 @@ return { "ibhagwan/fzf-lua", + lazy = false, -- Required to register vim.ui.select() wrapper dependencies = { "echasnovski/mini.nvim" }, - opts = {}, + config = function() + require("fzf-lua").setup() + require("fzf-lua").register_ui_select() + end, keys = { { "ff", function() require("fzf-lua").files() end, desc = "Find files" }, { "fb", function() require("fzf-lua").buffers() end, desc = "Find buffers" }, diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/mini.lua b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/mini.lua index 88f6bbe..3cf4c42 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/mini.lua +++ b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/mini.lua @@ -25,14 +25,13 @@ return { } }) vim.notify = require('mini.notify').make_notify() - require('mini.starter').setup() require('mini.statusline').setup({}) require('mini.diff').setup({ view = { style = 'sign' } }) require('mini.git').setup({}) - local rhs = 'lua MiniGit.show_at_cursor()' - vim.keymap.set({ 'n', 'x' }, 'gs', rhs, { desc = 'Show at cursor', silent = true }) + vim.keymap.set({ 'n', 'x' }, 'gs', 'lua MiniGit.show_at_cursor()', + { desc = 'Show at cursor', silent = true }) local starter = require('mini.starter') starter.setup({ @@ -40,6 +39,7 @@ return { evaluate_single = true, items = { starter.sections.recent_files(10, true), + starter.sections.sessions(5, true), starter.sections.pick(), starter.sections.builtin_actions(), }, @@ -197,5 +197,29 @@ return { hex_color = hipatterns.gen_highlighter.hex_color(), }, }) + + require('mini.sessions').setup({ + autowrite = false + }) + vim.keymap.set('n', 'us', function() + local default_name = require('mini.sessions').get_latest() or "Session.vim" + vim.ui.input({ prompt = "Session name: ", default = default_name }, function(input) + if input == nil then + return + end + require('mini.sessions').write(input) + end) + end, + { desc = 'Save session', silent = true }) + vim.keymap.set('n', 'uS', function() require('mini.sessions').read() end, + { desc = 'Load session (latest)', silent = true }) + + vim.api.nvim_create_user_command("SessionSelect", function() + require('mini.sessions').select('read') + end, {}) + + vim.api.nvim_create_user_command("SessionDelete", function() + require('mini.sessions').select('delete') + end, {}) end } diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/smart-splits.lua b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/smart-splits.lua new file mode 100644 index 0000000..c619888 --- /dev/null +++ b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/smart-splits.lua @@ -0,0 +1,64 @@ +return { + "mrjones2014/smart-splits.nvim", + lazy = false, + build = './kitty/install-kittens.bash', + opts = { ignored_filetypes = { "nofile", "quickfix", "qf", "prompt" }, ignored_buftypes = { "nofile" } }, + keys = { + { + "", + function() + require("smart-splits").move_cursor_left() + end, + desc = "Move to left window", + }, + { + "", + function() + require("smart-splits").move_cursor_down() + end, + desc = "Move to bottom window", + }, + { + "", + function() + require("smart-splits").move_cursor_up() + end, + desc = "Move to upper window", + }, + { + "", + function() + require("smart-splits").move_cursor_right() + end, + desc = "Move to right window", + }, + { + "", + function() + require("smart-splits").resize_left() + end, + desc = "Move to left window", + }, + { + "", + function() + require("smart-splits").resize_down() + end, + desc = "Move to bottom window", + }, + { + "", + function() + require("smart-splits").resize_up() + end, + desc = "Move to upper window", + }, + { + "", + function() + require("smart-splits").resize_right() + end, + desc = "Move to right window", + }, + }, +} diff --git a/Configs/zsh/.config/zsh/aliases/nvim.zsh b/Configs/zsh/.config/zsh/aliases/nvim.zsh index 4dc86ec..9cdb4b1 100644 --- a/Configs/zsh/.config/zsh/aliases/nvim.zsh +++ b/Configs/zsh/.config/zsh/aliases/nvim.zsh @@ -1,8 +1,6 @@ alias \ vi='nvim' \ - vi-unstable='NVIM_APPNAME=nvim-unstable nvim' \ - vi-astro='NVIM_APPNAME=Distro-AstroNvim nvim' \ - vi-lazy='NVIM_APPNAME=LazyVim nvim' + vi-unstable='NVIM_APPNAME=nvim_unstable nvim' vis() { items=(