From 9570691cf6c9661198321cffa4a74edf9982ee96 Mon Sep 17 00:00:00 2001
From: Thorn Avery <s@p7.co.nz>
Date: Mon, 3 May 2021 08:24:52 +0000
Subject: [PATCH] moved zsh to its own module + fixed swatch in prompt not
 updating

---
 modules/bspwm/home.nix                  | 1 -
 modules/{bspwm/zsh.nix => zsh/home.nix} | 3 ++-
 users/thorn/home.nix                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename modules/{bspwm/zsh.nix => zsh/home.nix} (87%)

diff --git a/modules/bspwm/home.nix b/modules/bspwm/home.nix
index c3cc3cc..96d2ece 100644
--- a/modules/bspwm/home.nix
+++ b/modules/bspwm/home.nix
@@ -3,7 +3,6 @@
   imports = [
     ./wm.nix
     ./rofi.nix
-    ./zsh.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/modules/bspwm/zsh.nix b/modules/zsh/home.nix
similarity index 87%
rename from modules/bspwm/zsh.nix
rename to modules/zsh/home.nix
index 82ea334..3019749 100644
--- a/modules/bspwm/zsh.nix
+++ b/modules/zsh/home.nix
@@ -22,8 +22,9 @@ in {
       share = true;
     };
     initExtra = ''
+      setopt promptsubst
       autoload -U colors && colors
-      export PROMPT="%{$fg[white]%}%B$(swatch)%b %{$fg[blue]%}%2~ %{$fg[green]%}%B>%b ";
+      export PROMPT='%{$fg[white]%}%B$(swatch)%b %{$fg[blue]%}%2~ %{$fg[green]%}%B>%b '
     '';
     shellAliases = {
       nf = "neofetch --gtk2 off --gtk3 off --ascii_bold on";
diff --git a/users/thorn/home.nix b/users/thorn/home.nix
index 8f54843..964aecc 100755
--- a/users/thorn/home.nix
+++ b/users/thorn/home.nix
@@ -16,6 +16,7 @@
     ../../modules/bspwm/home.nix
     ../../modules/urxvt/home.nix
     ../../modules/picom/home.nix
+    ../../modules/zsh/home.nix
 
     ./fonts/home.nix
     ./xresources.nix