changed kubernetes context and namespace integration

roles/fish/files/starship.toml

@@ -21,7 +21,3 @@ behind = "⇣${count} "
 
 [gcloud]
 disabled = true
-
-[kubernetes]
-format = 'on [⛵ $context \($namespace\)](dimmed green) '
-disabled = false

roles/waybar/files/waybar/config

@@ -72,7 +72,7 @@
     "layer": "bottom",
     "position": "bottom",
 
-    "modules-left": ["tray", "custom/spotify"],
+    "modules-left": ["tray", "custom/spotify", "custom/kubernetes"],
     "modules-center": ["network#speed"],
     "modules-right": ["custom/systemd", "custom/backup", "custom/zfs-trim", "custom/zfs-scrub", "temperature", "custom/storage", "cpu", "memory" ],
     "custom/spotify": {
@@ -108,7 +108,13 @@
         "format": "<span foreground='#ff5c57'> {}</span>",
         "interval": 5,
         "exec": "~/.config/waybar/modules/systemd.sh",
-        "exec-if": "~/.config/waybar/modules/systemd.sh"
+        "exec-if": "which systemctl"
+    },
+    "custom/kubernetes": {
+        "format": " {}",
+        "interval": 5,
+        "exec": "~/.config/waybar/modules/kubernetes.sh",
+        "exec-if": "which kubectx kubens"
     },
     "cpu": {
         "interval": 3,

roles/waybar/files/waybar/modules/kubernetes.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+context=$(kubectx -c)
+namespace=$(kubens -c)
+
+if [[ $namespace == "default" ]]
+then
+  echo "$context"
+else
+  echo "$context - $namespace"
+fi

roles/waybar/templates/style.j2

@@ -58,7 +58,7 @@ window {
     margin:     0px 16px 0px 0px;
 }
 
-#tray, #custom-spotify {
+#tray, #custom-spotify, #custom-kubernetes {
     margin:     0px 0px 0px 16px;
 }