From a0e3c9325bc56a15c3784f91a02c74cb93f879f8 Mon Sep 17 00:00:00 2001
From: mediocregopher <mediocregopher@gmail.com>
Date: Sat, 6 Jan 2024 11:59:31 +0100
Subject: Move bin derivation to global default.nix

---
 zsh/default.nix | 31 ++-----------------------------
 zsh/zshrc       |  6 ++++++
 2 files changed, 8 insertions(+), 29 deletions(-)

(limited to 'zsh')

diff --git a/zsh/default.nix b/zsh/default.nix
index bc4a795..51fba90 100644
--- a/zsh/default.nix
+++ b/zsh/default.nix
@@ -1,31 +1,12 @@
 {
 
   pkgs ? (import ../pkgs.nix).stable {},
-  config,
 
 }: rec {
 
-  ohMyZsh = ./oh-my-zsh;
-
-  bin = pkgs.buildEnv {
-    name = "mediocregopher-bin";
-    paths = [
-      (pkgs.stdenv.mkDerivation {
-        name = "mediocregopher-default-bin";
-        src = ../bin;
-        builder = builtins.toFile "builder.sh" ''
-          source $stdenv/setup
-          mkdir -p "$out"
-          cp -rL "$src" "$out"/bin
-        '';
-      })
-    ] ++ (
-      builtins.map (cFn: cFn pkgs) config.binExtra
-    );
-  };
-
   zshrc = pkgs.writeTextDir ".zshrc" ''
-    # Import before anything else, so that we have the full PATH available for everything following
+    # Import before anything else, so that we have the full PATH available for
+    # everything following
     . ${pkgs.nix}/etc/profile.d/nix.sh
 
     # oh-my-zsh
@@ -36,14 +17,6 @@
     plugins=(git vi-mode)
     source $ZSH/oh-my-zsh.sh
 
-    export PATH=${bin}/bin:$PATH
-
-    #Global stuff shitty programs use
-    export EDITOR=~/.nix-profile/bin/nvim
-
-    # GPG is needy
-    export GPG_TTY=$(tty)
-
     . ${./zshrc}
     . ${./aliases}
   '';
diff --git a/zsh/zshrc b/zsh/zshrc
index c939401..f59c843 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,3 +1,9 @@
+#Global stuff shitty programs use
+export EDITOR=~/.nix-profile/bin/nvim
+
+# GPG is needy
+export GPG_TTY=$(tty)
+
 #Correctly background processes
 setopt nohup
 
-- 
cgit v1.2.3