nvim: reorganize plugins

configs/neovim.nix

@@ -5,12 +5,24 @@
   environment.shellAliases.vim = "nvim";
   environment.shellAliases.view = "nvim -R";
 
+  nixpkgs.config.packageOverrides = pkgs: {
+    vimPlugins = pkgs.vimPlugins // {
+      cheat-sh-vim = pkgs.callPackage <packages/vimPlugins/cheat-sh.nix> {};
+      vim-fetch = pkgs.callPackage <packages/vimPlugins/vim-fetch.nix> {};
+      vim-colors-paramount = pkgs.callPackage <packages/vimPlugins/vim-colors-paramount.nix> {};
+      vim-256noir = pkgs.callPackage <packages/vimPlugins/vim-256noir.nix> {};
+      todo-txt-vim = pkgs.callPackage <packages/vimPlugins/todo-txt-vim.nix> {};
+      jq-vim = pkgs.callPackage <packages/vimPlugins/jq-vim.nix> {};
+      vim-fsharp = pkgs.callPackage <packages/vimPlugins/vim-fsharp.nix> {};
+    };
+  };
+
   environment.systemPackages = [
     (pkgs.neovim.override {
       configure = {
         customRC = builtins.readFile <dot/init.vim>;
         packages.nvim = with pkgs.vimPlugins; {
-          start = with pkgs.vimPlugins; [
+          start = [
             ale
             deoplete-nvim
             fzf-vim
@@ -27,33 +39,10 @@
             vim-sensible
             vim-startify
             vim-surround
-            (pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+            cheat-sh-vim
-              name = "vim-fetch";
+            vim-fetch
-              src = pkgs.fetchFromGitHub {
+            vim-colors-paramount
-                owner = "wsdjeg";
+            vim-256noir
-                repo = "vim-fetch";
-                rev = "76c08586e15e42055c9c21321d9fca0677442ecc";
-                sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz";
-              };
-            })
-            (pkgs.vimUtils.buildVimPluginFrom2Nix rec {
-              name = "vim-colors-paramount";
-              src = pkgs.fetchFromGitHub {
-                owner = "owickstrom";
-                repo = "vim-colors-paramount";
-                rev = "a5601d36fb6932e8d1a6f8b37b179a99b1456798";
-                sha256 = "0rjn9vjb0xrxbiqyfclda2ridcbl3nfn4svs32mvmv8als6crncg";
-              };
-            })
-            (pkgs.vimUtils.buildVimPluginFrom2Nix {
-              name = "vim-256noir";
-              src = pkgs.fetchFromGitHub {
-                owner = "andreasvc";
-                repo = "vim-256noir";
-                rev = "e8668a18a4a90272c1cae87e655f8bddc5ac3665";
-                sha256 = "1kpn379f5dgbsgb73g6d1nlmz9vz0j3ihi500mcdx4yg56fvkr0x";
-              };
-            })
           ];
           opt = [
             csv
@@ -64,46 +53,15 @@
             rust-vim
             typescript-vim
             vim-javascript
+            purescript-vim
             vim-nix
             vim-toml
             vimtex
             vim-ledger
-            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+            todo-txt-vim
-              name = "todo.txt-vim";
+            emmet-vim
-              src = pkgs.fetchFromGitHub {
+            jq-vim
-                owner = "freitass";
+            vim-fsharp
-                repo = "todo.txt-vim";
-                rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
-                sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
-              };
-            })
-            (pkgs.vimUtils.buildVimPluginFrom2Nix {
-              name = "jq.vim";
-              src = pkgs.fetchFromGitHub {
-                owner = "vito-c";
-                repo = "jq.vim";
-                rev = "5baf8ed192cf267d30b84e3243d9aab3d4912e60";
-                sha256 = "1ykaxlli7b9wmhr8lpdalqxh7l4940jwhwm9pwlraga425h4r6z4";
-              };
-            })
-            (pkgs.vimUtils.buildVimPluginFrom2Nix {
-              name = "vim-fsharp";
-              src = pkgs.fetchFromGitHub {
-                owner = "fsharp";
-                repo = "vim-fsharp";
-                rev = "627db7d701747e8fd7924b6505c61e16a369fb72";
-                sha256 = "00hhgn2p54faysx1ddccyhl9jnvddgxsczhv0np3mgzza6ls4838";
-              };
-            })
-            (pkgs.vimUtils.buildVimPluginFrom2Nix {
-              name = "emmet-vim";
-              src = pkgs.fetchFromGitHub {
-                owner = "mattn";
-                repo = "emmet-vim";
-                rev = "d698f1658770ca5fa58c87e80421c8d65bbe9065";
-                sha256 = "0vl4267hh8g1vkvc3awlqyypgz4m1r43d47sldl80yamiafiviaj";
-              };
-            })
           ];
         };
       };

dot/init.vim

@@ -118,6 +118,7 @@ if has("autocmd")
   autocmd bufnewfile,bufread *.toml packadd vim-toml | set filetype=toml
   autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
   autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
+  autocmd bufnewfile,bufread *.purs packadd purescript-vim | set filetype=purescript
   autocmd bufnewfile,bufread *.jq packadd jq.vim
   autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
   autocmd bufnewfile,bufread config set filetype=conf

packages/vimPlugins/cheat-sh.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+(vimUtils.buildVimPluginFrom2Nix {
+  name = "cheat.sh-vim";
+  src = fetchFromGitHub {
+    owner = "dbeniamine";
+    repo = "cheat.sh-vim";
+    rev = "826219d16af492413e427fd666f3136f8e3fb0b0";
+    sha256 = "09bvyb1xk2lrwacw3mvyd2f8a9g4hvs10q3s1k39b20p1x3bbzfn";
+  };
+})

packages/vimPlugins/jq-vim.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPluginFrom2Nix {
+  name = "jq.vim";
+  src = fetchFromGitHub {
+    owner = "vito-c";
+    repo = "jq.vim";
+    rev = "5baf8ed192cf267d30b84e3243d9aab3d4912e60";
+    sha256 = "1ykaxlli7b9wmhr8lpdalqxh7l4940jwhwm9pwlraga425h4r6z4";
+  };
+}

packages/vimPlugins/todo-txt-vim.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPluginFrom2Nix {
+  name = "todo.txt-vim";
+  src = fetchFromGitHub {
+    owner = "freitass";
+    repo = "todo.txt-vim";
+    rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
+    sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
+  };
+}

packages/vimPlugins/vim-256noir.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPluginFrom2Nix {
+  name = "vim-256noir";
+  src = fetchFromGitHub {
+    owner = "andreasvc";
+    repo = "vim-256noir";
+    rev = "e8668a18a4a90272c1cae87e655f8bddc5ac3665";
+    sha256 = "1kpn379f5dgbsgb73g6d1nlmz9vz0j3ihi500mcdx4yg56fvkr0x";
+  };
+}

packages/vimPlugins/vim-colors-paramount.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPluginFrom2Nix rec {
+  name = "vim-colors-paramount";
+  src = fetchFromGitHub {
+    owner = "owickstrom";
+    repo = "vim-colors-paramount";
+    rev = "a5601d36fb6932e8d1a6f8b37b179a99b1456798";
+    sha256 = "0rjn9vjb0xrxbiqyfclda2ridcbl3nfn4svs32mvmv8als6crncg";
+  };
+}

packages/vimPlugins/vim-fetch.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+(vimUtils.buildVimPluginFrom2Nix rec {
+  name = "vim-fetch";
+  src = fetchFromGitHub {
+    owner = "wsdjeg";
+    repo = "vim-fetch";
+    rev = "76c08586e15e42055c9c21321d9fca0677442ecc";
+    sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz";
+  };
+})

packages/vimPlugins/vim-fsharp.nix

@@ -0,0 +1,10 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPluginFrom2Nix {
+  name = "vim-fsharp";
+  src = fetchFromGitHub {
+    owner = "fsharp";
+    repo = "vim-fsharp";
+    rev = "627db7d701747e8fd7924b6505c61e16a369fb72";
+    sha256 = "00hhgn2p54faysx1ddccyhl9jnvddgxsczhv0np3mgzza6ls4838";
+  };
+}