Fix bad wedge color on status segment

Add leading space to RO path icon

Makefile

@@ -2,6 +2,7 @@ BUILD_COMMIT       = $(shell git rev-parse HEAD)
 BASE_IMAGE         = registry.fedoraproject.org/fedora-toolbox
 BASE_IMAGE_VERSION = $(shell cat /etc/os-release | grep VERSION_ID | cut -d = -f 2)
 REPOSITORY         = localhost/toolbox-dev-env
+STARSHIP_COLOR     = $(shell cat starship.$(HOSTNAME).color)
 
 .PHONY: container
 container:
@@ -10,6 +11,12 @@ container:
 
 .PHONY: container
 scripts:
+	mkdir --parents ~/.local/share/fonts/
+	curl -sSLo ~/.local/share/fonts/nerdfont.zip https://github.com/ryanoasis/nerd-fonts/releases/download/v3.4.0/AdwaitaMono.zip
+	unzip -o ~/.local/share/fonts/nerdfont.zip -d ~/.local/share/fonts/
+	rm ~/.local/share/fonts/nerdfont.zip
+	fc-cache -f -v
+
 	mkdir --parents ~/.local/bin
 	curl -sSo /tmp/starship.sh https://starship.rs/install.sh
 	sh /tmp/starship.sh --yes --bin-dir=$(HOME)/.local/bin
@@ -23,5 +30,7 @@ scripts:
 	cp bashrc.sh ~/.bashrc
 	cp inputrc ~/.inputrc
 	cp starship.toml ~/.config/starship.toml
+	sed -i "s/#XXXXXX/$(STARSHIP_COLOR)/g" ~/.config/starship.toml
 
 install: container scripts;
+

scripts.d/10-starship.sh

@@ -1,6 +1,6 @@
 function set_window_title() {
-    if [ "${PWD}" == "$PROJECTS_DIR/*" ]; then
-        echo -ne "\033]0; Toolbox: Development \007"
+    if [[ "${PWD}" == $PROJECTS_PATH/* ]]; then
+        echo -ne "\033]0; Project: $(basename ${PWD}) \007"
     else
         echo -ne "\033]0; $LOCATION \007"
     fi

scripts.d/50-dev.sh

@@ -5,11 +5,11 @@ function dev() {
         echo "WARNING: Missing project name";
         project=""
     else
-        project="${2}"
+        project="${1}"
     fi
 
     if [ -f '/run/.toolboxenv' ]; then
-        cd "${PROJECTS_DIR}/${project}";
+        cd "${PROJECTS_PATH}/${project}";
 
         if [ -f "${PWD}/ansible.cfg" ]; then
             export ANSIBLE_CONFIG="${PWD}/ansible.cfg";
@@ -19,7 +19,7 @@ function dev() {
         if [ -f "${PWD}/pyproject.toml" ]; then
             poetry_venv=$(poetry env info --path)
 
-            if [ ! -z "${poetry_venv}" ]; then
+            if [ ! -z "${poetry_venv}" ] && [ -f "${poetry_venv}/bin/activate" ]; then
                 source "${poetry_venv}/bin/activate";
             fi
         fi
@@ -40,7 +40,7 @@ function dev() {
         echo ">>> ${PWD}"
         toolbox enter "${container_name}"
         echo ">>> Exited: ${container_name}"
-        cd ${current}
+        cd "${current}"
 
         podman container stop "${container_name}" &>/dev/null
         podman container rm --force "${container_name}" &>/dev/null
@@ -48,7 +48,8 @@ function dev() {
 }
 
 if [ -f '/run/.toolboxenv' ]; then
-    if [ "${PWD}" == "$PROJECTS_PATH/*" ]; then
+    if [[ "${PWD}" == $PROJECTS_PATH/* ]]; then
         dev $(basename "${PWD}")
     fi
-fi
+fi
+

starship.discovery.color

@@ -0,0 +1 @@
+#893937

starship.toml

@@ -1,19 +1,20 @@
 add_newline = false
 
-format = '${custom.toolbox}${custom.localhost}[](bold fg:#01568e bg:#000000)$directory$python$git_branch$git_status$status$character'
+format = '[ ](bold fg:#000000 bg:#XXXXXX)${custom.toolbox}${custom.localhost}[](bold fg:#XXXXXX bg:#444444)$directory$python$git_branch$git_status$status$character'
 
 [directory]
-format = "[](fg:#000000 bg:#444444)[$read_only]($read_only_style)[$path ]($style)[](fg:#444444 bg:#000000)"
+format = "[$read_only]($read_only_style)[$path ]($style)[](fg:#444444 bg:#000000)"
 style = "fg:bright-white bg:#444444"
-read_only = ''
-read_only_style = "bold fg:bright-red bg:#444444"
-truncation_symbol = ' '
-home_symbol = ''
+read_only = ' '
+read_only_style = "bold fg:red bg:#444444"
+truncation_symbol = ' '
+home_symbol = '~'
 [directory.substitutions]
 '/' = '  '
+'~ ' = ''
 
 [character]
-success_symbol = ''
+success_symbol = '[](bold fg:#000000)'
 error_symbol = '[](bold fg:#6d0505)'
 
 [status]
@@ -34,15 +35,15 @@ format = '([](bold fg:#000000 bg:#f4862c)[$all_status$ahead_behind]($style)[
 
 [python]
 style = 'bold bg:#fcf52a fg:black'
-symbol = ''
-format = '[](bold fg:#000000 bg:#fcf52a)[$symbol( $virtualenv)]($style)[](bold bg:#000000 fg:#fcf52a)'
+symbol = ''
+format = '([](bold fg:#000000 bg:#fcf52a)[$virtualenv]($style)[](bold bg:#000000 fg:#fcf52a))'
 
 [custom.toolbox]
-style = "bold bg:#01568e fg:bright-white"
-command = "echo -ne 'toolbox '"
+style = "bold bg:#XXXXXX fg:bright-white"
+command = "echo -ne ' toolbox'"
 when = '[ -f /run/.toolboxenv ]'
 
 [custom.localhost]
-style = "bold bg:#01568e fg:bright-white"
-command = "echo -ne $HOSTNAME "
+style = "bold bg:#XXXXXX fg:bright-white"
+command = 'echo -ne " $HOSTNAME"'
 when = '[ ! -f /run/.toolboxenv ]'

starship.voyager.color

@@ -0,0 +1 @@
+#01568e