From 03ec3eea98a2d0ee49a95052e8692f10e1429d0d Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Fri, 4 Mar 2022 14:05:47 +0000
Subject: [PATCH] Made things pretty

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 home/.macchina/config.toml |  4 ++++
 home/.macchina/theme.toml  | 43 ++++++++++++++++++++++++++++++++++++++
 home/.starship/config.toml | 42 ++++++++++++++++++++++++++-----------
 home/.zshrc                |  2 ++
 install.sh                 |  4 ++--
 5 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 home/.macchina/config.toml
 create mode 100644 home/.macchina/theme.toml

diff --git a/home/.macchina/config.toml b/home/.macchina/config.toml
new file mode 100644
index 0000000..a4d865b
--- /dev/null
+++ b/home/.macchina/config.toml
@@ -0,0 +1,4 @@
+long_uptime = true
+long_shell = true
+physical_cores = true
+show = [ "Host", "Machine", "OperatingSystem", "Terminal", "Shell", "Uptime" ]
diff --git a/home/.macchina/theme.toml b/home/.macchina/theme.toml
new file mode 100644
index 0000000..0fa5fa0
--- /dev/null
+++ b/home/.macchina/theme.toml
@@ -0,0 +1,43 @@
+
+hide_ascii = true
+spacing = 1
+padding = 0
+separator = "❯"
+key_color = "Cyan"
+separator_color = "LightMagenta"
+
+[bar]
+glyph = "⭘"
+symbol_open = ""
+symbol_close = ""
+visible = true
+
+[box]
+title = " Info "
+visible = true
+
+[box.inner_margin]
+x = 1
+y = 0
+
+[randomize]
+key_color = false
+separator_color = false
+
+[keys]
+host = "Host"
+kernel = "Kernel"
+battery = "Battery"
+os = "OS"
+distro = "Distro"
+terminal = "Terminal"
+shell = "Shell"
+packages = "Packages"
+uptime = "Uptime"
+memory = "Memory"
+machine = "Machine"
+local_ip = "IP"
+backlight = "Brightness"
+resolution = "Resolution"
+cpu_load = "CPU Load"
+cpu = "CPU"
diff --git a/home/.starship/config.toml b/home/.starship/config.toml
index 06ae4e7..7606113 100644
--- a/home/.starship/config.toml
+++ b/home/.starship/config.toml
@@ -14,32 +14,46 @@ format = """\
   $terraform\
   $package\
   $custom\
+  $time\
   $line_break\
   $jobs\
-  $time\
   $character\
   """
 
 command_timeout = 1000
 add_newline = true
 
-[character]
-success_symbol = "[✨](yellow)"
-error_symbol = "[✗](red)"
+[directory]
+format = "┏   [$path]($style)[$read_only]($read_only_style) "
 
-[aws]
-symbol = " "
-format = "[$symbol$profile]($style) "
+[character]
+success_symbol = "┗ [✨](yellow)"
+error_symbol = "┗ [✗](red)"
+
+[git_branch]
+format = "⎮ [$symbol$branch]($style) "
+symbol = "🌱 "
 
 [git_commit]
 only_detached = true
 
+[git_status]
+format = '\($all_status$ahead_behind\) '
+up_to_date = "[✓](green)"
+modified = "[!](bold fg:208)"
+untracked = "[?](bold fg:75)"
+staged = '[++\($count\)](green)'
+
+[aws]
+symbol = " "
+format = "⎮ [$symbol$profile]($style) "
+
 [golang]
 symbol = " "
-format = "[$symbol$version]($style) "
+format = "⎮ [$symbol$version](fg:45) "
 
 [kubernetes]
-format = '[$symbol$context \($namespace\)]($style) '
+format = '⎮ [$symbol$context (\($namespace\))]($style) '
 symbol = "ﴱ "
 style = "bold blue"
 disabled = false
@@ -47,7 +61,7 @@ disabled = false
 "gs-(?P<cluster>.+)" = "$cluster [MC]"
 
 [terraform]
-format = "[$symbol$version]($style) "
+format = "⎮ [$symbol$version]($style) "
 
 [nodejs]
 symbol = " "
@@ -60,7 +74,7 @@ map_symbol = true
 disabled = false
 
 [helm]
-format = "[$symbol$version]($style) "
+format = "⎮ [$symbol$version]($style) "
 symbol = " "
 
 [cmd_duration]
@@ -68,4 +82,8 @@ format = " took [$duration]($style) "
 
 [package]
 symbol = "📦"
-format = "[$symbol$version]($style) "
+format = "⎮ [$symbol$version]($style) "
+
+[jobs]
+number_threshold = 1
+format = "┣ [$symbol $number background jobs\n]($style)"
diff --git a/home/.zshrc b/home/.zshrc
index 720b9bb..586ee98 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -29,3 +29,5 @@ done
 rm -f ~/.zcompdump; compinit
 
 eval "$(starship init zsh)"
+
+macchina --config ~/.macchina/config.toml --theme ~/.macchina/theme
diff --git a/install.sh b/install.sh
index 2eec6ab..fb61b5a 100644
--- a/install.sh
+++ b/install.sh
@@ -29,9 +29,9 @@ BREW_TOOLS=(
   git-delta go helm homebrew/cask-fonts/font-open-dyslexic-nerd-font htop jq kind krew
   kubectl kubectx kustomize node procs progress ripgrep rs/tap/curlie rust starship
   tektoncd/tools/tektoncd-cli tldr tailscale yq hashicorp/tap/vault stats
-  tabby vale lastpass-cli jless
+  tabby vale lastpass-cli jless macchina
   )
-CARGO_TOOLS=( macchina bottom )
+CARGO_TOOLS=( bottom )
 NODE_TOOLS=( git-split-diffs )
 KREW_TOOLS=( gs outdated tree stern )