diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix index ced7217..000309a 100644 --- a/hosts/dnsc-air/default.nix +++ b/hosts/dnsc-air/default.nix @@ -137,6 +137,10 @@ # Shells environment.shells = [ pkgs.bash ]; + programs.bash = { + enableLsColors = true; + completion.enable = true; + }; # System settings system = { diff --git a/modules/bash/default.nix b/modules/bash/default.nix index 9eaf5b1..2473962 100644 --- a/modules/bash/default.nix +++ b/modules/bash/default.nix @@ -15,6 +15,8 @@ "lg" = "lazygit"; "g" = "git"; "xsrc" = "source ~/.bashrc && source .bash_profile"; + "ll" = "ls -l"; + "la" = "ls -la"; }; profileExtra = '' @@ -39,8 +41,8 @@ if [ -n "$INSIDE_EMACS" ]; then PS1="[\u@\h:\w]\\$ " else - PROMPT_COMMAND="PS1_CMD1=$(git branch --show-current 2>/dev/null)"; - PS1="\u@\h \[\e[96m\]\w\[\e[0m\] (\[\e[95m\]$PS1_CMD1\[\e[0m\])\n\[\e[96m\]λ\[\e[0m\] " + PROMPT_COMMAND="PS1_CMD1=$(__git_ps1 "(%s)")"; + PS1="\[\e[95m\]\u\[\e[35m\]@\h\[\e[0m\] \[\e[96m\]\w\[\e[0m\] \[\e[95m\]$PS1_CMD1\n\[\e[96m\]λ\[\e[0m\] " fi ''; };