diff --git a/configuration.nix b/configuration.nix index 6f26f040..2995fee8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -191,7 +191,6 @@ isMaximal: { surround.enable = isMaximal; leetcode-nvim.enable = isMaximal; multicursors.enable = isMaximal; - smart-splits.enable = isMaximal; motion = { hop.enable = true; diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index a1a967ff..979586ac 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -431,10 +431,5 @@ [lackac](https://github.com/lackac): [solarized.nvim]: https://github.com/maxmx03/solarized.nvim -[smart-splits.nvim]: https://github.com/mrjones2014/smart-splits.nvim - Add [solarized.nvim] theme with support for multiple variants - -- Add [smart-splits.nvim] for navigating between Neovim windows and terminal multiplexer panes. - Available at `vim.utility.smart-splits`. - diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index 8069b6c1..e3ae7c5e 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -19,7 +19,6 @@ ./outline ./preview ./sleuth - ./smart-splits ./snacks-nvim ./surround ./telescope diff --git a/modules/plugins/utility/smart-splits/config.nix b/modules/plugins/utility/smart-splits/config.nix deleted file mode 100644 index c175d7ac..00000000 --- a/modules/plugins/utility/smart-splits/config.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - pkgs, - config, - options, - lib, - ... -}: let - inherit (lib.modules) mkIf; - - cfg = config.vim.utility.smart-splits; - inherit (options.vim.utility.smart-splits) keymaps; - mkSmartSplitKey = act: let - key = cfg.keymaps.${act}; - in - lib.optional (key != null) { - inherit key; - desc = keymaps.${act}.description; - action = ''function() require('smart-splits').${act}() end''; - mode = "n"; - lua = true; - }; -in { - config = mkIf cfg.enable { - vim = { - lazy.plugins.smart-splits = { - package = "smart-splits"; - setupModule = "smart-splits"; - inherit (cfg) setupOpts; - - # plugin needs to be loaded right after startup so that the multiplexer detects vim running in the pane - event = ["DeferredUIEnter"]; - - keys = lib.flatten [ - (mkSmartSplitKey "resize_left") - (mkSmartSplitKey "resize_down") - (mkSmartSplitKey "resize_up") - (mkSmartSplitKey "resize_right") - (mkSmartSplitKey "move_cursor_left") - (mkSmartSplitKey "move_cursor_down") - (mkSmartSplitKey "move_cursor_up") - (mkSmartSplitKey "move_cursor_right") - (mkSmartSplitKey "move_cursor_previous") - (mkSmartSplitKey "swap_buf_left") - (mkSmartSplitKey "swap_buf_down") - (mkSmartSplitKey "swap_buf_up") - (mkSmartSplitKey "swap_buf_right") - ]; - }; - }; - }; -} diff --git a/modules/plugins/utility/smart-splits/default.nix b/modules/plugins/utility/smart-splits/default.nix deleted file mode 100644 index 2b38462e..00000000 --- a/modules/plugins/utility/smart-splits/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./smart-splits.nix - ]; -} diff --git a/modules/plugins/utility/smart-splits/smart-splits.nix b/modules/plugins/utility/smart-splits/smart-splits.nix deleted file mode 100644 index dd5c55a3..00000000 --- a/modules/plugins/utility/smart-splits/smart-splits.nix +++ /dev/null @@ -1,37 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkOption; - inherit (lib.types) bool; - inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.nvim.binds) mkMappingOption; -in { - options.vim.utility.smart-splits = { - enable = mkOption { - type = bool; - default = false; - description = '' - Whether to enable smart-splits.nvim, a Neovim plugin for smart, - seamless, directional navigation and resizing of splits. - - Supports tmux, Wezterm, Kitty, and Zellij multiplexer integrations. - ''; - }; - - setupOpts = mkPluginSetupOption "smart-splits" {}; - - keymaps = { - resize_left = mkMappingOption "Resize Window/Pane Left" ""; - resize_down = mkMappingOption "Resize Window/Pane Down" ""; - resize_up = mkMappingOption "Resize Window/Pane Up" ""; - resize_right = mkMappingOption "Resize Window/Pane Right" ""; - move_cursor_left = mkMappingOption "Focus Window/Pane on the Left" ""; - move_cursor_down = mkMappingOption "Focus Window/Pane Below" ""; - move_cursor_up = mkMappingOption "Focus Window/Pane Above" ""; - move_cursor_right = mkMappingOption "Focus Window/Pane on the Right" ""; - move_cursor_previous = mkMappingOption "Focus Previous Window/Pane" ""; - swap_buf_left = mkMappingOption "Swap Buffer Left" "h"; - swap_buf_down = mkMappingOption "Swap Buffer Down" "j"; - swap_buf_up = mkMappingOption "Swap Buffer Up" "k"; - swap_buf_right = mkMappingOption "Swap Buffer Right" "l"; - }; - }; -} diff --git a/npins/sources.json b/npins/sources.json index 455e1bd6..b5d796c4 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -2232,22 +2232,6 @@ "url": "https://github.com/mrcjkb/rustaceanvim/archive/a0c8e9698ef90bcfdf42806a38bf55b612b65b18.tar.gz", "hash": "1j63qpal1n8m9kj3fdjjw81ljbsqjzph65q2cacwm5ziwi2xvncx" }, - "smart-splits": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "mrjones2014", - "repo": "smart-splits.nvim" - }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "submodules": false, - "version": "v2.0.1", - "revision": "7c9bc1cfc0582c8c6851c38bb3338db644039cf7", - "url": "https://api.github.com/repos/mrjones2014/smart-splits.nvim/tarball/v2.0.1", - "hash": "0lhwkb07pdfi7dx9kbzynh0dxivhiryngkiy4565hyhxapfis5v7" - }, "smartcolumn-nvim": { "type": "Git", "repository": {