diff --git a/home/modules/zsh/default.nix b/home/modules/zsh/default.nix index 6434908..5e33633 100644 --- a/home/modules/zsh/default.nix +++ b/home/modules/zsh/default.nix @@ -7,12 +7,19 @@ with lib; let cfg = config.local.services.zsh; in { - options.local.services.zsh.enable = mkEnableOption "zsh settings"; + options.local.services.zsh = { + enable = mkEnableOption "zsh settings"; + prompt = mkOption { + type = types.str; + description = "prompt for your terminal"; + example = literalExpression "%B[%~] \${vcs_info_msg_0_}%b"; + }; + }; config = mkIf cfg.enable { programs.zsh = { enable = true; syntaxHighlighting.enable = true; - initExtra = import ./zshrc.nix pkgs; + initExtra = import ./zshrc.nix {inherit config lib pkgs;}; }; }; } diff --git a/home/modules/zsh/zshrc.nix b/home/modules/zsh/zshrc.nix index 6665b14..8cadd7e 100644 --- a/home/modules/zsh/zshrc.nix +++ b/home/modules/zsh/zshrc.nix @@ -1,8 +1,7 @@ { - maim, - redshift, - xclip, - ... + config, + lib, + pkgs }: '' # The following lines were added by compinstall @@ -73,17 +72,17 @@ return 0 } - PROMPT='%B[%~] ''${vcs_info_msg_0_}%b' + PROMPT='${config.local.services.zsh.prompt}' # Aliases and binds alias ls='ls --color -F' alias l='ls --color -FhAltr' alias x='killall --ignore-case --user=$(whoami) --interactive' - alias sc='${maim}/bin/maim -s -u | ${xclip}/bin/xclip -selection clipboard -t image/png -i' + alias sc='${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i' alias tree='tree -CF' alias lock="betterlockscreen -l" - alias nightmode="${redshift}/bin/redshift -P -O 1000" - alias lightmode="${redshift}/bin/redshift -x=" + alias nightmode="${lib.getExe pkgs.redshift} -P -O 1000" + alias lightmode="${lib.getExe pkgs.redshift} -x=" alias inbox="echo >> $HOME/gtd/inbox" alias nixoide="nix repl ''" alias vps="ssh -A vps" diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 6dc79ed..951d305 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -24,7 +24,10 @@ baseline.enable = true; services = { - zsh.enable = true; + zsh = { + enable = true; + prompt = "%B[%~] \${vcs_info_msg_0_}%b"; + }; accounts.enable = true; gpg = { enable = true; diff --git a/home/platforms/fabian@vps/default.nix b/home/platforms/fabian@vps/default.nix index bb5974f..d8ed967 100644 --- a/home/platforms/fabian@vps/default.nix +++ b/home/platforms/fabian@vps/default.nix @@ -23,7 +23,10 @@ with lib; { baseline.enable = true; services = { - zsh.enable = true; + zsh = { + enable = true; + prompt = "%B<%~> \${vcs_info_msg_0_}%b"; + }; }; apps = {