Copy over fish variable exports to bash (#12)

rounakdatta · Jan 29, 2024 · b2d69e3 · b2d69e3
1 parent 83d5843
commit b2d69e3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/configs/bash/default.nix b/configs/bash/default.nix
@@ -1,10 +1,26 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+let
+  isDarwin = pkgs.stdenv.isDarwin;
+in
+{
   programs.bash = {
     enable = true;
     initExtra = ''
       export LC_ALL=en_US.UTF-8
       export LANG=en_US.UTF-8
       export PASSWORD_STORE_DIR=/Users/${config.home.username}/.password-store
-    '';
+    '' +
+    (if isDarwin then
+      ''
+        export PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
+        export PATH="$PATH:/etc/profiles/per-user/${config.home.username}/bin"
+        export PATH="$PATH:/opt/homebrew/bin"
+        export JAVA_HOME=/usr/libexec/java_home
+        export PASSWORD_STORE_DIR="/Users/${config.home.username}/.password-store"
+      ''
+    else
+      ''
+      ''
+    );
   };
 }
diff --git a/configs/fish/default.nix b/configs/fish/default.nix
@@ -58,12 +58,12 @@ in
     '' +
     (if isDarwin then
       ''
-                # this is needed, otherwise darwin-rebuild wouldn't be in PATH
-                fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin
-                set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin
-                set PATH $PATH /opt/homebrew/bin
-                set JAVA_HOME /usr/libexec/java_home
-        	set PASSWORD_STORE_DIR /Users/${config.home.username}/.password-store
+        # this is needed, otherwise darwin-rebuild wouldn't be in PATH
+        fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin
+        set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin
+        set PATH $PATH /opt/homebrew/bin
+        set JAVA_HOME /usr/libexec/java_home
+        set PASSWORD_STORE_DIR /Users/${config.home.username}/.password-store
       ''
     else
       ''