From f2e545141df71c445eb2fec8b512dfc7ed3183a7 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 21 May 2022 21:02:37 -0600
Subject: pkgs: pass combined pkgs to shenvs

---
 pkgs/default.nix | 56 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 23683ae..44bceee 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,32 +1,36 @@
 { pkgs, util }:
 with pkgs.lib; let
   inherit (pkgs) buildEnv callPackage writeTextDir;
-in {
-  shenvs = let
-    build = name: { paths, enter ? null }: buildEnv {
-      name = "shenv-${name}";
-      paths = (optional (enter != null) (writeTextDir "lib/shenv/enter" enter))
-            ++ paths;
-    };
-  in pkgs.lib.mapAttrs (name: shenv: build name (shenv pkgs)) (util.importAll {
-    root = ../shenvs;
-    exclude = [ "config" ];
-  });
-
-  btclone = callPackage ./btclone {};
-  git-aliases = callPackage ./git-aliases.nix {};
-  mssql-tools = callPackage ./mssql-tools.nix {};
-  scripts = callPackage ./scripts {};
-  tmux-lift = callPackage ./tmux-lift {};
 
-  st = pkgs.st.override {
-    conf = import ./st.nix {};
+  combined = pkgs // { inherit local; };
 
-    patches = [
-      (pkgs.fetchpatch {
-        url = "https://st.suckless.org/patches/clipboard/st-clipboard-0.8.3.diff";
-        sha256 = "cbb37675e9b4986836c19aadacc616a006df81c9bf394e9e3573e164fa1867cf";
-      })
-    ];
+  local = {
+    shenvs = let
+      build = name: { paths, enter ? null }: buildEnv {
+        name = "shenv-${name}";
+        paths = (optional (enter != null) (writeTextDir "lib/shenv/enter" enter))
+              ++ paths;
+      };
+    in pkgs.lib.mapAttrs (name: shenv: build name (shenv combined)) (util.importAll {
+      root = ../shenvs;
+      exclude = [ "config" ];
+    });
+  
+    btclone = callPackage ./btclone {};
+    git-aliases = callPackage ./git-aliases.nix {};
+    mssql-tools = callPackage ./mssql-tools.nix {};
+    scripts = callPackage ./scripts {};
+    tmux-lift = callPackage ./tmux-lift {};
+  
+    st = pkgs.st.override {
+      conf = import ./st.nix {};
+  
+      patches = [
+        (pkgs.fetchpatch {
+          url = "https://st.suckless.org/patches/clipboard/st-clipboard-0.8.3.diff";
+          sha256 = "cbb37675e9b4986836c19aadacc616a006df81c9bf394e9e3573e164fa1867cf";
+        })
+      ];
+    };
   };
-}
+in local
-- 
cgit v1.2.3