diff --git a/pkgs/default.nix b/pkgs/default.nix index 34c428e8..4b6217da 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,7 @@ let inherit (pkgs) callPackage; - vimPlugins = callPackage ./vim-plugins { inherit callPackage; }; + vimPlugins = callPackage ./vim-plugins { }; in { backup-websites = callPackage ./backup-websites.nix { }; diff --git a/pkgs/vim-plugins/conf-vim.nix b/pkgs/vim-plugins/conf-vim.nix deleted file mode 100644 index 9009df1e..00000000 --- a/pkgs/vim-plugins/conf-vim.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "conf-vim"; - version = "unstable-2017-10-09"; - - src = fetchFromGitHub { - owner = "tjdevries"; - repo = "conf.vim"; - rev = "a716df0fd5d7ba558c07dac2e07f05d5eba11afb"; - sha256 = "AjiTJsoim0BAnyfqk1IQzNsa6jhFM2+A66E7q9sJqz0="; - }; -} diff --git a/pkgs/vim-plugins/default.nix b/pkgs/vim-plugins/default.nix index bd587f10..f0fc4eb0 100644 --- a/pkgs/vim-plugins/default.nix +++ b/pkgs/vim-plugins/default.nix @@ -1,10 +1,23 @@ -{ callPackage }: +{ pkgs, lib }: -{ - conf-vim = callPackage ./conf-vim.nix { }; - edit-alternate-vim = callPackage ./edit-alternate-vim.nix { }; - standard-vim = callPackage ./standard-vim.nix { }; - vim-caser = callPackage ./vim-caser.nix { }; - vim-textobj-indent = callPackage ./vim-textobj-indent.nix { }; - vim-textobj-xmlattr = callPackage ./vim-textobj-xmlattr.nix { }; -} +let + pluginsData = builtins.fromJSON (builtins.readFile ./vim-plugins.json); + + mkPlugin = + name: attrs: + with attrs; + with pkgs; + vimUtils.buildVimPlugin { + inherit name version; + + src = fetchFromGitHub { + inherit + hash + owner + repo + rev + ; + }; + }; +in +lib.mapAttrs mkPlugin pluginsData diff --git a/pkgs/vim-plugins/edit-alternate-vim.nix b/pkgs/vim-plugins/edit-alternate-vim.nix deleted file mode 100644 index 39b269a1..00000000 --- a/pkgs/vim-plugins/edit-alternate-vim.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "edit-alternate-vim"; - version = "unstable-2021-10-25"; - - src = fetchFromGitHub { - owner = "tjdevries"; - repo = "edit_alternate.vim"; - rev = "ef3019115d9bb7ffd691d2859eda213dd99e0b0a"; - sha256 = "mEKnqYAhgrdxPRoKf4S4yYecdFIHGg8bDxpqPuC1+S4="; - }; -} diff --git a/pkgs/vim-plugins/standard-vim.nix b/pkgs/vim-plugins/standard-vim.nix deleted file mode 100644 index 0a5744fb..00000000 --- a/pkgs/vim-plugins/standard-vim.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "standard-vim"; - version = "unstable-2018-10-15"; - - src = fetchFromGitHub { - owner = "tjdevries"; - repo = "standard.vim"; - rev = "b333ef9a9cf6cf66536deda017a542843613fa75"; - sha256 = "9VwkvV1Dv6cE4uDkPp36DozjWJOclDR883yDMYw000E="; - }; -} diff --git a/pkgs/vim-plugins/vim-caser.nix b/pkgs/vim-plugins/vim-caser.nix deleted file mode 100644 index 015da1e2..00000000 --- a/pkgs/vim-plugins/vim-caser.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "vim-caser"; - version = "2021-07-27"; - - src = fetchFromGitHub { - owner = "arthurxavierx"; - repo = "vim-caser"; - rev = "6bc9f41d170711c58e0157d882a5fe8c30f34bf6"; - sha256 = "PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps="; - }; -} diff --git a/pkgs/vim-plugins/vim-plugins.json b/pkgs/vim-plugins/vim-plugins.json new file mode 100644 index 00000000..a2fb3fef --- /dev/null +++ b/pkgs/vim-plugins/vim-plugins.json @@ -0,0 +1,50 @@ +{ + "conf-vim": { + "owner": "tjdevries", + "repo": "conf.vim", + "rev": "a716df0fd5d7ba558c07dac2e07f05d5eba11afb", + "version": "unstable-2017-10-09", + "hash": "sha256-AjiTJsoim0BAnyfqk1IQzNsa6jhFM2+A66E7q9sJqz0=" + }, + + "edit-alternate-vim": { + "owner": "tjdevries", + "repo": "edit_alternate.vim", + "rev": "ef3019115d9bb7ffd691d2859eda213dd99e0b0a", + "version": "unstable-2021-10-25", + "hash": "sha256-mEKnqYAhgrdxPRoKf4S4yYecdFIHGg8bDxpqPuC1+S4=" + }, + + "standard-vim": { + "owner": "tjdevries", + "repo": "standard.vim", + "rev": "b333ef9a9cf6cf66536deda017a542843613fa75", + "version": "unstable-2018-10-15", + "hash": "sha256-9VwkvV1Dv6cE4uDkPp36DozjWJOclDR883yDMYw000E=" + }, + + "vim-caser": { + "owner": "arthurxavierx", + "repo": "vim-caser", + "rev": "6bc9f41d170711c58e0157d882a5fe8c30f34bf6", + "version": "unstable-2021-07-27", + "hash": "sha256-PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps=" + }, + + "vim-textobj-indent": { + "owner": "kana", + "repo": "vim-textobj-indent", + "rev": "v0.0.6", + "version": "0.0.6", + "hash": "sha256-oFzUPG+IOkbKZ2gU/kduQ3G/LsLDlEjFhRP0BHBE+1Q=" + }, + + "vim-textobj-xmlattr": { + "owner": "whatyouhide", + "repo": "vim-textobj-xmlattr", + "rev": "694a297f1d75fd527e87da9769f3c6519a87ebb1", + "version": "unstable-2016-06-03", + "hash": "sha256-+91FVP95oh00flINdltqx6qJuijYo56tHIh3J098G2Q=" + } +} + diff --git a/pkgs/vim-plugins/vim-textobj-indent.nix b/pkgs/vim-plugins/vim-textobj-indent.nix deleted file mode 100644 index a728d82f..00000000 --- a/pkgs/vim-plugins/vim-textobj-indent.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "vim-textobj-indent"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "kana"; - repo = "vim-textobj-indent"; - rev = "v${version}"; - sha256 = "oFzUPG+IOkbKZ2gU/kduQ3G/LsLDlEjFhRP0BHBE+1Q="; - }; -} diff --git a/pkgs/vim-plugins/vim-textobj-xmlattr.nix b/pkgs/vim-plugins/vim-textobj-xmlattr.nix deleted file mode 100644 index 21695da7..00000000 --- a/pkgs/vim-plugins/vim-textobj-xmlattr.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -vimUtils.buildVimPlugin { - name = "vim-textobj-xmlattr"; - version = "unstable-2016-06-03"; - - src = fetchFromGitHub { - owner = "whatyouhide"; - repo = "vim-textobj-xmlattr"; - rev = "694a297f1d75fd527e87da9769f3c6519a87ebb1"; - sha256 = "+91FVP95oh00flINdltqx6qJuijYo56tHIh3J098G2Q="; - }; -}