diff --git a/README.md b/README.md index 04f7451..794708f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ Environment tweaks for everyday happiness. ## Setup -Use the `bootstrap.sh` script to set up a virtual environment with Ansible and its dependencies, then `setup.sh`! +Just run `./setup.sh`! + +_Note_: This expects `pipx` to be installed on your system. ## Contributing diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100755 index 6654b45..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/bash - -VENV=env.venv - -python -m venv "$VENV" - -. "$VENV/bin/activate" - -pip install -U pip ansible~=9.5 diff --git a/files/starship.toml b/files/starship.toml index 7a5b635..95f594c 100644 --- a/files/starship.toml +++ b/files/starship.toml @@ -1,6 +1,9 @@ +# Marc's env managed block - BEGIN + format = """ +[┌─](bold green) ☠️ \ [](#9A348E)\ -$username\ +$username$hostname\ $os\ [](bg:#33658a fg:#9A348E)\ $time\ @@ -11,12 +14,12 @@ $git_branch\ $git_status\ [](fg:#4208e0 bg:#9A348E)\ $python\ -[](fg:#9A348E) -> +[](fg:#9A348E) +[└─ ](bold green) """ # Disable the blank line at the start of the prompt -add_newline = true +add_newline = false [python] style = "bg:#9A348E" @@ -29,9 +32,14 @@ format = '[${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)' show_always = true style_user = "bg:#9A348E" style_root = "bg:#9A348E" -format = '[$user ]($style)' +format = '[$user]($style)' disabled = false +[hostname] +format = '[@$hostname ]($style)' +style = "bg:#9A348E" +ssh_only = false + # An alternative to the username module which displays a symbol that # represents the current operating system [os] @@ -71,3 +79,4 @@ time_format = "%T" style = "bg:#33658A" format = '[ $time ]($style)' disabled = false +# Marc's env managed block - END diff --git a/setup.sh b/setup.sh index b4e93fa..54f7c65 100755 --- a/setup.sh +++ b/setup.sh @@ -1,3 +1,9 @@ #!/bin/bash -ansible-playbook playbook.yml -v --ask-become-pass +if [[ -z "$(command -v pipx)" ]]; then + echo -e "\033[31;1mThis expects pipx to be installed.\033[0m" + exit 1 +fi + +pipx install "ansible~=10.0" +ansible-playbook -v --ask-become-pass ./playbook.yml