From c749a7fe59fc078a9558315de7ec2aa3958a3b89 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 18 Apr 2023 20:28:31 +0300 Subject: [PATCH] feat: drop venn-nvim --- extra.nix | 1 - flake.lock | 17 ------------- flake.nix | 5 ---- lib/types/plugins.nix | 1 - modules/utility/default.nix | 1 - modules/utility/venn/config.nix | 42 -------------------------------- modules/utility/venn/default.nix | 6 ----- modules/utility/venn/venn.nix | 11 --------- 8 files changed, 84 deletions(-) delete mode 100644 modules/utility/venn/config.nix delete mode 100644 modules/utility/venn/default.nix delete mode 100644 modules/utility/venn/venn.nix diff --git a/extra.nix b/extra.nix index 8384df0..c8e625b 100644 --- a/extra.nix +++ b/extra.nix @@ -151,7 +151,6 @@ inputs: let vim.utility = { colorizer.enable = true; icon-picker.enable = true; - venn-nvim.enable = false; # FIXME throws an error when its commands are ran manually diffview-nvim.enable = true; motion = { hop.enable = true; diff --git a/flake.lock b/flake.lock index 3013939..4e4fbde 100644 --- a/flake.lock +++ b/flake.lock @@ -1355,7 +1355,6 @@ "toggleterm-nvim": "toggleterm-nvim", "tokyonight": "tokyonight", "trouble": "trouble", - "venn-nvim": "venn-nvim", "vim-markdown": "vim-markdown", "vim-repeat": "vim-repeat", "vim-startify": "vim-startify", @@ -1652,22 +1651,6 @@ "type": "github" } }, - "venn-nvim": { - "flake": false, - "locked": { - "lastModified": 1669127905, - "narHash": "sha256-Ks5qUaI0MrhVC2AhVsReVwC/2WArXqIQ36CcCSCyzAk=", - "owner": "jbyuki", - "repo": "venn.nvim", - "rev": "c114563960b8fb1197695d42798d1f3e7190b798", - "type": "github" - }, - "original": { - "owner": "jbyuki", - "repo": "venn.nvim", - "type": "github" - } - }, "vim-markdown": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 18f712b..e488e89 100644 --- a/flake.nix +++ b/flake.nix @@ -383,11 +383,6 @@ flake = false; }; - venn-nvim = { - url = "github:jbyuki/venn.nvim"; - flake = false; - }; - icon-picker-nvim = { url = "github:ziontee113/icon-picker.nvim"; flake = false; diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix index 0c1d0d3..f99394f 100644 --- a/lib/types/plugins.nix +++ b/lib/types/plugins.nix @@ -51,7 +51,6 @@ with lib; let "cinnamon-nvim" "cheatsheet-nvim" "colorizer" - "venn-nvim" "cellular-automaton" "presence-nvim" "icon-picker-nvim" diff --git a/modules/utility/default.nix b/modules/utility/default.nix index 87fce55..1bd03c6 100644 --- a/modules/utility/default.nix +++ b/modules/utility/default.nix @@ -7,7 +7,6 @@ _: { ./colorizer ./icon-picker ./telescope - ./venn ./diffview ]; } diff --git a/modules/utility/venn/config.nix b/modules/utility/venn/config.nix deleted file mode 100644 index 1bd958d..0000000 --- a/modules/utility/venn/config.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - config, - lib, - ... -}: -with lib; -with builtins; let - cfg = config.vim.utility.venn-nvim; -in { - config = mkIf (cfg.enable) { - vim.startPlugins = [ - "venn-nvim" - ]; - - # TODO: https://github.com/jbyuki/venn.nvim#using-toggle-command - # add keybindings for drawing diagrams - vim.luaConfigRC.venn-nvim = nvim.dag.entryAnywhere '' - local venn = require('venn') - -- venn.nvim: enable or disable keymappings - function _G.Toggle_venn() - local venn_enabled = vim.inspect(vim.b.venn_enabled) - if venn_enabled == "nil" then - vim.b.venn_enabled = true - vim.cmd[[setlocal ve=all]] - -- draw a line on HJKL keystokes - vim.api.nvim_buf_set_keymap(0, "n", "J", "j:VBox", {noremap = true}) - vim.api.nvim_buf_set_keymap(0, "n", "K", "k:VBox", {noremap = true}) - vim.api.nvim_buf_set_keymap(0, "n", "L", "l:VBox", {noremap = true}) - vim.api.nvim_buf_set_keymap(0, "n", "H", "h:VBox", {noremap = true}) - -- draw a box by pressing "f" with visual selection - vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox", {noremap = true}) - else - vim.cmd[[setlocal ve=]] - vim.cmd[[mapclear ]] - vim.b.venn_enabled = nil - end - end - -- toggle keymappings for venn using v - vim.api.nvim_set_keymap('n', 'v', ":lua Toggle_venn()", { noremap = true}) - ''; - }; -} diff --git a/modules/utility/venn/default.nix b/modules/utility/venn/default.nix deleted file mode 100644 index de4dff0..0000000 --- a/modules/utility/venn/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -_: { - imports = [ - ./config.nix - ./venn.nix - ]; -} diff --git a/modules/utility/venn/venn.nix b/modules/utility/venn/venn.nix deleted file mode 100644 index 8885f64..0000000 --- a/modules/utility/venn/venn.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - config, - lib, - ... -}: -with lib; -with builtins; { - options.vim.utility.venn-nvim = { - enable = mkEnableOption "Enable venn.nvim: draw ASCII diagrams in Neovim"; - }; -}