diff --git a/src/user/modules/bash/config/bashprofile.nix b/src/user/modules/bash/config/bashprofile.nix deleted file mode 100644 index 2008d53..0000000 --- a/src/user/modules/bash/config/bashprofile.nix +++ /dev/null @@ -1,2 +0,0 @@ -'' -'' diff --git a/src/user/modules/bash/config/prompt.nix b/src/user/modules/bash/config/prompt.nix index 07b844c..9d10389 100644 --- a/src/user/modules/bash/config/prompt.nix +++ b/src/user/modules/bash/config/prompt.nix @@ -1,3 +1,10 @@ +{ config, lib, ... }: + +with lib; +let + git = config.modules.user.git; + +in '' check_ssh() { if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then @@ -6,6 +13,7 @@ check_ssh() { fi } +${optionalString git.enable '' add_icon() { local icon=$1 if [[ ! $venv_icons =~ $icon ]]; then @@ -82,6 +90,7 @@ check_project() { return 0 fi } +''} function set_prompt() { local green_arrow="\[\033[01;32m\]>> " @@ -89,13 +98,20 @@ function set_prompt() { local working_dir="\[\033[01;34m\]\w\[\033[00m\]" local ssh_PS1 + + check_ssh + ${optionalString git.enable '' local venv_icons local git_branch_PS1 - check_ssh check_project + ''} + PS1="$ssh_PS1\n$working_dir$green_arrow$white_text" + + ${optionalString git.enable '' PS1="$ssh_PS1\n$working_dir\n$venv_icons$green_arrow$git_branch_PS1$white_text" + ''} return 0 } diff --git a/src/user/modules/bash/default.nix b/src/user/modules/bash/default.nix index b5852a1..670a7a7 100644 --- a/src/user/modules/bash/default.nix +++ b/src/user/modules/bash/default.nix @@ -11,8 +11,7 @@ in enable = true; enableCompletion = true; - initExtra = import ./config/prompt.nix; - profileExtra = import ./config/bashprofile.nix; + initExtra = import ./config/prompt.nix { inherit lib config; }; bashrcExtra = import ./config/bashrc.nix; shellAliases = import ./config/alias.nix; };