From f0fadf6d12c50ff7ce48b739d71208821bdafd23 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Thu, 6 Jun 2024 00:28:16 +0200 Subject: [PATCH] Refresh generated nvim config --- config/neovim/config.lua | 130 ++-- config/neovim/config_nix.lua | 272 ++++--- .../store/lazy-plugins/project.nvim/LICENSE | 201 ------ .../store/lazy-plugins/project.nvim/README.md | 214 ------ .../project.nvim/lua/project_nvim/config.lua | 66 -- .../project.nvim/lua/project_nvim/init.lua | 8 - .../project.nvim/lua/project_nvim/project.lua | 286 -------- .../lua/project_nvim/utils/globtopattern.lua | 139 ---- .../lua/project_nvim/utils/history.lua | 178 ----- .../lua/project_nvim/utils/path.lua | 37 - .../lua/telescope/_extensions/projects.lua | 180 ----- .../lazy-plugins/winshift.nvim/.gitignore | 1 + .../store/lazy-plugins/winshift.nvim/LICENSE | 674 ++++++++++++++++++ .../lazy-plugins/winshift.nvim/README.md | 150 ++++ .../store/lazy-plugins/winshift.nvim/doc/tags | 11 + .../winshift.nvim/doc/winshift.txt | 118 +++ .../winshift.nvim/doc/winshift_changelog.txt | 63 ++ .../winshift.nvim/lua/winshift.lua | 68 ++ .../winshift.nvim/lua/winshift/colors.lua | 200 ++++++ .../winshift.nvim/lua/winshift/config.lua | 111 +++ .../winshift.nvim/lua/winshift/lib.lua | 659 +++++++++++++++++ .../winshift.nvim/lua/winshift/utils.lua | 360 ++++++++++ .../winshift.nvim/plugin/winshift.vim | 17 + .../stylua.toml} | 2 +- 24 files changed, 2626 insertions(+), 1519 deletions(-) delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/LICENSE delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/README.md delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/config.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/init.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/project.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/globtopattern.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/history.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/path.lua delete mode 100644 config/neovim/store/lazy-plugins/project.nvim/lua/telescope/_extensions/projects.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/.gitignore create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/LICENSE create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/README.md create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/doc/tags create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift.txt create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift_changelog.txt create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/colors.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/config.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/lib.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/utils.lua create mode 100644 config/neovim/store/lazy-plugins/winshift.nvim/plugin/winshift.vim rename config/neovim/store/lazy-plugins/{project.nvim/.stylua.toml => winshift.nvim/stylua.toml} (83%) diff --git a/config/neovim/config.lua b/config/neovim/config.lua index 77cc72b2..0552fa5b 100644 --- a/config/neovim/config.lua +++ b/config/neovim/config.lua @@ -410,78 +410,11 @@ require("lazy").setup({ ["autoload"] = false, ["autosave"] = true, ["follow_cwd"] = true, + ["ignored_dirs"] = { "/", "~/", "~/Projects/" }, ["silent"] = false, ["use_git_branch"] = false, }, }, - { - "project", - ["config"] = function(_, opts) - require("project_nvim").setup(opts) - end, - ["dependencies"] = { - { - "telescope", - ["cmd"] = { "Telescope" }, - ["config"] = function(_, opts) - local telescope = require("telescope") - telescope.setup(opts) - - for i, extension in ipairs({ "undo", "ui-select", "fzf" }) do - telescope.load_extension(extension) - end - end, - ["dependencies"] = { - { - "plenary", - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim", - ["lazy"] = true, - ["name"] = "plenary", - }, - { - "telescope-fzf-native", - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim", - ["lazy"] = true, - ["name"] = "telescope-fzf-native", - }, - { - "telescope-undo", - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-undo.nvim", - ["lazy"] = true, - ["name"] = "telescope-undo", - }, - { - "telescope-ui-select", - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-ui-select.nvim", - ["lazy"] = true, - ["name"] = "telescope-ui-select", - }, - }, - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope.nvim", - ["lazy"] = true, - ["name"] = "telescope", - ["opts"] = { - ["defaults"] = { - ["mappings"] = { - ["i"] = { - [""] = function(...) - return require("telescope.actions").close(...) - end, - }, - }, - }, - }, - }, - }, - ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/project.nvim", - ["lazy"] = true, - ["name"] = "project", - ["opts"] = { - ["detection_methods"] = { "lsp", "pattern" }, - ["manual_mode"] = false, - ["patterns"] = { ".git", "Makefile", "CMakeLists.txt", "flake.nix" }, - }, - }, }, ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/dashboard-nvim", ["lazy"] = false, @@ -489,7 +422,6 @@ require("lazy").setup({ ["opts"] = { ["config"] = { ["center"] = { - { ["action"] = "Telescope projects", ["desc"] = " Open Project", ["icon"] = " ", ["key"] = "p" }, { ["action"] = "Telescope persisted", ["desc"] = " Restore Session", @@ -983,6 +915,43 @@ require("lazy").setup({ { "rustaceanvim", ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/rustaceanvim", + ["init"] = function() + vim.g.rustaceanvim = { + tools = { + enable_clippy = true, + }, + + server = { + default_settings = { + ["rust-analyzer"] = { + cargo = { + allFeatures = true, + -- features = "all", + -- loadOutDirsFromCheck = true, + -- runBuildScripts = true, + }, + + -- lint-nvim doesn't support clippy + checkOnSave = { + allFeatures = true, + allTargets = true, + command = "clippy", + extraArgs = { + "--", + "--no-deps", + "-Dclippy::pedantic", + "-Dclippy::nursery", + "-Dclippy::unwrap_used", + "-Dclippy::enum_glob_use", + "-Dclippy::complexity", + "-Dclippy::perf", + }, + }, + }, + }, + }, + } + end, ["lazy"] = false, ["name"] = "rustaceanvim", }, @@ -1193,6 +1162,23 @@ require("lazy").setup({ ["name"] = "which-key", ["priority"] = 500, }, + { + "winshift", + ["cmd"] = { "WinShift" }, + ["config"] = function(_, opts) + require("winshift").setup(opts) + end, + ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/winshift.nvim", + ["lazy"] = true, + ["name"] = "winshift", + ["opts"] = { + ["highlight_moving_win"] = true, + ["keymaps"] = { + ["disable_defaults"] = true, + ["win_move_mode"] = { ["h"] = "left", ["j"] = "down", ["k"] = "up", ["l"] = "right" }, + }, + }, + }, { "yanky", ["cmd"] = { "YankyClearHistory", "YankyRingHistory" }, @@ -1518,6 +1504,12 @@ do { ["action"] = "p", ["key"] = "ww", ["mode"] = "n", ["options"] = { ["desc"] = "Goto other window", } }, + { + ["action"] = "WinShift", + ["key"] = "wm", + ["mode"] = "n", + ["options"] = { ["desc"] = "Move window" }, + }, { ["action"] = "+toggle", ["key"] = "t", ["mode"] = "n" }, { ["action"] = "Neotree action=show toggle=true=", diff --git a/config/neovim/config_nix.lua b/config/neovim/config_nix.lua index 30b35a11..581bb91a 100644 --- a/config/neovim/config_nix.lua +++ b/config/neovim/config_nix.lua @@ -72,7 +72,7 @@ vim.cmd([[ ]]) require("lazy").setup({ dev = { - path = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins", + path = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins", patterns = { "." }, fallback = false, }, @@ -87,7 +87,7 @@ require("lazy").setup({ colorscheme catppuccin ]]) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/catppuccin-nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/catppuccin-nvim", ["lazy"] = false, ["name"] = "catppuccin", ["opts"] = { ["background"] = { ["dark"] = "mocha", ["light"] = "latte" }, ["flavour"] = "mocha" }, @@ -98,7 +98,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("nvim-web-devicons").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-web-devicons", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-web-devicons", ["lazy"] = true, ["name"] = "web-devicons", }, @@ -107,7 +107,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("nvim-autopairs").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-autopairs", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-autopairs", ["event"] = { "InsertEnter" }, ["lazy"] = true, ["name"] = "autopairs", @@ -116,7 +116,7 @@ require("lazy").setup({ { "bbye", ["cmd"] = { "Bdelete", "Bwipeout" }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vim-bbye", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vim-bbye", ["lazy"] = true, ["name"] = "bbye", }, @@ -125,7 +125,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("better_escape").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/better-escape.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/better-escape.nvim", ["event"] = { "InsertEnter" }, ["lazy"] = true, ["name"] = "better-escape", @@ -136,7 +136,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("clangd_extensions").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/clangd_extensions.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/clangd_extensions.nvim", ["lazy"] = true, ["name"] = "clangd-extensions", ["opts"] = { ["inlay_hints"] = { ["inline"] = false } }, @@ -149,50 +149,50 @@ require("lazy").setup({ ["dependencies"] = { { "cmp-async-path", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-async-path", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-async-path", ["lazy"] = true, ["name"] = "cmp-async-path", }, { "cmp-buffer", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-buffer", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-buffer", ["enabled"] = false, ["lazy"] = true, ["name"] = "cmp-buffer", }, { "cmp-cmdline", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-cmdline", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-cmdline", ["enabled"] = false, ["lazy"] = true, ["name"] = "cmp-cmdline", }, { "cmp-emoji", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-emoji", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-emoji", ["lazy"] = true, ["name"] = "cmp-emoji", }, { "cmp-nvim-lsp", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-nvim-lsp", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-nvim-lsp", ["lazy"] = true, ["name"] = "cmp-nvim-lsp", }, { "cmp-nvim-lsp-signature-help", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp-nvim-lsp-signature-help", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp-nvim-lsp-signature-help", ["lazy"] = true, ["name"] = "cmp-nvim-lsp-signature-help", }, { "cmp-luasnip", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/cmp_luasnip", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/cmp_luasnip", ["lazy"] = true, ["name"] = "cmp-luasnip", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-cmp", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-cmp", ["event"] = { "InsertEnter" }, ["lazy"] = true, ["name"] = "cmp", @@ -276,12 +276,12 @@ require("lazy").setup({ require("ts_context_commentstring").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-ts-context-commentstring", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-ts-context-commentstring", ["lazy"] = true, ["name"] = "ts-context-commentstring", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/comment.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/comment.nvim", ["lazy"] = false, ["name"] = "comment", ["opts"] = { @@ -298,7 +298,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("conform").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/conform.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/conform.nvim", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "conform", @@ -338,7 +338,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("nvim-web-devicons").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-web-devicons", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-web-devicons", ["lazy"] = true, ["name"] = "web-devicons", }, @@ -364,30 +364,30 @@ require("lazy").setup({ ["dependencies"] = { { "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/plenary.nvim", ["lazy"] = true, ["name"] = "plenary", }, { "telescope-fzf-native", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-fzf-native.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-fzf-native.nvim", ["lazy"] = true, ["name"] = "telescope-fzf-native", }, { "telescope-undo", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-undo.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-undo.nvim", ["lazy"] = true, ["name"] = "telescope-undo", }, { "telescope-ui-select", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-ui-select.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-ui-select.nvim", ["lazy"] = true, ["name"] = "telescope-ui-select", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope.nvim", ["lazy"] = true, ["name"] = "telescope", ["opts"] = { @@ -403,93 +403,25 @@ require("lazy").setup({ }, }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/persisted.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/persisted.nvim", ["lazy"] = true, ["name"] = "persisted", ["opts"] = { ["autoload"] = false, ["autosave"] = true, ["follow_cwd"] = true, + ["ignored_dirs"] = { "/", "~/", "~/Projects/" }, ["silent"] = false, ["use_git_branch"] = false, }, }, - { - "project", - ["config"] = function(_, opts) - require("project_nvim").setup(opts) - end, - ["dependencies"] = { - { - "telescope", - ["cmd"] = { "Telescope" }, - ["config"] = function(_, opts) - local telescope = require("telescope") - telescope.setup(opts) - - for i, extension in ipairs({ "undo", "ui-select", "fzf" }) do - telescope.load_extension(extension) - end - end, - ["dependencies"] = { - { - "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", - ["lazy"] = true, - ["name"] = "plenary", - }, - { - "telescope-fzf-native", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-fzf-native.nvim", - ["lazy"] = true, - ["name"] = "telescope-fzf-native", - }, - { - "telescope-undo", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-undo.nvim", - ["lazy"] = true, - ["name"] = "telescope-undo", - }, - { - "telescope-ui-select", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-ui-select.nvim", - ["lazy"] = true, - ["name"] = "telescope-ui-select", - }, - }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope.nvim", - ["lazy"] = true, - ["name"] = "telescope", - ["opts"] = { - ["defaults"] = { - ["mappings"] = { - ["i"] = { - [""] = function(...) - return require("telescope.actions").close(...) - end, - }, - }, - }, - }, - }, - }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/project.nvim", - ["lazy"] = true, - ["name"] = "project", - ["opts"] = { - ["detection_methods"] = { "lsp", "pattern" }, - ["manual_mode"] = false, - ["patterns"] = { ".git", "Makefile", "CMakeLists.txt", "flake.nix" }, - }, - }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/dashboard-nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/dashboard-nvim", ["lazy"] = false, ["name"] = "dashboard", ["opts"] = { ["config"] = { ["center"] = { - { ["action"] = "Telescope projects", ["desc"] = " Open Project", ["icon"] = " ", ["key"] = "p" }, { ["action"] = "Telescope persisted", ["desc"] = " Restore Session", @@ -519,7 +451,7 @@ require("lazy").setup({ { "diffview", ["cmd"] = { "DiffviewOpen" }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/diffview.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/diffview.nvim", ["lazy"] = true, ["name"] = "diffview", }, @@ -528,7 +460,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("flash").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/flash.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/flash.nvim", ["keys"] = { "s", "S", "f", "F", "t", "T" }, ["lazy"] = true, ["name"] = "flash", @@ -541,7 +473,7 @@ require("lazy").setup({ vim.g[k] = v end end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/git-messenger.vim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/git-messenger.vim", ["lazy"] = true, ["name"] = "gitmessenger", ["opts"] = { @@ -554,7 +486,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("gitsigns").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/gitsigns.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/gitsigns.nvim", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "gitsigns", @@ -562,7 +494,7 @@ require("lazy").setup({ }, { "haskell-tools", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/haskell-tools.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/haskell-tools.nvim", ["lazy"] = false, ["name"] = "haskell-tools", }, @@ -571,7 +503,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("illuminate").configure(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vim-illuminate", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vim-illuminate", ["event"] = { "BufreadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "illuminate", @@ -591,7 +523,7 @@ require("lazy").setup({ }, { "intellitab", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/intellitab.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/intellitab.nvim", ["event"] = { "InsertEnter" }, ["lazy"] = true, ["name"] = "intellitab", @@ -601,7 +533,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("nvim-lastplace").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-lastplace", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-lastplace", ["lazy"] = false, ["name"] = "lastplace", }, @@ -611,12 +543,12 @@ require("lazy").setup({ ["dependencies"] = { { "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/plenary.nvim", ["lazy"] = true, ["name"] = "plenary", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/lazygit.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/lazygit.nvim", ["lazy"] = true, ["name"] = "lazygit", }, @@ -629,7 +561,7 @@ require("lazy").setup({ lint[k] = v end end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-lint", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-lint", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "lint", @@ -732,12 +664,12 @@ require("lazy").setup({ ["config"] = function(_, opts) require("lazydev").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vimplugin-nvim-lazydev", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vimplugin-nvim-lazydev", ["ft"] = { "lua" }, ["name"] = "lazydev", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-lspconfig", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-lspconfig", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "lspconfig", @@ -755,7 +687,7 @@ require("lazy").setup({ unhide = false, }) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/lualine.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/lualine.nvim", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "lualine", @@ -783,7 +715,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("luasnip").config.set_config(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/luasnip", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/luasnip", ["lazy"] = false, ["name"] = "luasnip", }, @@ -795,7 +727,7 @@ require("lazy").setup({ vim.keymap.del("x", "nr") vim.keymap.del("n", "nr") end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/NrrwRgn", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/NrrwRgn", ["lazy"] = true, ["name"] = "narrow-region", }, @@ -832,7 +764,7 @@ require("lazy").setup({ -- } -- }) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-navic", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-navic", ["lazy"] = true, ["name"] = "navic", ["opts"] = { @@ -843,7 +775,7 @@ require("lazy").setup({ }, }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-navbuddy", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-navbuddy", ["lazy"] = true, ["name"] = "navbuddy", ["opts"] = { ["lsp"] = { ["auto_attach"] = true }, ["window"] = { ["border"] = "rounded" } }, @@ -857,7 +789,7 @@ require("lazy").setup({ ["dependencies"] = { { "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/plenary.nvim", ["lazy"] = true, ["name"] = "plenary", }, @@ -866,18 +798,18 @@ require("lazy").setup({ ["config"] = function(_, opts) require("nvim-web-devicons").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-web-devicons", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-web-devicons", ["lazy"] = true, ["name"] = "web-devicons", }, { "nui", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nui.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nui.nvim", ["lazy"] = true, ["name"] = "nui", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/neo-tree.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/neo-tree.nvim", ["lazy"] = true, ["name"] = "neo-tree", ["opts"] = { @@ -927,18 +859,18 @@ require("lazy").setup({ vim.notify = require("notify") require("notify").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-notify", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-notify", ["lazy"] = true, ["name"] = "notify", }, { "nui", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nui.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nui.nvim", ["lazy"] = true, ["name"] = "nui", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/noice.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/noice.nvim", ["lazy"] = false, ["name"] = "noice", ["opts"] = { @@ -976,25 +908,62 @@ require("lazy").setup({ }, { "rainbow-delimiters", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/rainbow-delimiters.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/rainbow-delimiters.nvim", ["lazy"] = false, ["name"] = "rainbow-delimiters", }, { "rustaceanvim", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/rustaceanvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/rustaceanvim", + ["init"] = function() + vim.g.rustaceanvim = { + tools = { + enable_clippy = true, + }, + + server = { + default_settings = { + ["rust-analyzer"] = { + cargo = { + allFeatures = true, + -- features = "all", + -- loadOutDirsFromCheck = true, + -- runBuildScripts = true, + }, + + -- lint-nvim doesn't support clippy + checkOnSave = { + allFeatures = true, + allTargets = true, + command = "clippy", + extraArgs = { + "--", + "--no-deps", + "-Dclippy::pedantic", + "-Dclippy::nursery", + "-Dclippy::unwrap_used", + "-Dclippy::enum_glob_use", + "-Dclippy::complexity", + "-Dclippy::perf", + }, + }, + }, + }, + }, + } + end, ["lazy"] = false, ["name"] = "rustaceanvim", }, { "sandwich", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vim-sandwich", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vim-sandwich", ["lazy"] = false, ["name"] = "sandwich", }, { "sleuth", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vim-sleuth", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vim-sleuth", ["lazy"] = false, ["name"] = "sleuth", }, @@ -1012,30 +981,30 @@ require("lazy").setup({ ["dependencies"] = { { "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/plenary.nvim", ["lazy"] = true, ["name"] = "plenary", }, { "telescope-fzf-native", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-fzf-native.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-fzf-native.nvim", ["lazy"] = true, ["name"] = "telescope-fzf-native", }, { "telescope-undo", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-undo.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-undo.nvim", ["lazy"] = true, ["name"] = "telescope-undo", }, { "telescope-ui-select", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope-ui-select.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope-ui-select.nvim", ["lazy"] = true, ["name"] = "telescope-ui-select", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/telescope.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/telescope.nvim", ["lazy"] = true, ["name"] = "telescope", ["opts"] = { @@ -1058,12 +1027,12 @@ require("lazy").setup({ ["dependencies"] = { { "plenary", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/plenary.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/plenary.nvim", ["lazy"] = true, ["name"] = "plenary", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/todo-comments.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/todo-comments.nvim", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "todo-comments", @@ -1086,7 +1055,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("toggleterm").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/toggleterm.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/toggleterm.nvim", ["keys"] = { "" }, ["lazy"] = true, ["name"] = "toggleterm", @@ -1119,7 +1088,7 @@ require("lazy").setup({ require("nvim-treesitter.configs").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-treesitter", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-treesitter", ["event"] = { "BufReadPost", "BufNewFile" }, ["lazy"] = true, ["name"] = "treesitter", @@ -1144,7 +1113,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("trim").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/trim.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/trim.nvim", ["lazy"] = false, ["name"] = "trim", }, @@ -1154,7 +1123,7 @@ require("lazy").setup({ ["config"] = function(_, opts) require("trouble").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/trouble.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/trouble.nvim", ["lazy"] = true, ["name"] = "trouble", }, @@ -1166,12 +1135,12 @@ require("lazy").setup({ ["dependencies"] = { { "promise", - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/promise-async", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/promise-async", ["lazy"] = true, ["name"] = "promise", }, }, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/nvim-ufo", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/nvim-ufo", ["lazy"] = false, ["name"] = "ufo", }, @@ -1180,7 +1149,7 @@ require("lazy").setup({ ["config"] = function(_, opts) vim.g.vimtex_view_method = "zathura" end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/vimtex", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/vimtex", ["name"] = "vimtex", }, { @@ -1188,18 +1157,35 @@ require("lazy").setup({ ["config"] = function(_, opts) require("which-key").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/which-key.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/which-key.nvim", ["lazy"] = false, ["name"] = "which-key", ["priority"] = 500, }, + { + "winshift", + ["cmd"] = { "WinShift" }, + ["config"] = function(_, opts) + require("winshift").setup(opts) + end, + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/winshift.nvim", + ["lazy"] = true, + ["name"] = "winshift", + ["opts"] = { + ["highlight_moving_win"] = true, + ["keymaps"] = { + ["disable_defaults"] = true, + ["win_move_mode"] = { ["h"] = "left", ["j"] = "down", ["k"] = "up", ["l"] = "right" }, + }, + }, + }, { "yanky", ["cmd"] = { "YankyClearHistory", "YankyRingHistory" }, ["config"] = function(_, opts) require("yanky").setup(opts) end, - ["dir"] = "/nix/store/n0b2m2d300z2r6ifh2c9rwsskha4c22h-lazy-plugins/yanky.nvim", + ["dir"] = "/nix/store/b8r3kziagfi17ikh7w7id7r4xd1482yy-lazy-plugins/yanky.nvim", ["lazy"] = true, ["name"] = "yanky", }, @@ -1518,6 +1504,12 @@ do { ["action"] = "p", ["key"] = "ww", ["mode"] = "n", ["options"] = { ["desc"] = "Goto other window", } }, + { + ["action"] = "WinShift", + ["key"] = "wm", + ["mode"] = "n", + ["options"] = { ["desc"] = "Move window" }, + }, { ["action"] = "+toggle", ["key"] = "t", ["mode"] = "n" }, { ["action"] = "Neotree action=show toggle=true=", diff --git a/config/neovim/store/lazy-plugins/project.nvim/LICENSE b/config/neovim/store/lazy-plugins/project.nvim/LICENSE deleted file mode 100644 index 261eeb9e..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/config/neovim/store/lazy-plugins/project.nvim/README.md b/config/neovim/store/lazy-plugins/project.nvim/README.md deleted file mode 100644 index 69594fc4..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/README.md +++ /dev/null @@ -1,214 +0,0 @@ -# 🗃️ project.nvim - -**project.nvim** is an all in one neovim plugin written in lua that provides -superior project management. - -![Telescope Integration](https://user-images.githubusercontent.com/36672196/129409509-62340f10-4dd0-4c1a-9252-8bfedf2a9945.png) - -## ⚡ Requirements - -- Neovim >= 0.5.0 - -## ✨ Features - -- Automagically cd to project directory using nvim lsp - - Dependency free, does not rely on lspconfig -- If no lsp then uses pattern matching to cd to root directory -- Telescope integration `:Telescope projects` - - Access your recently opened projects from telescope! - - Asynchronous file io so it will not slow down vim when reading the history - file on startup. -- ~~Nvim-tree.lua support/integration~~ - - Please add the following to your config instead: - ```vim - " Vim Script - lua << EOF - require("nvim-tree").setup({ - sync_root_with_cwd = true, - respect_buf_cwd = true, - update_focused_file = { - enable = true, - update_root = true - }, - }) - EOF - ``` - ```lua - -- lua - require("nvim-tree").setup({ - sync_root_with_cwd = true, - respect_buf_cwd = true, - update_focused_file = { - enable = true, - update_root = true - }, - }) - ``` - -## 📦 Installation - -Install the plugin with your preferred package manager: - -### [vim-plug](https://github.com/junegunn/vim-plug) - -```vim -" Vim Script -Plug 'ahmedkhalf/project.nvim' - -lua << EOF - require("project_nvim").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } -EOF -``` - -### [packer](https://github.com/wbthomason/packer.nvim) - -```lua --- Lua -use { - "ahmedkhalf/project.nvim", - config = function() - require("project_nvim").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - end -} -``` - -## ⚙️ Configuration - -**project.nvim** comes with the following defaults: - -```lua -{ - -- Manual mode doesn't automatically change your root directory, so you have - -- the option to manually do so using `:ProjectRoot` command. - manual_mode = false, - - -- Methods of detecting the root directory. **"lsp"** uses the native neovim - -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here - -- order matters: if one is not detected, the other is used as fallback. You - -- can also delete or rearangne the detection methods. - detection_methods = { "lsp", "pattern" }, - - -- All the patterns used to detect root dir, when **"pattern"** is in - -- detection_methods - patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" }, - - -- Table of lsp clients to ignore by name - -- eg: { "efm", ... } - ignore_lsp = {}, - - -- Don't calculate root dir on specific directories - -- Ex: { "~/.cargo/*", ... } - exclude_dirs = {}, - - -- Show hidden files in telescope - show_hidden = false, - - -- When set to false, you will get a message when project.nvim changes your - -- directory. - silent_chdir = true, - - -- What scope to change the directory, valid options are - -- * global (default) - -- * tab - -- * win - scope_chdir = 'global', - - -- Path where project.nvim will store the project history for use in - -- telescope - datapath = vim.fn.stdpath("data"), -} -``` - -Even if you are pleased with the defaults, please note that `setup {}` must be -called for the plugin to start. - -### Pattern Matching - -**project.nvim**'s pattern engine uses the same expressions as vim-rooter, but -for your convenience, I will copy paste them here: - -To specify the root is a certain directory, prefix it with `=`. - -```lua -patterns = { "=src" } -``` - -To specify the root has a certain directory or file (which may be a glob), just -give the name: - -```lua -patterns = { ".git", "Makefile", "*.sln", "build/env.sh" } -``` - -To specify the root has a certain directory as an ancestor (useful for -excluding directories), prefix it with `^`: - -```lua -patterns = { "^fixtures" } -``` - -To specify the root has a certain directory as its direct ancestor / parent -(useful when you put working projects in a common directory), prefix it with -`>`: - -```lua -patterns = { ">Latex" } -``` - -To exclude a pattern, prefix it with `!`. - -```lua -patterns = { "!.git/worktrees", "!=extras", "!^fixtures", "!build/env.sh" } -``` - -List your exclusions before the patterns you do want. - -### Telescope Integration - -To enable telescope integration: -```lua -require('telescope').load_extension('projects') -``` - -#### Telescope Projects Picker -To use the projects picker -```lua -require'telescope'.extensions.projects.projects{} -``` - -#### Telescope mappings - -**project.nvim** comes with the following mappings: - -| Normal mode | Insert mode | Action | -| ----------- | ----------- | -------------------------- | -| f | \ | find\_project\_files | -| b | \ | browse\_project\_files | -| d | \ | delete\_project | -| s | \ | search\_in\_project\_files | -| r | \ | recent\_project\_files | -| w | \ | change\_working\_directory | - -## API - -Get a list of recent projects: - -```lua -local project_nvim = require("project_nvim") -local recent_projects = project_nvim.get_recent_projects() - -print(vim.inspect(recent_projects)) -``` - -## 🤝 Contributing - -- All pull requests are welcome. -- If you encounter bugs please open an issue. diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/config.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/config.lua deleted file mode 100644 index 36e3027f..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/config.lua +++ /dev/null @@ -1,66 +0,0 @@ -local M = {} - ----@class ProjectOptions -M.defaults = { - -- Manual mode doesn't automatically change your root directory, so you have - -- the option to manually do so using `:ProjectRoot` command. - manual_mode = false, - - -- Methods of detecting the root directory. **"lsp"** uses the native neovim - -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here - -- order matters: if one is not detected, the other is used as fallback. You - -- can also delete or rearangne the detection methods. - detection_methods = { "lsp", "pattern" }, - - -- All the patterns used to detect root dir, when **"pattern"** is in - -- detection_methods - patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" }, - - -- Table of lsp clients to ignore by name - -- eg: { "efm", ... } - ignore_lsp = {}, - - -- Don't calculate root dir on specific directories - -- Ex: { "~/.cargo/*", ... } - exclude_dirs = {}, - - -- Show hidden files in telescope - show_hidden = false, - - -- When set to false, you will get a message when project.nvim changes your - -- directory. - silent_chdir = true, - - -- What scope to change the directory, valid options are - -- * global (default) - -- * tab - -- * win - scope_chdir = 'global', - - -- Path where project.nvim will store the project history for use in - -- telescope - datapath = vim.fn.stdpath("data"), -} - ----@type ProjectOptions -M.options = {} - -M.setup = function(options) - M.options = vim.tbl_deep_extend("force", M.defaults, options or {}) - - local glob = require("project_nvim.utils.globtopattern") - local home = vim.fn.expand("~") - M.options.exclude_dirs = vim.tbl_map(function(pattern) - if vim.startswith(pattern, "~/") then - pattern = home .. "/" .. pattern:sub(3, #pattern) - end - return glob.globtopattern(pattern) - end, M.options.exclude_dirs) - - vim.opt.autochdir = false -- implicitly unset autochdir - - require("project_nvim.utils.path").init() - require("project_nvim.project").init() -end - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/init.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/init.lua deleted file mode 100644 index ab45fb33..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/init.lua +++ /dev/null @@ -1,8 +0,0 @@ -local config = require("project_nvim.config") -local history = require("project_nvim.utils.history") -local M = {} - -M.setup = config.setup -M.get_recent_projects = history.get_recent_projects - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/project.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/project.lua deleted file mode 100644 index 76972eec..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/project.lua +++ /dev/null @@ -1,286 +0,0 @@ -local config = require("project_nvim.config") -local history = require("project_nvim.utils.history") -local glob = require("project_nvim.utils.globtopattern") -local path = require("project_nvim.utils.path") -local uv = vim.loop -local M = {} - --- Internal states -M.attached_lsp = false -M.last_project = nil - -function M.find_lsp_root() - -- Get lsp client for current buffer - -- Returns nil or string - local buf_ft = vim.api.nvim_buf_get_option(0, "filetype") - local clients = vim.lsp.buf_get_clients() - if next(clients) == nil then - return nil - end - - for _, client in pairs(clients) do - local filetypes = client.config.filetypes - if filetypes and vim.tbl_contains(filetypes, buf_ft) then - if not vim.tbl_contains(config.options.ignore_lsp, client.name) then - return client.config.root_dir, client.name - end - end - end - - return nil -end - -function M.find_pattern_root() - local search_dir = vim.fn.expand("%:p:h", true) - if vim.fn.has("win32") > 0 then - search_dir = search_dir:gsub("\\", "/") - end - - local last_dir_cache = "" - local curr_dir_cache = {} - - local function get_parent(path) - path = path:match("^(.*)/") - if path == "" then - path = "/" - end - return path - end - - local function get_files(file_dir) - last_dir_cache = file_dir - curr_dir_cache = {} - - local dir = uv.fs_scandir(file_dir) - if dir == nil then - return - end - - while true do - local file = uv.fs_scandir_next(dir) - if file == nil then - return - end - - table.insert(curr_dir_cache, file) - end - end - - local function is(dir, identifier) - dir = dir:match(".*/(.*)") - return dir == identifier - end - - local function sub(dir, identifier) - local path = get_parent(dir) - while true do - if is(path, identifier) then - return true - end - local current = path - path = get_parent(path) - if current == path then - return false - end - end - end - - local function child(dir, identifier) - local path = get_parent(dir) - return is(path, identifier) - end - - local function has(dir, identifier) - if last_dir_cache ~= dir then - get_files(dir) - end - local pattern = glob.globtopattern(identifier) - for _, file in ipairs(curr_dir_cache) do - if file:match(pattern) ~= nil then - return true - end - end - return false - end - - local function match(dir, pattern) - local first_char = pattern:sub(1, 1) - if first_char == "=" then - return is(dir, pattern:sub(2)) - elseif first_char == "^" then - return sub(dir, pattern:sub(2)) - elseif first_char == ">" then - return child(dir, pattern:sub(2)) - else - return has(dir, pattern) - end - end - - -- breadth-first search - while true do - for _, pattern in ipairs(config.options.patterns) do - local exclude = false - if pattern:sub(1, 1) == "!" then - exclude = true - pattern = pattern:sub(2) - end - if match(search_dir, pattern) then - if exclude then - break - else - return search_dir, "pattern " .. pattern - end - end - end - - local parent = get_parent(search_dir) - if parent == search_dir or parent == nil then - return nil - end - - search_dir = parent - end -end - ----@diagnostic disable-next-line: unused-local -local on_attach_lsp = function(client, bufnr) - M.on_buf_enter() -- Recalculate root dir after lsp attaches -end - -function M.attach_to_lsp() - if M.attached_lsp then - return - end - - local _start_client = vim.lsp.start_client - vim.lsp.start_client = function(lsp_config) - if lsp_config.on_attach == nil then - lsp_config.on_attach = on_attach_lsp - else - local _on_attach = lsp_config.on_attach - lsp_config.on_attach = function(client, bufnr) - on_attach_lsp(client, bufnr) - _on_attach(client, bufnr) - end - end - return _start_client(lsp_config) - end - - M.attached_lsp = true -end - -function M.set_pwd(dir, method) - if dir ~= nil then - M.last_project = dir - table.insert(history.session_projects, dir) - - if vim.fn.getcwd() ~= dir then - local scope_chdir = config.options.scope_chdir - if scope_chdir == 'global' then - vim.api.nvim_set_current_dir(dir) - elseif scope_chdir == 'tab' then - vim.cmd('tcd ' .. dir) - elseif scope_chdir == 'win' then - vim.cmd('lcd ' .. dir) - else - return - end - - if config.options.silent_chdir == false then - vim.notify("Set CWD to " .. dir .. " using " .. method) - end - end - return true - end - - return false -end - -function M.get_project_root() - -- returns project root, as well as method - for _, detection_method in ipairs(config.options.detection_methods) do - if detection_method == "lsp" then - local root, lsp_name = M.find_lsp_root() - if root ~= nil then - return root, '"' .. lsp_name .. '"' .. " lsp" - end - elseif detection_method == "pattern" then - local root, method = M.find_pattern_root() - if root ~= nil then - return root, method - end - end - end -end - -function M.is_file() - local buf_type = vim.api.nvim_buf_get_option(0, "buftype") - - local whitelisted_buf_type = { "", "acwrite" } - local is_in_whitelist = false - for _, wtype in ipairs(whitelisted_buf_type) do - if buf_type == wtype then - is_in_whitelist = true - break - end - end - if not is_in_whitelist then - return false - end - - return true -end - -function M.on_buf_enter() - if vim.v.vim_did_enter == 0 then - return - end - - if not M.is_file() then - return - end - - local current_dir = vim.fn.expand("%:p:h", true) - if not path.exists(current_dir) or path.is_excluded(current_dir) then - return - end - - local root, method = M.get_project_root() - M.set_pwd(root, method) -end - -function M.add_project_manually() - local current_dir = vim.fn.expand("%:p:h", true) - M.set_pwd(current_dir, 'manual') -end - -function M.init() - local autocmds = {} - if not config.options.manual_mode then - autocmds[#autocmds + 1] = 'autocmd VimEnter,BufEnter * ++nested lua require("project_nvim.project").on_buf_enter()' - - if vim.tbl_contains(config.options.detection_methods, "lsp") then - M.attach_to_lsp() - end - end - - vim.cmd([[ - command! ProjectRoot lua require("project_nvim.project").on_buf_enter() - command! AddProject lua require("project_nvim.project").add_project_manually() - ]]) - - autocmds[#autocmds + 1] = - 'autocmd VimLeavePre * lua require("project_nvim.utils.history").write_projects_to_history()' - - vim.cmd([[augroup project_nvim - au! - ]]) - for _, value in ipairs(autocmds) do - vim.cmd(value) - end - vim.cmd("augroup END") - - history.read_projects_from_history() -end - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/globtopattern.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/globtopattern.lua deleted file mode 100644 index 1d784cae..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/globtopattern.lua +++ /dev/null @@ -1,139 +0,0 @@ --- Credits for this module goes to: David Manura --- https://github.com/davidm/lua-glob-pattern - -local M = { _TYPE = "module", _NAME = "globtopattern", _VERSION = "0.2.1.20120406" } - -function M.globtopattern(g) - -- Some useful references: - -- - apr_fnmatch in Apache APR. For example, - -- http://apr.apache.org/docs/apr/1.3/group__apr__fnmatch.html - -- which cites POSIX 1003.2-1992, section B.6. - - local p = "^" -- pattern being built - local i = 0 -- index in g - local c -- char at index i in g. - - -- unescape glob char - local function unescape() - if c == "\\" then - i = i + 1 - c = g:sub(i, i) - if c == "" then - p = "[^]" - return false - end - end - return true - end - - -- escape pattern char - local function escape(c) - return c:match("^%w$") and c or "%" .. c - end - - -- Convert tokens at end of charset. - local function charset_end() - while 1 do - if c == "" then - p = "[^]" - return false - elseif c == "]" then - p = p .. "]" - break - else - if not unescape() then - break - end - local c1 = c - i = i + 1 - c = g:sub(i, i) - if c == "" then - p = "[^]" - return false - elseif c == "-" then - i = i + 1 - c = g:sub(i, i) - if c == "" then - p = "[^]" - return false - elseif c == "]" then - p = p .. escape(c1) .. "%-]" - break - else - if not unescape() then - break - end - p = p .. escape(c1) .. "-" .. escape(c) - end - elseif c == "]" then - p = p .. escape(c1) .. "]" - break - else - p = p .. escape(c1) - i = i - 1 -- put back - end - end - i = i + 1 - c = g:sub(i, i) - end - return true - end - - -- Convert tokens in charset. - local function charset() - i = i + 1 - c = g:sub(i, i) - if c == "" or c == "]" then - p = "[^]" - return false - elseif c == "^" or c == "!" then - i = i + 1 - c = g:sub(i, i) - if c == "]" then - -- ignored - else - p = p .. "[^" - if not charset_end() then - return false - end - end - else - p = p .. "[" - if not charset_end() then - return false - end - end - return true - end - - -- Convert tokens. - while 1 do - i = i + 1 - c = g:sub(i, i) - if c == "" then - p = p .. "$" - break - elseif c == "?" then - p = p .. "." - elseif c == "*" then - p = p .. ".*" - elseif c == "[" then - if not charset() then - break - end - elseif c == "\\" then - i = i + 1 - c = g:sub(i, i) - if c == "" then - p = p .. "\\$" - break - end - p = p .. escape(c) - else - p = p .. escape(c) - end - end - return p -end - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/history.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/history.lua deleted file mode 100644 index 486c1ee3..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/history.lua +++ /dev/null @@ -1,178 +0,0 @@ -local path = require("project_nvim.utils.path") -local uv = vim.loop -local M = {} -local is_windows = vim.fn.has('win32') or vim.fn.has('wsl') - -M.recent_projects = nil -- projects from previous neovim sessions -M.session_projects = {} -- projects from current neovim session -M.has_watch_setup = false - -local function open_history(mode, callback) - if callback ~= nil then -- async - path.create_scaffolding(function(_, _) - uv.fs_open(path.historyfile, mode, 438, callback) - end) - else -- sync - path.create_scaffolding() - return uv.fs_open(path.historyfile, mode, 438) - end -end - -local function dir_exists(dir) - local stat = uv.fs_stat(dir) - if stat ~= nil and stat.type == "directory" then - return true - end - return false -end - -local function normalise_path(path_to_normalise) - local normalised_path = path_to_normalise:gsub("\\", "/"):gsub("//", "/") - - if is_windows then - normalised_path = normalised_path:sub(1,1):lower()..normalised_path:sub(2) - end - - return normalised_path -end - -local function delete_duplicates(tbl) - local cache_dict = {} - for _, v in ipairs(tbl) do - local normalised_path = normalise_path(v) - if cache_dict[normalised_path] == nil then - cache_dict[normalised_path] = 1 - else - cache_dict[normalised_path] = cache_dict[normalised_path] + 1 - end - end - - local res = {} - for _, v in ipairs(tbl) do - local normalised_path = normalise_path(v) - if cache_dict[normalised_path] == 1 then - table.insert(res, normalised_path) - else - cache_dict[normalised_path] = cache_dict[normalised_path] - 1 - end - end - return res -end - -function M.delete_project(project) - for k, v in ipairs(M.recent_projects) do - if v == project.value then - M.recent_projects[k] = nil - end - end -end - -local function deserialize_history(history_data) - -- split data to table - local projects = {} - for s in history_data:gmatch("[^\r\n]+") do - if not path.is_excluded(s) and dir_exists(s) then - table.insert(projects, s) - end - end - - projects = delete_duplicates(projects) - - M.recent_projects = projects -end - -local function setup_watch() - -- Only runs once - if M.has_watch_setup == false then - M.has_watch_setup = true - local event = uv.new_fs_event() - if event == nil then - return - end - event:start(path.projectpath, {}, function(err, _, events) - if err ~= nil then - return - end - if events["change"] then - M.recent_projects = nil - M.read_projects_from_history() - end - end) - end -end - -function M.read_projects_from_history() - open_history("r", function(_, fd) - setup_watch() - if fd ~= nil then - uv.fs_fstat(fd, function(_, stat) - if stat ~= nil then - uv.fs_read(fd, stat.size, -1, function(_, data) - uv.fs_close(fd, function(_, _) end) - deserialize_history(data) - end) - end - end) - end - end) -end - -local function sanitize_projects() - local tbl = {} - if M.recent_projects ~= nil then - vim.list_extend(tbl, M.recent_projects) - vim.list_extend(tbl, M.session_projects) - else - tbl = M.session_projects - end - - tbl = delete_duplicates(tbl) - - local real_tbl = {} - for _, dir in ipairs(tbl) do - if dir_exists(dir) then - table.insert(real_tbl, dir) - end - end - - return real_tbl -end - -function M.get_recent_projects() - return sanitize_projects() -end - -function M.write_projects_to_history() - -- Unlike read projects, write projects is synchronous - -- because it runs when vim ends - local mode = "w" - if M.recent_projects == nil then - mode = "a" - end - local file = open_history(mode) - - if file ~= nil then - local res = sanitize_projects() - - -- Trim table to last 100 entries - local len_res = #res - local tbl_out - if #res > 100 then - tbl_out = vim.list_slice(res, len_res - 100, len_res) - else - tbl_out = res - end - - -- Transform table to string - local out = "" - for _, v in ipairs(tbl_out) do - out = out .. v .. "\n" - end - - -- Write string out to file and close - uv.fs_write(file, out, -1) - uv.fs_close(file) - end -end - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/path.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/path.lua deleted file mode 100644 index 69ac7ade..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/project_nvim/utils/path.lua +++ /dev/null @@ -1,37 +0,0 @@ -local config = require("project_nvim.config") -local uv = vim.loop -local M = {} - -M.datapath = vim.fn.stdpath("data") -- directory -M.projectpath = M.datapath .. "/project_nvim" -- directory -M.historyfile = M.projectpath .. "/project_history" -- file - -function M.init() - M.datapath = require("project_nvim.config").options.datapath - M.projectpath = M.datapath .. "/project_nvim" -- directory - M.historyfile = M.projectpath .. "/project_history" -- file -end - -function M.create_scaffolding(callback) - if callback ~= nil then -- async - uv.fs_mkdir(M.projectpath, 448, callback) - else -- sync - uv.fs_mkdir(M.projectpath, 448) - end -end - -function M.is_excluded(dir) - for _, dir_pattern in ipairs(config.options.exclude_dirs) do - if dir:match(dir_pattern) ~= nil then - return true - end - end - - return false -end - -function M.exists(path) - return vim.fn.empty(vim.fn.glob(path)) == 0 -end - -return M diff --git a/config/neovim/store/lazy-plugins/project.nvim/lua/telescope/_extensions/projects.lua b/config/neovim/store/lazy-plugins/project.nvim/lua/telescope/_extensions/projects.lua deleted file mode 100644 index be35f4f3..00000000 --- a/config/neovim/store/lazy-plugins/project.nvim/lua/telescope/_extensions/projects.lua +++ /dev/null @@ -1,180 +0,0 @@ --- Inspiration from: --- https://github.com/nvim-telescope/telescope-project.nvim -local has_telescope, telescope = pcall(require, "telescope") - -if not has_telescope then - return -end - -local finders = require("telescope.finders") -local pickers = require("telescope.pickers") -local telescope_config = require("telescope.config").values -local actions = require("telescope.actions") -local state = require("telescope.actions.state") -local builtin = require("telescope.builtin") -local entry_display = require("telescope.pickers.entry_display") - -local history = require("project_nvim.utils.history") -local project = require("project_nvim.project") -local config = require("project_nvim.config") - ----------- --- Actions ----------- - -local function create_finder() - local results = history.get_recent_projects() - - -- Reverse results - for i = 1, math.floor(#results / 2) do - results[i], results[#results - i + 1] = results[#results - i + 1], results[i] - end - local displayer = entry_display.create({ - separator = " ", - items = { - { - width = 30, - }, - { - remaining = true, - }, - }, - }) - - local function make_display(entry) - return displayer({ entry.name, { entry.value, "Comment" } }) - end - - return finders.new_table({ - results = results, - entry_maker = function(entry) - local name = vim.fn.fnamemodify(entry, ":t") - return { - display = make_display, - name = name, - value = entry, - ordinal = name .. " " .. entry, - } - end, - }) -end - -local function change_working_directory(prompt_bufnr, prompt) - local selected_entry = state.get_selected_entry(prompt_bufnr) - if selected_entry == nil then - actions.close(prompt_bufnr) - return - end - local project_path = selected_entry.value - if prompt == true then - actions._close(prompt_bufnr, true) - else - actions.close(prompt_bufnr) - end - local cd_successful = project.set_pwd(project_path, "telescope") - return project_path, cd_successful -end - -local function find_project_files(prompt_bufnr) - local project_path, cd_successful = change_working_directory(prompt_bufnr, true) - local opt = { - cwd = project_path, - hidden = config.options.show_hidden, - mode = "insert", - } - if cd_successful then - builtin.find_files(opt) - end -end - -local function browse_project_files(prompt_bufnr) - local project_path, cd_successful = change_working_directory(prompt_bufnr, true) - local opt = { - cwd = project_path, - hidden = config.options.show_hidden, - } - if cd_successful then - builtin.file_browser(opt) - end -end - -local function search_in_project_files(prompt_bufnr) - local project_path, cd_successful = change_working_directory(prompt_bufnr, true) - local opt = { - cwd = project_path, - hidden = config.options.show_hidden, - mode = "insert", - } - if cd_successful then - builtin.live_grep(opt) - end -end - -local function recent_project_files(prompt_bufnr) - local _, cd_successful = change_working_directory(prompt_bufnr, true) - local opt = { - cwd_only = true, - hidden = config.options.show_hidden, - } - if cd_successful then - builtin.oldfiles(opt) - end -end - -local function delete_project(prompt_bufnr) - local selectedEntry = state.get_selected_entry(prompt_bufnr) - if selectedEntry == nil then - actions.close(prompt_bufnr) - return - end - local choice = vim.fn.confirm("Delete '" .. selectedEntry.value .. "' from project list?", "&Yes\n&No", 2) - - if choice == 1 then - history.delete_project(selectedEntry) - - local finder = create_finder() - state.get_current_picker(prompt_bufnr):refresh(finder, { - reset_prompt = true, - }) - end -end - ----Main entrypoint for Telescope. ----@param opts table -local function projects(opts) - opts = opts or {} - - pickers.new(opts, { - prompt_title = "Recent Projects", - finder = create_finder(), - previewer = false, - sorter = telescope_config.generic_sorter(opts), - attach_mappings = function(prompt_bufnr, map) - map("n", "f", find_project_files) - map("n", "b", browse_project_files) - map("n", "d", delete_project) - map("n", "s", search_in_project_files) - map("n", "r", recent_project_files) - map("n", "w", change_working_directory) - - map("i", "", find_project_files) - map("i", "", browse_project_files) - map("i", "", delete_project) - map("i", "", search_in_project_files) - map("i", "", recent_project_files) - map("i", "", change_working_directory) - - local on_project_selected = function() - find_project_files(prompt_bufnr) - end - actions.select_default:replace(on_project_selected) - return true - end, - }):find() -end - -return telescope.register_extension({ - exports = { - projects = projects, - }, -}) diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/.gitignore b/config/neovim/store/lazy-plugins/winshift.nvim/.gitignore new file mode 100644 index 00000000..0a56e3fc --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/.gitignore @@ -0,0 +1 @@ +/doc/tags diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/LICENSE b/config/neovim/store/lazy-plugins/winshift.nvim/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/README.md b/config/neovim/store/lazy-plugins/winshift.nvim/README.md new file mode 100644 index 00000000..261eb1cc --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/README.md @@ -0,0 +1,150 @@ +# WinShift.nvim + +> Rearrange your windows with ease. + +![showcase](https://user-images.githubusercontent.com/2786478/133154376-539474eb-73c9-4cd7-af8c-a6abb037c061.gif) + +## Introduction + +Window moving in vim is rather limited. You can exchange a window with any other +window in the same column or row, and you can rotate the order of windows within +a column or row. This doesn't grant much flexibility, and yet there are +limitations to when these operations work. + +WinShift lets you freely rearrange your window layouts by letting you move any +window in any direction. Further, it doesn't only let you move around windows, +but also lets you form new columns and rows by moving into windows horizontally +or vertically respectively. + +## Requirements + +- Neovim ≥ 0.7.2 + +## Installation + +Install the plugin with your package manager of choice. + +```vim +" Plug +Plug 'sindrets/winshift.nvim' +``` + +```lua +-- Packer +use 'sindrets/winshift.nvim' +``` + +## Configuration + +```lua +-- Lua +require("winshift").setup({ + highlight_moving_win = true, -- Highlight the window being moved + focused_hl_group = "Visual", -- The highlight group used for the moving window + moving_win_options = { + -- These are local options applied to the moving window while it's + -- being moved. They are unset when you leave Win-Move mode. + wrap = false, + cursorline = false, + cursorcolumn = false, + colorcolumn = "", + }, + keymaps = { + disable_defaults = false, -- Disable the default keymaps + win_move_mode = { + ["h"] = "left", + ["j"] = "down", + ["k"] = "up", + ["l"] = "right", + ["H"] = "far_left", + ["J"] = "far_down", + ["K"] = "far_up", + ["L"] = "far_right", + [""] = "left", + [""] = "down", + [""] = "up", + [""] = "right", + [""] = "far_left", + [""] = "far_down", + [""] = "far_up", + [""] = "far_right", + }, + }, + ---A function that should prompt the user to select a window. + --- + ---The window picker is used to select a window while swapping windows with + ---`:WinShift swap`. + ---@return integer? winid # Either the selected window ID, or `nil` to + --- indicate that the user cancelled / gave an invalid selection. + window_picker = function() + return require("winshift.lib").pick_window({ + -- A string of chars used as identifiers by the window picker. + picker_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + filter_rules = { + -- This table allows you to indicate to the window picker that a window + -- should be ignored if its buffer matches any of the following criteria. + cur_win = true, -- Filter out the current window + floats = true, -- Filter out floating windows + filetype = {}, -- List of ignored file types + buftype = {}, -- List of ignored buftypes + bufname = {}, -- List of vim regex patterns matching ignored buffer names + }, + ---A function used to filter the list of selectable windows. + ---@param winids integer[] # The list of selectable window IDs. + ---@return integer[] filtered # The filtered list of window IDs. + filter_func = nil, + }) + end, +}) +``` + +Optionally create some mappings for starting Win-Move mode: + +```vim +" Start Win-Move mode: +nnoremap WinShift +nnoremap m WinShift + +" Swap two windows: +nnoremap X WinShift swap + +" If you don't want to use Win-Move mode you can create mappings for calling the +" move commands directly: +nnoremap WinShift left +nnoremap WinShift down +nnoremap WinShift up +nnoremap WinShift right +``` + +## Usage + +### `:WinShift [direction]` + +When called without `[direction]`: starts Win-Move mode targeting the current +window for moving. You can then move the window either by using `hjkl` or the +arrow keys. You can move the window to any of the far ends of the viewport by +pressing one of `HJKL`, or shift + any arrow key. Exit Win-Move mode +by pressing `q` / `` / ``. + +With `[direction]`: perform a one-shot move operation on the current window, +moving it in the given direction. `[direction]` can be one of: + +- `left`, `right`, `up`, `down`, `far_left`, `far_right`, `far_up`, `far_down` + +The `far_` variants will move the window to the far +end of the viewport in the given direction. + +### `:WinShift swap` + +Swap the current window with another. When this command is called, you'll be +prompted to select the window you want to swap with. A selection is made by +pressing the character displayed in the statusline of the target window. The +input is case-insensitive. + +## Caveats + +Moving through windows with `'winfixwidth'` and / or `'winfixheight'` can be a +bit wonky. It will work, but it can be a bit hard to follow the movement, and +the fixed window might end up with different dimensions after. This is simply a +consequence of vim being forced to resize the window due to there not being +enough space to adhere to the fixed window's preferred dimensions. diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/doc/tags b/config/neovim/store/lazy-plugins/winshift.nvim/doc/tags new file mode 100644 index 00000000..caa8c847 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/doc/tags @@ -0,0 +1,11 @@ +:WinShift winshift.txt /*:WinShift* +Win-Move-mode winshift.txt /*Win-Move-mode* +winshift winshift.txt /*winshift* +winshift-caveats winshift.txt /*winshift-caveats* +winshift-commands winshift.txt /*winshift-commands* +winshift-config winshift.txt /*winshift-config* +winshift-usage winshift.txt /*winshift-usage* +winshift.changelog winshift_changelog.txt /*winshift.changelog* +winshift.changelog-11 winshift_changelog.txt /*winshift.changelog-11* +winshift.nvim winshift.txt /*winshift.nvim* +winshift.txt winshift.txt /*winshift.txt* diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift.txt b/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift.txt new file mode 100644 index 00000000..49279841 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift.txt @@ -0,0 +1,118 @@ +*winshift.txt* WinShift.nvim + +Rearrange your windows with ease. + +Author: Sindre T. Strøm + +============================================================================== + +INTRODUCTION *winshift.nvim* *winshift* + +WinShift lets you move windows, not only around each other, but also in and +out of rows and columns. + +USAGE *Win-Move-mode* *winshift-usage* + +Enter Win-Move mode by calling `:WinShift`. This will target your current +window for moving. You can move the window either by using |hjkl| or the arrow +keys. You can move the window to any of the far ends of the viewport by +pressing one of `HJKL`, or shift + any arrow key. Exit Win-Move mode by +pressing `q` / `` / ``. + +CONFIGURATION *winshift-config* + +Example configuration with default settings: +> + -- Lua + require("winshift").setup({ + highlight_moving_win = true, -- Highlight the window being moved + focused_hl_group = "Visual", -- The highlight group used for the moving window + moving_win_options = { + -- These are local options applied to the moving window while it's + -- being moved. They are unset when you leave move mode. + wrap = false, + cursorline = false, + cursorcolumn = false, + colorcolumn = "", + }, + keymaps = { + disable_defaults = false, -- Disable the default keymaps + win_move_mode = { + ["h"] = "left", + ["j"] = "down", + ["k"] = "up", + ["l"] = "right", + ["H"] = "far_left", + ["J"] = "far_down", + ["K"] = "far_up", + ["L"] = "far_right", + [""] = "left", + [""] = "down", + [""] = "up", + [""] = "right", + [""] = "far_left", + [""] = "far_down", + [""] = "far_up", + [""] = "far_right", + }, + }, + ---A function that should prompt the user to select a window. + --- + ---The window picker is used to select a window while swapping windows with + ---`:WinShift swap`. + ---@return integer? winid # Either the selected window ID, or `nil` to + --- indicate that the user cancelled / gave an invalid selection. + window_picker = function() + return require("winshift.lib").pick_window({ + -- A string of chars used as identifiers by the window picker. + picker_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + filter_rules = { + -- This table allows you to indicate to the window picker that a window + -- should be ignored if its buffer matches any of the following criteria. + cur_win = true, -- Filter out the current window + floats = true, -- Filter out floating windows + filetype = {}, -- List of ignored file types + buftype = {}, -- List of ignored buftypes + bufname = {}, -- List of vim regex patterns matching ignored buffer names + }, + ---A function used to filter the list of selectable windows. + ---@param winids integer[] # The list of selectable window IDs. + ---@return integer[] filtered # The filtered list of window IDs. + filter_func = nil, + }) + end, + }) +< + +COMMANDS *winshift-commands* + + *:WinShift* +:WinShift [direction] + When called without [direction]: starts Win-Move mode + targeting the current window for moving. For how to + use Win-Move mode, see |Win-Move-mode|. With + [direction] perform a one-shot move operation on the + current window, moving it in the given direction. + [direction] can be one of: + `left`, `right`, `up`, `down`, `far_left`, + `far_right`, `far_up`, `far_down` + + The `far_` variants will move the window to the far + end of the viewport in the given direction. + +:WinShift swap + Swap the current window with another. When this + command is called, you'll be prompted to select the + window you want to swap with. A selection is made by + pressing the character displayed in the statusline of + the target window. The input is case-insensitive. + +CAVEATS *winshift-caveats* + +Moving through windows with 'winfixwidth' and / or 'winfixheight' can be a bit +wonky. It will work, but it can be a bit hard to follow the movement, and the +fixed window might end up with different dimensions after. This is simply a +consequence of vim being forced to resize the window due to there not being +enough space to adhere to the fixed window's preferred dimensions. + + vim:tw=78:ts=8:ft=help:norl: diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift_changelog.txt b/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift_changelog.txt new file mode 100644 index 00000000..056c645b --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/doc/winshift_changelog.txt @@ -0,0 +1,63 @@ +================================================================================ + *winshift.changelog* + +CHANGELOG + + *winshift.changelog-11* + +PR: https://github.com/sindrets/winshift.nvim/pull/11 + +The configuration for the window picker has changed as a result of the +function now being fully configurable. If you have previously configured +options for the window picker, move them into the options passed to the +`pick_window` function: + + Before: ~ +> + require("winshift").setup({ + -- ... + window_picker_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + window_picker_ignore = { + filetype = { + "NvimTree", + }, + buftype = { + "terminal", + "quickfix", + }, + bufname = { + [[.*foo/bar/baz\.qux]] + }, + }, + }) +< + After: ~ +> + require("winshift").setup({ + -- ... + window_picker = function() + return require("winshift.lib").pick_window({ + picker_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + filter_rules = { + cur_win = true, + floats = true, + filetype = { + "NvimTree", + }, + buftype = { + "terminal", + "quickfix", + }, + bufname = { + [[.*foo/bar/baz\.qux]] + }, + }, + }) + end, + }) +< + +See |winshift-config| more information about how to configure the window +picker. + + vim:tw=78:ts=8:ft=help:norl: diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift.lua b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift.lua new file mode 100644 index 00000000..cce1d5fc --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift.lua @@ -0,0 +1,68 @@ +local utils = require("winshift.utils") +local config = require("winshift.config") +local lib = require("winshift.lib") +local api = vim.api +local M = {} + +-- Lazily ensure that setup has been run before accessing any module exports. +local init_done = false +local init_safeguard = setmetatable({}, { + __index = function(_, k) + if not init_done then + init_done = true + if k == "setup" then + return M[k] + else + config.setup({}) + return M[k] + end + else + return M[k] + end + end +}) + +local completion_dir = { + "left", + "right", + "up", + "down", + "far_left", + "far_right", + "far_up", + "far_down", + "swap", +} + +function M.setup(user_config) + config.setup(user_config or {}) +end + +function M.cmd_winshift(dir) + if dir then + if not vim.tbl_contains(completion_dir, dir) then + utils.err("Action must be one of: " .. table.concat(completion_dir, ", ")) + return + end + if dir == "swap" then + lib.start_swap_mode() + return + end + lib.move_win(api.nvim_get_current_win(), dir) + else + lib.start_move_mode() + end +end + +local function filter_completion(arg_lead, items) + return vim.tbl_filter(function(item) + return item:match(utils.pattern_esc(arg_lead)) + end, items) +end + +---@diagnostic disable-next-line: unused-local +function M.completion(arg_lead, cmd_line, cur_pos) + return filter_completion(arg_lead, completion_dir) +end + +return init_safeguard diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/colors.lua b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/colors.lua new file mode 100644 index 00000000..775b5a9c --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/colors.lua @@ -0,0 +1,200 @@ +local config = require("winshift.config") +local api = vim.api +local M = {} + +--#region TYPES + +---@class HiSpec +---@field fg string +---@field bg string +---@field ctermfg integer +---@field ctermbg integer +---@field gui string +---@field sp string +---@field blend integer +---@field default boolean + +---@class HiLinkSpec +---@field force boolean +---@field default boolean + +--#endregion + +---@param name string Syntax group name. +---@param attr string Attribute name. +---@param trans boolean Translate the syntax group (follows links). +function M.get_hl_attr(name, attr, trans) + local id = api.nvim_get_hl_id_by_name(name) + if id and trans then + id = vim.fn.synIDtrans(id) + end + if not id then + return + end + + local value = vim.fn.synIDattr(id, attr) + if not value or value == "" then + return + end + + return value +end + +---@param groups string|string[] Syntax group name, or an ordered list of +---groups where the first found value will be returned. +---@param trans boolean Translate the syntax group (follows links). True by default. +function M.get_fg(groups, trans) + if type(trans) ~= "boolean" then trans = true end + + if type(groups) == "table" then + local v + for _, group in ipairs(groups) do + v = M.get_hl_attr(group, "fg", trans) + if v then return v end + end + return + end + + return M.get_hl_attr(groups, "fg", trans) +end + +---@param groups string|string[] Syntax group name, or an ordered list of +---groups where the first found value will be returned. +---@param trans boolean Translate the syntax group (follows links). True by default. +function M.get_bg(groups, trans) + if type(trans) ~= "boolean" then trans = true end + + if type(groups) == "table" then + local v + for _, group in ipairs(groups) do + v = M.get_hl_attr(group, "bg", trans) + if v then return v end + end + return + end + + return M.get_hl_attr(groups, "bg", trans) +end + +---@param groups string|string[] Syntax group name, or an ordered list of +---groups where the first found value will be returned. +---@param trans boolean Translate the syntax group (follows links). True by default. +function M.get_gui(groups, trans) + if type(trans) ~= "boolean" then trans = true end + if type(groups) ~= "table" then groups = { groups } end + + local hls + for _, group in ipairs(groups) do + hls = {} + local attributes = { + "bold", + "italic", + "reverse", + "standout", + "underline", + "undercurl", + "strikethrough" + } + + for _, attr in ipairs(attributes) do + if M.get_hl_attr(group, attr, trans) == "1" then + table.insert(hls, attr) + end + end + + if #hls > 0 then + return table.concat(hls, ",") + end + end +end + +---@param group string Syntax group name. +---@param opt HiSpec +function M.hi(group, opt) + local use_tc = vim.o.termguicolors + local g = use_tc and "gui" or "cterm" + + if not use_tc then + if opt.ctermfg then + opt.fg = opt.ctermfg + end + if opt.ctermbg then + opt.bg = opt.ctermbg + end + end + + vim.cmd(string.format( + "hi %s %s %s %s %s %s %s", + opt.default and "def" or "", + group, + opt.fg and (g .. "fg=" .. opt.fg) or "", + opt.bg and (g .. "bg=" .. opt.bg) or "", + opt.gui and ((use_tc and "gui=" or "cterm=") .. opt.gui) or "", + opt.sp and ("guisp=" .. opt.sp) or "", + opt.blend and ("blend=" .. opt.blend) or "" + )) +end + +---@param from string Syntax group name. +---@param to? string Syntax group name. (default: `"NONE"`) +---@param opt? HiLinkSpec +function M.hi_link(from, to, opt) + opt = opt or {} + vim.cmd(string.format( + "hi%s %s link %s %s", + opt.force and "!" or "", + opt.default and "default" or "", + from, + to or "NONE" + )) +end + +function M.get_colors() + return { + white = M.get_fg("Normal") or "White", + red = M.get_fg("Keyword") or "Red", + green = M.get_fg("Character") or "Green", + yellow = M.get_fg("PreProc") or "Yellow", + blue = M.get_fg("Include") or "Blue", + purple = M.get_fg("Define") or "Purple", + cyan = M.get_fg("Conditional") or "Cyan", + dark_red = M.get_fg("Keyword") or "DarkRed", + orange = M.get_fg("Number") or "Orange", + } +end + +function M.get_hl_groups() + local hl_focused = config.get_config().focused_hl_group + local reverse = M.get_hl_attr(hl_focused, "reverse") == "1" + local bg_focused = reverse + and (M.get_fg({ hl_focused, "Normal" }) or "white") + or (M.get_bg({ hl_focused, "Normal" }) or "white") + local fg_focused = reverse and (M.get_bg({ hl_focused, "Normal" }) or "black") or nil + + return { + Normal = { fg = fg_focused, bg = bg_focused }, + EndOfBuffer = { fg = bg_focused, bg = bg_focused }, + LineNr = { fg = M.get_fg("LineNr"), bg = bg_focused, gui = M.get_gui("LineNr") }, + CursorLineNr = { fg = M.get_fg("CursorLineNr"), bg = bg_focused, gui = M.get_gui("CursorLineNr") }, + SignColumn = { fg = M.get_fg("SignColumn"), bg = bg_focused }, + FoldColumn = { fg = M.get_fg("FoldColumn"), bg = bg_focused }, + WindowPicker = { fg = "#ededed", bg = "#4493c8", ctermfg = 255, ctermbg = 33, gui = "bold" }, + } +end + +M.hl_links = { + LineNrAbove = "WinShiftLineNr", + LineNrBelow = "WinShiftLineNr", +} + +function M.setup() + for name, opt in pairs(M.get_hl_groups()) do + M.hi("WinShift" .. name, opt) + end + + for from, to in pairs(M.hl_links) do + M.hi_link("WinShift" .. from, to, { default = true }) + end +end + +return M diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/config.lua b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/config.lua new file mode 100644 index 00000000..270d2f48 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/config.lua @@ -0,0 +1,111 @@ +local utils = require("winshift.utils") +local M = {} + +-- stylua: ignore start +M.defaults = { + highlight_moving_win = true, + focused_hl_group = "Visual", + moving_win_options = { + wrap = false, + cursorline = false, + cursorcolumn = false, + colorcolumn = "", + }, + keymaps = { + disable_defaults = false, + win_move_mode = { + ["h"] = "left", + ["j"] = "down", + ["k"] = "up", + ["l"] = "right", + ["H"] = "far_left", + ["J"] = "far_down", + ["K"] = "far_up", + ["L"] = "far_right", + [""] = "left", + [""] = "down", + [""] = "up", + [""] = "right", + [""] = "far_left", + [""] = "far_down", + [""] = "far_up", + [""] = "far_right", + }, + }, + ---A function that should prompt the user to select a window. + --- + ---The window picker is used to select a window while swapping windows with + ---`:WinShift swap`. + ---@return integer? winid # Either the selected window ID, or `nil` to + --- indicate that the user cancelled / gave an invalid selection. + window_picker = function() + return require("winshift.lib").pick_window({ + picker_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + filter_rules = { + cur_win = true, + floats = true, + filetype = {}, + buftype = {}, + bufname = {}, + }, + ---A function used to filter the list of selectable windows. + ---@param winids integer[] # The list of selectable window IDs. + ---@return integer[] filtered # The filtered list of window IDs. + filter_func = nil, + }) + end, +} +-- stylua: ignore end + +M._config = M.defaults + +function M.get_key_dir_map() + local t = {} + + for lhs, rhs in pairs(M._config.keymaps.win_move_mode) do + if lhs:match("%b<>") then + -- Get raw key code for special keys + lhs = utils.raw_key(lhs) + end + + t[lhs] = rhs + end + + return t +end + +function M.get_config() + return M._config +end + +function M.setup(user_config) + user_config = user_config or {} + + M._config = utils.tbl_deep_clone(M.defaults) + M._config = vim.tbl_deep_extend("force", M._config, user_config) + + M._config.moving_win_options = user_config.moving_win_options or M._config.moving_win_options + + --#region DEPRECATION NOTICES + + if M._config.window_picker_chars or M._config.window_picker_ignore then + utils.warn(table.concat({ + "'window_picker_chars' and 'window_picker_ignore' has been deprecated!", + " See ':h winshift.changelog-11' for more information.", + }, "")) + end + + --#endregion + + if M._config.keymaps.disable_defaults then + for name, _ in pairs(M._config.keymaps) do + if name ~= "disable_defaults" then + M._config.keymaps[name] = vim.tbl_get(user_config, "keymaps", name) or {} + end + end + end + + require("winshift.colors").setup() +end + +return M diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/lib.lua b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/lib.lua new file mode 100644 index 00000000..de889ed0 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/lib.lua @@ -0,0 +1,659 @@ +local utils = require("winshift.utils") +local config = require("winshift.config") +local api = vim.api +local M = {} +local win_option_store = {} + +---@class Node : { [integer]: Node } +---@field type '"leaf"'|'"row"'|'"col"' +---@field parent Node +---@field index integer +---@field winid integer|nil + +---@class VirtualNode : Node +---@field target Node + +---@alias HDirection '"left"'|'"right"' +---@alias VDirection '"up"'|'"down"' +---@alias Direction HDirection|VDirection|'"far_left"'|'"far_right"'|'"far_up"'|'"far_down"' + +M.dir_move_map = { + far_left = "H", + far_down = "J", + far_up = "K", + far_right = "L", +} + +function M.process_layout(layout) + local function recurse(parent) + ---@type Node + local node = { type = parent[1] } + + if node.type == "leaf" then + node.winid = parent[2] + else + for i, child in ipairs(parent[2]) do + node[#node + 1] = recurse(child) + node[#node].index = i + node[#node].parent = node + end + end + + return node + end + + return recurse(layout) +end + +function M.get_layout_tree() + return M.process_layout(vim.fn.winlayout()) +end + +---@param node Node +---@return Node +function M.get_first_leaf(node) + local cur = node + while cur.type ~= "leaf" do + cur = cur[1] + end + return cur +end + +---@param node Node +---@return Node +function M.get_last_leaf(node) + local cur = node + while cur.type ~= "leaf" do + cur = cur[#cur] + end + return cur +end + +---@param tree Node +---@param winid integer +function M.find_leaf(tree, winid) + ---@param node Node + ---@return Node + local function recurse(node) + if node.type == "leaf" and node.winid == winid then + return node + else + for _, child in ipairs(node) do + local target = recurse(child) + if target then + return target + end + end + end + end + + return recurse(tree) +end + +---@param a Node +---@param b Node +function M.swap_leaves(a, b) + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo belowright %s", + api.nvim_win_get_number(a.winid), + a.parent.type == "col" and "vsp" or "sp" + ) + ) + local temp_a = api.nvim_get_current_win() + local opt_a = { vertical = a.parent.type == "col", rightbelow = false } + + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo belowright %s", + api.nvim_win_get_number(b.winid), + b.parent.type == "col" and "vsp" or "sp" + ) + ) + local temp_b = api.nvim_get_current_win() + local opt_b = { vertical = b.parent.type == "col", rightbelow = false } + + vim.fn.win_splitmove(a.winid, temp_b, opt_b) + vim.fn.win_splitmove(b.winid, temp_a, opt_a) + api.nvim_win_close(temp_a, true) + api.nvim_win_close(temp_b, true) +end + +---Move a row into a target window, replacing the target. +---@param row Node +---@param target integer Window id +---@param ignore? table +function M.move_row(row, target, ignore) + ignore = ignore or {} + local opt = { vertical = true, rightbelow = false } + + ---@type Node + for _, node in ipairs(row) do + if node.type == "col" then + local nr = api.nvim_win_get_number(target) + vim.cmd("noautocmd keepjumps " .. nr .. "windo aboveleft vsp") + M.move_col(node, api.nvim_get_current_win(), ignore) + elseif not ignore[node.winid] then + vim.fn.win_splitmove(node.winid, target, opt) + end + end + + api.nvim_win_close(target, true) +end + +---Move a column into a target window, replacing the target. +---@param col Node +---@param target integer Window id +---@param ignore? table +function M.move_col(col, target, ignore) + ignore = ignore or {} + local opt = { vertical = false, rightbelow = false } + + ---@type Node + for _, node in ipairs(col) do + if node.type == "row" then + local nr = api.nvim_win_get_number(target) + vim.cmd("noautocmd keepjumps " .. nr .. "windo aboveleft sp") + M.move_row(node, api.nvim_get_current_win(), ignore) + elseif not ignore[node.winid] then + vim.fn.win_splitmove(node.winid, target, opt) + end + end + + api.nvim_win_close(target, true) +end + +---Move a leaf out of a row in a given direction. +---@param leaf Node +---@param row Node +---@param dir VDirection +function M.row_move_out(leaf, row, dir) + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo %s sp", + api.nvim_win_get_number(leaf.winid), + dir == "up" and "belowright" or "aboveleft" + ) + ) + local tempwin = api.nvim_get_current_win() + M.move_row(row, tempwin, { [leaf.winid] = true }) +end + +---Move a leaf out of a column in a given direction. +---@param leaf Node +---@param col Node +---@param dir HDirection +function M.col_move_out(leaf, col, dir) + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo %s vsp", + api.nvim_win_get_number(leaf.winid), + dir == "left" and "belowright" or "aboveleft" + ) + ) + local tempwin = api.nvim_get_current_win() + M.move_col(col, tempwin, { [leaf.winid] = true }) +end + +---Move a leaf into a row. +---@param leaf Node +---@param row Node +---@param dir HDirection Determines what side of the row the leaf is moved to. +function M.row_move_in(leaf, row, dir) + local target_leaf = dir == "right" and M.get_last_leaf(row) or M.get_first_leaf(row) + local opt = { vertical = true, rightbelow = dir == "right" } + vim.fn.win_splitmove(leaf.winid, target_leaf.winid, opt) + + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo %s vsp", + api.nvim_win_get_number(leaf.winid), + dir == "right" and "aboveleft" or "belowright" + ) + ) + local tempwin = api.nvim_get_current_win() + M.move_row(row, tempwin) +end + +---Move a leaf into a column. +---@param leaf Node +---@param col Node +---@param dir VDirection Determines what side of the col the leaf is moved to. +function M.col_move_in(leaf, col, dir) + local target_leaf = dir == "down" and M.get_last_leaf(col) or M.get_first_leaf(col) + local opt = { vertical = false, rightbelow = dir == "down" } + vim.fn.win_splitmove(leaf.winid, target_leaf.winid, opt) + + vim.cmd( + string.format( + "noautocmd keepjumps %dwindo %s sp", + api.nvim_win_get_number(leaf.winid), + dir == "down" and "aboveleft" or "belowright" + ) + ) + local tempwin = api.nvim_get_current_win() + M.move_col(col, tempwin) +end + +---Get the next node in a given direction in the given leaf's closest row +---parent. Returns `nil` if there's no node in the given direction. +---@param leaf Node +---@param dir HDirection +---@return Node|nil +function M.next_node_horizontal(leaf, dir) + local outside_parent = (dir == "left" and leaf.index == 1) + or (dir == "right" and leaf.index == #leaf.parent) + + if leaf.parent.type == "col" or outside_parent then + local outer_parent = leaf.parent.parent + if not outer_parent or outer_parent.type == "col" then + return + end + + return outer_parent[leaf.parent.index + ((dir == "left" and -1) or 1)] + else + return leaf.parent[leaf.index + ((dir == "left" and -1) or 1)] + end +end + +---Get the next node in a given direction in the given leaf's closest column +---parent. Returns `nil` if there's no node in the given direction. +---@param leaf Node +---@param dir VDirection +---@return Node|nil +function M.next_node_vertical(leaf, dir) + local outside_parent = (dir == "up" and leaf.index == 1) + or (dir == "down" and leaf.index == #leaf.parent) + + if leaf.parent.type == "row" or outside_parent then + local outer_parent = leaf.parent.parent + if not outer_parent or outer_parent.type == "row" then + return + end + + return outer_parent[leaf.parent.index + ((dir == "up" and -1) or 1)] + else + return leaf.parent[leaf.index + ((dir == "up" and -1) or 1)] + end +end + +---@class WindowPickerFilterRules +---@field cur_win boolean +---@field floats boolean +---@field filetype string[] +---@field buftype string[] +---@field bufname string[] + +---@class WindowPickerSpec +---@field picker_chars string +---@field filter_rules WindowPickerFilterRules +---@field filter_func fun(winids: integer[]): integer[] + +---Get user to pick a window. Selectable windows are all windows in the current +---tabpage. +---@param opt? WindowPickerSpec +---@return integer|nil -- If a valid window was picked, return its id. If an +--- invalid window was picked / user canceled, return nil. If there are +--- no selectable windows, return -1. +function M.pick_window(opt) + opt = opt or {} + local tabpage = api.nvim_get_current_tabpage() + local win_ids = api.nvim_tabpage_list_wins(tabpage) + local curwin = api.nvim_get_current_win() + local filter_rules = opt.filter_rules or {} + + local selectable = vim.tbl_filter(function (id) + if filter_rules.cur_win and curwin == id then + return false + elseif filter_rules.floats and api.nvim_win_get_config(id).relative ~= "" then + return false + end + + local bufid = api.nvim_win_get_buf(id) + local bufname = api.nvim_buf_get_name(bufid) + + for _, option in ipairs({ "filetype", "buftype" }) do + if vim.tbl_contains(filter_rules[option] or {}, vim.bo[bufid][option]) then + return false + end + end + + for _, pattern in ipairs(filter_rules.bufname or {}) do + local regex = vim.regex(pattern) + if regex:match_str(bufname) ~= nil then + return false + end + end + + return true + end, win_ids) + + if opt.filter_func then + selectable = opt.filter_func(selectable) + end + + -- If there are no selectable windows: return. If there's only 1, return it without picking. + if #selectable == 0 then return -1 end + if #selectable == 1 then return selectable[1] end + + local chars = (opt.picker_chars or "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"):upper() + local i = 1 + local win_opts = {} + local win_map = {} + local laststatus = vim.o.laststatus + vim.o.laststatus = 2 + + -- Setup UI + for _, id in ipairs(selectable) do + local char = chars:sub(i, i) + + win_map[char] = id + win_opts[id] = { + statusline = vim.wo[id].statusline, + winhl = vim.wo[id].winhl, + } + + utils.set_local(id, { + statusline = "%=" .. char .. "%=", + winhl = { + "StatusLine:WinShiftWindowPicker,StatusLineNC:WinShiftWindowPicker", + opt = { method = "append" }, + }, + }) + + i = i + 1 + if i > #chars then break end + end + + vim.cmd("redraw") + local ok, resp = pcall(utils.input_char, "Pick window: ", { prompt_hl = "ModeMsg" }) + if not ok then + utils.clear_prompt() + end + resp = (resp or ""):upper() + + -- Restore window options + for _, id in ipairs(selectable) do + utils.set_local(id, win_opts[id]) + end + + vim.o.laststatus = laststatus + + return win_map[resp] +end + +---@param leaf Node +---@param flatten? boolean +---@return VirtualNode|nil +function M.create_virtual_set(leaf, flatten) + if not leaf.parent then + return + end + + local parent = leaf.parent + + -- Handle case where moving the leaf will result in a different virtual set. + if flatten + and #parent == 2 + and parent[leaf.index % 2 + 1].type == "leaf" + and parent.parent then + leaf = utils.tbl_clone(leaf) + parent = utils.tbl_clone(parent.parent) + parent[leaf.parent.index] = leaf + table.insert(parent, leaf.parent.index, utils.tbl_clone(leaf.parent[leaf.index % 2 + 1])) + + for i, l in ipairs(parent) do + l.index = i + l.parent = parent + end + end + + local first, last = leaf.index, leaf.index + + for i = leaf.index - 1, 1, -1 do + if parent[i].type ~= "leaf" then + break + end + first = i + end + + for i = leaf.index + 1, #parent do + if parent[i].type ~= "leaf" then + break + end + last = i + end + + if (first == leaf.index and last == leaf.index) -- Virtual set is empty + or (first == 1 and last == #parent) -- Virtual set is the same as the normal set + or last - first + 1 == 2 then -- Virtual sets of 2 leaves are pointless + return + end + + local target = utils.tbl_clone(leaf) + local set = { target = target } + for k, v in pairs(parent) do + if type(k) ~= "number" then + set[k] = v + end + end + for i = first, last do + set[#set + 1] = parent[i] + end + set.parent = parent.parent + target.parent = set + return set +end + +---@param winid integer +---@param dir Direction +function M.move_win(winid, dir) + if M.dir_move_map[dir] then + vim.cmd(string.format("%dwincmd %s", api.nvim_win_get_number(winid), M.dir_move_map[dir])) + return + end + + local tree = M.get_layout_tree() + local target_leaf = M.find_leaf(tree, winid) + local outer_parent = (target_leaf.parent and target_leaf.parent.parent) or {} + + -- If the target leaf has no parent, there is only one window in the layout. + if target_leaf and target_leaf.parent then + local ok, err = utils.no_win_event_call(function() + if dir == "left" or dir == "right" then + -- Horizontal + if target_leaf.parent.type == "col" then + local set = M.create_virtual_set(target_leaf) + target_leaf = (set and set.target) or target_leaf + M.col_move_out(target_leaf, target_leaf.parent, dir) + else + local next_node = M.next_node_horizontal(target_leaf, dir) + local set = M.create_virtual_set(target_leaf, true) + + if next_node then + if + target_leaf.parent.type == "row" + and #target_leaf.parent == 2 + and target_leaf.parent[1].type == "leaf" + and target_leaf.parent[2].type == "leaf" + then + -- Swap the windows + M.swap_leaves(target_leaf.parent[1], target_leaf.parent[2]) + else + M.col_move_in(target_leaf, next_node, dir) + end + elseif set and set.type == "col" then + M.col_move_out(set.target, set, dir) + elseif outer_parent.type == "col" then + M.col_move_out(target_leaf, outer_parent, dir) + end + end + else + -- Vertical + if target_leaf.parent.type == "row" then + local set = M.create_virtual_set(target_leaf) + target_leaf = (set and set.target) or target_leaf + M.row_move_out(target_leaf, target_leaf.parent, dir) + else + local next_node = M.next_node_vertical(target_leaf, dir) + local set = M.create_virtual_set(target_leaf, true) + + if next_node then + if + target_leaf.parent.type == "col" + and #target_leaf.parent == 2 + and target_leaf.parent[1].type == "leaf" + and target_leaf.parent[2].type == "leaf" + then + -- Swap the windows + M.swap_leaves(target_leaf.parent[1], target_leaf.parent[2]) + else + M.row_move_in(target_leaf, next_node, dir) + end + elseif set and set.type == "row" then + M.row_move_out(set.target, set, dir) + elseif outer_parent.type == "row" then + M.row_move_out(target_leaf, outer_parent, dir) + end + end + end + end) + + api.nvim_set_current_win(winid) + if not ok then + utils.err(err) + utils.err(debug.traceback()) + end + end +end + +function M.start_move_mode() + local char, raw + local esc = utils.raw_key("") + local cur_win = api.nvim_get_current_win() + local lasthl = vim.wo[cur_win].winhl + local conf = config.get_config() + local key_dir_map = config.get_key_dir_map() + M.save_win_options(cur_win) + + if conf.highlight_moving_win then + M.highlight_win(cur_win) + end + utils.set_local(cur_win, conf.moving_win_options) + vim.cmd("redraw") + + local ok, err = pcall(function() + while not (char == "q" or raw == esc) do + api.nvim_echo({ { "-- WIN MOVE MODE -- press 'q' to exit", "ModeMsg" } }, false, {}) + char, raw = utils.input_char(nil, { clear_prompt = false, allow_non_ascii = true }) + local dir = key_dir_map[char or raw] + + if dir then M.move_win(cur_win, dir) end + + vim.cmd("redraw") + + api.nvim_exec_autocmds({ "WinScrolled" }, { modeline = false }) + vim.schedule(function() vim.cmd("redraw") end) + end + end) + + utils.clear_prompt() + + if conf.highlight_moving_win then + vim.wo[cur_win].winhl = lasthl + end + + M.restore_win_options(cur_win) + + if not ok then + utils._echo_multiline(err, "ErrorMsg") + end +end + +function M.start_swap_mode() + local cur_win = api.nvim_get_current_win() + local lasthl = vim.wo[cur_win].winhl + local conf = config.get_config() + M.save_win_options(cur_win) + + if conf.highlight_moving_win then + M.highlight_win(cur_win) + end + utils.set_local(cur_win, conf.moving_win_options) + vim.cmd("redraw") + + local ok, err = pcall(function() + local target = conf.window_picker() + + if target == -1 or target == nil then + return + end + + local tree = M.get_layout_tree() + local cur_leaf = M.find_leaf(tree, cur_win) + local target_leaf = M.find_leaf(tree, target) + M.swap_leaves(cur_leaf, target_leaf) + end) + + if conf.highlight_moving_win then + vim.wo[cur_win].winhl = lasthl + end + + M.restore_win_options(cur_win) + + if not ok then + utils._echo_multiline(err, "ErrorMsg") + end +end + +function M.save_win_options(winid) + win_option_store[winid] = {} + local last_winid = api.nvim_get_current_win() + utils.no_win_event_call(function() + api.nvim_set_current_win(winid) + for option, _ in pairs(config.get_config().moving_win_options) do + local value = vim.opt_local[option]._value + if value ~= "" then + win_option_store[winid][option] = value + end + end + end) + api.nvim_set_current_win(last_winid) +end + +function M.restore_win_options(winid) + for option, _ in pairs(config.get_config().moving_win_options) do + if win_option_store[winid][option] then + utils.set_local(winid, { [option] = win_option_store[winid][option] }) + else + utils.unset_local(winid, option) + end + end +end + +function M.highlight_win(winid) + local curhl = vim.wo[winid].winhl + local hl = { + "Normal:WinShiftNormal", + "EndOfBuffer:WinShiftEndOfBuffer", + "LineNr:WinShiftLineNr", + "CursorLineNr:WinShiftCursorLineNr", + "SignColumn:WinShiftSignColumn", + "FoldColumn:WinShiftFoldColumn", + curhl ~= "" and curhl or nil, + } + + if vim.fn.has("nvim-0.6") == 1 then + hl = utils.vec_join( + hl, + { + "LineNrAbove:WinShiftLineNrAbove", + "LineNrBelow:WinShiftLineNrBelow", + } + ) + end + + vim.wo[winid].winhl = table.concat(hl, ",") +end + +return M diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/utils.lua b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/utils.lua new file mode 100644 index 00000000..6a0c7f56 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/lua/winshift/utils.lua @@ -0,0 +1,360 @@ +local api = vim.api +local M = {} + +---@alias vector T[] + +function M._echo_multiline(msg, hl, schedule) + if schedule then + vim.schedule(function() + M._echo_multiline(msg, hl, false) + end) + return + end + + vim.cmd("echohl " .. (hl or "None")) + for _, line in ipairs(vim.split(msg, "\n")) do + vim.cmd(string.format('echom "%s"', vim.fn.escape(line, [["\]]))) + end + vim.cmd("echohl None") +end + +---@param msg string +---@param schedule? boolean Schedule the echo call. +function M.info(msg, schedule) + M._echo_multiline("[WinShift.nvim] " .. msg, "Directory", schedule) +end + +---@param msg string +---@param schedule? boolean Schedule the echo call. +function M.warn(msg, schedule) + M._echo_multiline("[WinShift.nvim] " .. msg, "WarningMsg", schedule) +end + +---@param msg string +---@param schedule? boolean Schedule the echo call. +function M.err(msg, schedule) + M._echo_multiline("[WinShift.nvim] " .. msg, "ErrorMsg", schedule) +end + +---Call the function `f`, ignoring most of the window and buffer related +---events. The function is called in protected mode. +---@param f function +---@return boolean success +---@return any result Return value +function M.no_win_event_call(f) + local last = vim.o.eventignore + ---@diagnostic disable-next-line: undefined-field + vim.opt.eventignore:prepend( + "WinEnter,WinLeave,WinNew,WinClosed,BufWinEnter,BufWinLeave,BufEnter,BufLeave" + ) + local ok, err = pcall(f) + vim.opt.eventignore = last + return ok, err +end + +---Escape a string for use as a pattern. +---@param s string +---@return string +function M.pattern_esc(s) + local result = string.gsub(s, "[%(|%)|%%|%[|%]|%-|%.|%?|%+|%*|%^|%$]", { + ["%"] = "%%", + ["-"] = "%-", + ["("] = "%(", + [")"] = "%)", + ["."] = "%.", + ["["] = "%[", + ["]"] = "%]", + ["?"] = "%?", + ["+"] = "%+", + ["*"] = "%*", + ["^"] = "%^", + ["$"] = "%$", + }) + return result +end + +function M.tbl_clone(t) + if not t then + return + end + local clone = {} + + for k, v in pairs(t) do + clone[k] = v + end + + return clone +end + +function M.tbl_deep_clone(t) + if not t then + return + end + local clone = {} + + for k, v in pairs(t) do + if type(v) == "table" then + clone[k] = M.tbl_deep_clone(v) + else + clone[k] = v + end + end + + return clone +end + +function M.tbl_pack(...) + return { n = select("#", ...), ... } +end + +function M.tbl_unpack(t, i, j) + return unpack(t, i or 1, j or t.n or #t) +end + +function M.tbl_clear(t) + for k, _ in pairs(t) do + t[k] = nil + end +end + +---Create a shallow copy of a portion of a vector. +---@param t vector +---@param first? integer First index, inclusive +---@param last? integer Last index, inclusive +---@return vector +function M.vec_slice(t, first, last) + local slice = {} + for i = first or 1, last or #t do + table.insert(slice, t[i]) + end + + return slice +end + +---Join multiple vectors into one. +---@vararg vector +---@return vector +function M.vec_join(...) + local result = {} + local args = {...} + local n = 0 + + for i = 1, select("#", ...) do + if type(args[i]) ~= "nil" then + if type(args[i]) ~= "table" then + result[n + 1] = args[i] + n = n + 1 + else + for j, v in ipairs(args[i]) do + result[n + j] = v + end + n = n + #args[i] + end + end + end + + return result +end + +---Return the first index a given object can be found in a vector, or -1 if +---it's not present. +---@param t vector +---@param v any +---@return integer +function M.vec_indexof(t, v) + for i, vt in ipairs(t) do + if vt == v then + return i + end + end + return -1 +end + +---Append any number of objects to the end of a vector. Pushing `nil` +---effectively does nothing. +---@param t vector +---@return vector t +function M.vec_push(t, ...) + for _, v in ipairs({...}) do + t[#t + 1] = v + end + return t +end + +---Simple string templating +---Example template: "${name} is ${value}" +---@param str string Template string +---@param table table Key-value pairs to replace in the string +function M.str_template(str, table) + return (str:gsub("($%b{})", function(w) + return table[w:sub(3, -2)] or w + end)) +end + +function M.clear_prompt() + vim.api.nvim_echo({ { "" } }, false, {}) + vim.cmd("redraw") +end + +---@class InputCharSpec +---@field clear_prompt boolean (default: true) +---@field allow_non_ascii boolean (default: true) +---@field prompt_hl string (default: nil) + +---@param prompt string +---@param opt InputCharSpec +---@return string Char +---@return string Raw +function M.input_char(prompt, opt) + opt = vim.tbl_extend("keep", opt or {}, { + clear_prompt = true, + allow_non_ascii = false, + prompt_hl = nil, + }) + + if prompt then + vim.api.nvim_echo({ { prompt, opt.prompt_hl } }, false, {}) + end + + local c + if not opt.allow_non_ascii then + while type(c) ~= "number" do + c = vim.fn.getchar() + end + else + c = vim.fn.getchar() + end + + if opt.clear_prompt then + M.clear_prompt() + end + + local s = type(c) == "number" and vim.fn.nr2char(c) or nil + local raw = type(c) == "number" and s or c + + ---@diagnostic disable-next-line: return-type-mismatch + return s, raw +end + +function M.input(prompt, default, completion) + local v = vim.fn.input({ + prompt = prompt, + default = default, + completion = completion, + cancelreturn = "__INPUT_CANCELLED__", + }) + M.clear_prompt() + return v +end + +function M.raw_key(vim_key) + return api.nvim_eval(string.format([["\%s"]], vim_key)) +end + +function M.pause(msg) + vim.cmd("redraw") + M.input_char( + "-- PRESS ANY KEY TO CONTINUE -- " .. (msg or ""), + { allow_non_ascii = true, prompt_hl = "Directory" } + ) +end + +---Map of options that accept comma separated, list-like values, but don't work +---correctly with Option:set(), Option:append(), Option:prepend(), and +---Option:remove() (seemingly for legacy reasons). +---WARN: This map is incomplete! +local list_like_options = { + winhighlight = true, + listchars = true, + fillchars = true, +} + +---@class utils.set_local.Opt +---@field method '"set"'|'"remove"'|'"append"'|'"prepend"' Assignment method. (default: "set") + +---@class utils.set_local.ListSpec : string[] +---@field opt utils.set_local.Opt + +---@alias WindowOptions table + +---@param winids number[]|number Either a list of winids, or a single winid (0 for current window). +---@param option_map WindowOptions +---@param opt? utils.set_local.Opt +function M.set_local(winids, option_map, opt) + if type(winids) ~= "table" then + winids = { winids } + end + + opt = vim.tbl_extend("keep", opt or {}, { method = "set" }) --[[@as table ]] + + for _, id in ipairs(winids) do + api.nvim_win_call(id, function() + for option, value in pairs(option_map) do + local o = opt + local fullname = api.nvim_get_option_info(option).name + local is_list_like = list_like_options[fullname] + local cur_value = vim.o[fullname] + + if type(value) == "table" then + if value.opt then + o = vim.tbl_extend("force", opt, value.opt) --[[@as table ]] + end + + if is_list_like then + value = table.concat(value, ",") + end + end + + if o.method == "set" then + vim.opt_local[option] = value + + else + if o.method == "remove" then + if is_list_like then + vim.opt_local[fullname] = cur_value:gsub(",?" .. vim.pesc(value), "") + else + vim.opt_local[fullname]:remove(value) + end + + elseif o.method == "append" then + if is_list_like then + vim.opt_local[fullname] = ("%s%s"):format( + cur_value ~= "" and cur_value .. "," or "", + value + ) + else + vim.opt_local[fullname]:append(value) + end + + elseif o.method == "prepend" then + if is_list_like then + vim.opt_local[fullname] = ("%s%s%s"):format( + value, + cur_value ~= "" and "," or "", + cur_value + ) + else + vim.opt_local[fullname]:prepend(value) + end + end + end + end + end) + end +end + +---@param winids number[]|number Either a list of winids, or a single winid (0 for current window). +---@param option string +function M.unset_local(winids, option) + if type(winids) ~= "table" then + winids = { winids } + end + + for _, id in ipairs(winids) do + api.nvim_win_call(id, function() + vim.opt_local[option] = nil + end) + end +end + +return M diff --git a/config/neovim/store/lazy-plugins/winshift.nvim/plugin/winshift.vim b/config/neovim/store/lazy-plugins/winshift.nvim/plugin/winshift.vim new file mode 100644 index 00000000..2726d139 --- /dev/null +++ b/config/neovim/store/lazy-plugins/winshift.nvim/plugin/winshift.vim @@ -0,0 +1,17 @@ +if !has('nvim-0.5') || exists('g:winshift_nvim_loaded') | finish | endif + +command! -complete=customlist,s:completion -nargs=? WinShift lua require("winshift").cmd_winshift() + +function s:completion(argLead, cmdLine, curPos) + return luaeval("require('winshift').completion(" + \ . "vim.fn.eval('a:argLead')," + \ . "vim.fn.eval('a:cmdLine')," + \ . "vim.fn.eval('a:curPos'))") +endfunction + +augroup WinShift + au! + au ColorScheme * lua require("winshift.colors").setup() +augroup END + +let g:winshift_nvim_loaded = 1 diff --git a/config/neovim/store/lazy-plugins/project.nvim/.stylua.toml b/config/neovim/store/lazy-plugins/winshift.nvim/stylua.toml similarity index 83% rename from config/neovim/store/lazy-plugins/project.nvim/.stylua.toml rename to config/neovim/store/lazy-plugins/winshift.nvim/stylua.toml index 9393cf9a..609d7739 100644 --- a/config/neovim/store/lazy-plugins/project.nvim/.stylua.toml +++ b/config/neovim/store/lazy-plugins/winshift.nvim/stylua.toml @@ -1,4 +1,4 @@ -column_width = 120 +column_width = 100 line_endings = "Unix" indent_type = "Spaces" indent_width = 2