From 40240e9d5cffa99f6e7ad469144c08bdae5e0d24 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 5 Jun 2022 03:07:50 +0200
Subject: [PATCH] zsh: bundle plugins within our config

---
 modules/terminal-life/nvim/default.nix | 12 +++++-
 modules/terminal-life/zsh/default.nix  | 56 +++++++++++++++++++-------
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 13b5fb3d..fcceb0dc 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -5,6 +5,16 @@ let
 
   preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
 
+  vimagit-next = pkgs.vimUtils.buildVimPlugin {
+    name = "vimagit-next";
+    src = pkgs.fetchFromGitHub {
+      owner = "jreybert";
+      repo = "vimagit";
+      rev = "34eaa17ba3f5330fbcf685e48530fb572b11de32";
+      sha256 = "sha256-7ZvZx6ye5talX3t4dVGGyZihU6RY20HqVksuU+hC4jI=";
+    };
+  };
+
   instant-nvim = pkgs.vimUtils.buildVimPlugin {
     name = "instant";
     src = pkgs.fetchFromGitHub {
@@ -108,7 +118,7 @@ in
     fugitive
     vim-gitgutter
     vim-rhubarb
-    vimagit
+    vimagit-next
 
     fzf-vim
     fzfWrapper
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index 66ae354b..912de79e 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -39,21 +39,47 @@ in
     nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
     myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
   };
-  zplug = {
-    enable = true;
-    plugins = [
-      {
-        name = "plugins/z";
-        tags = [ "from:oh-my-zsh" ];
-      }
-      {
-        name = "romkatv/powerlevel10k";
-        tags = [ "as:theme" "depth:1" ];
-      }
-      { name = "zdharma/fast-syntax-highlighting"; }
-      { name = "chisui/zsh-nix-shell"; }
-    ];
-  };
+  plugins = [
+    {
+      # will source ohmyzsh/plugins/z/
+      name = "zsh-plugins-z";
+      file = "plugins/z/z.sh";
+      src = pkgs.fetchFromGitHub {
+        owner = "ohmyzsh";
+        repo = "ohmyzsh";
+        rev = "master";
+        sha256 = "sha256-NAVotL5RxpS/zKnO+ngMIjv787lqc1dj/c4blQrQcvU=";
+      };
+    }
+    {
+      name = "zsh-powerlevel10k";
+      file = "powerlevel10k.zsh-theme";
+      src = pkgs.fetchFromGitHub {
+        owner = "romkatv";
+        repo = "powerlevel10k";
+        rev = "master";
+        sha256 = "sha256-0pzkKPdzyQXTe8usaSaM1Iivi2UHQrSJrh5V2pRdiGg=";
+      };
+    }
+    {
+      name = "zsh-fast-syntax-highlighting";
+      src = pkgs.fetchFromGitHub {
+        owner = "zdharma";
+        repo = "fast-syntax-highlighting";
+        rev = "master";
+        sha256 = "sha256-uoLrXfq31GvfHO6GTrg7Hus8da2B4SCM1Frc+mRFbFc=";
+      };
+    }
+    {
+      name = "zsh-nix-shell";
+      src = pkgs.fetchFromGitHub {
+        owner = "chisui";
+        repo = "zsh-nix-shell";
+        rev = "master";
+        sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
+      };
+    }
+  ];
 
   initExtra = ''
     bindkey -v