sketchybar: make workspace indictators use same colours as waybar

This reverts commit 9e6c436853.

modules/desktop/fonts.nix

@@ -8,6 +8,8 @@
       noto-fonts-cjk-sans       # gets japanese and chinese langs
       nerd-fonts.comic-shanns-mono # programming fonts
       corefonts                 # basic web fonts
+
+      comic-neue
     ];
   };
 }

stow/.config/fastfetch/ascii.txt

@@ -1,19 +1,19 @@
-               kOOO000000000000000000000000KXXXOdddd
+$4⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀$3⡀$4  ⡣⠨⡂⠄⠠⠠⠠⡀⡂⠄⠄⠄⢄⢀⢀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-              OkO00000Ok0000000000kk00000O00000kdodkOOKK
+$4⠀⠀⠀⠀⠀⠀⠀⢀⠠⠨ $3⡡$4⢪⠂⡃⠔⡨⠨⡨⠨⡐⠌⠌⢌⠊⠔⡐⡐⡡⢂⢑⢐⠄⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-            kO00kk0000kkkkkO000OOkOOk000xdO000000Oxk0000
+$4⠀⠀⠀⠄⠄⢆⠁⡀⠨⠨⡐⡐$3⢅$4⠊⠄⠕⡐⠡⡂⡑⠄⢅⠅⠕⡨⢈⢂⢂⠢⢂⠅⡂⡪⠨$3⡀$4⠂⠠⠀⢠⠠⢒⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-           kO00Ok0Oxdc:xK0OO0000kodoclddO0kO0OO000kdO000
+$4⠀⠀⠀⠀⠀⡠⠊⢄⠅⢅⢂⠎⡐$3⡡$4⢑⠡⠊⢔⠐⡌⢌⢂⠪⢐⠌⠔⡐⡡⠨⠂⠌⡂⡂$3⠅$4⢌⠢⠐⠐⠣⡘⣸⢈⠢⠐⠀⠀⠀⠀⠀⠀⠀⠀
-          Olddkxodd:;;:clOKOxkkkklcc::cdkdlloddddxxlk000
+$4⠀⠀⠀⠠⢁⠢⡡⠡⢊⢐⠔⡡⢂$3⠊$4⠔⡨⢌⢂⠕⡨⠐⠄⢕⢐⠜⠌⠔⡐⡡⠕⠡⠠$3⠠$4⡈⢀⠈⢀⠐⠈⠄⡇⠢⡡⢑⠒⠐⠀⠀⠀⠀⠀⠀
-         0Oodxxxk00xkkO00K000OO000K0OOO00O0OOOOOOOOkkkkO
+$4⠀⠀⠠⡁⡪⢐⠌⢌⢂⢆⡇⡢⢂⠕⡁⡪⢂⢢⢑⢐⠅⡕⠕⠁⢕⠡⢑⢐⠒⢱⠡⢑$3⠡$4⠨⢂⠌⠢⢐⠄⠘⡌⢌⢂⠅⢪⢀⠀⠀⠀⠀⠀⠀
-OOO000000000xk0000kodddddddxxdoxkOOO00OO000KKKKKKKKKKK0x
+$4⠀⠀⡢⢊⠔⢡⠪⡐⠔⡮⣺⢐⢐⠌⠔⠅⠕⢕⢐⢅$1⠘⠁⡀⠂$4⡇⠌⡂⠎$1⡀$4⡌⢌⢂⠅$3⠕$4⠡⠨⢊⠔⡈⡂⡰⢐⢐⠅⠅⡀⠁⠄⠀⠀⠀⠀
-OOO000OO000KKKK00KdloodooodddxdxxkOkOOkkxkkkxxxxxxddkKKK
+$4⠀⢐⠌⡂⢮⡫⢂⠪⡰⣝⢮⡣⢂⠅⢍⠈⡰$2⣖⣵⡗⠣$1⠁$4⢀⠀⠇⠅⡊$1⢀⠁⠀$4⠒⡰⡈⣎⢌⢊⠔⢔⠨⡐⢵⡐⡡⠨⡊⡀⠀⠀⠀⠀⠀⠀
-                 kloddddooxxxO0OOOkxoxkkkkkkkxxkxxxxO
+$4⠀⠕⠌⠂⢸⠐⢅⢊⠎⠊⡗⣱⢐⠡⡂⣜⠁$2⣜⢷⣳⢂$1⠐$4⠀⠠⠨$1⠈⡀⢀$2⠨⣫⣖⢦$4⢊⢨⢂⢂⠇⢅⠊⢜⡮⡺⡌⢌⡖⡐⠀⠀⠀⠀⠀⠀
-                 ooooodddold00000000kk000000000OOOOOO00O
+$4⠈⠈⠀⠀⠆⢕⠡⢢⠀⠸⢨⢚⢄⢑$1⠠⠐⠀$2⠣⣱⠑⠀$1⠄⠈⠀⠄⠂⠀⡀$2⢰⣗⣧⡉⢧$4⢐⠢⢭⠃⢅⢊⢇⠫⡫$5⡎⡢⢏⢆⠀⠀⠀⠀⠀⠀
-                 oolloddddlx00000000Od000000000000000000
+$4⠀⠀⠀⠀⢕⠡⢊⢮⡂⠀⢊⠪⡢⢢$1⠀⠄⠂⢀⠀⠄⠁⡀⢈⠀⠄⠐⠀⡀$2⢇⠗⡵⠁⢵⠀$4⡽⣱⠡⡑⡌⠆⡆$5⠫⡎⡄⢸⡐⠀⠀⠀⠀⠀⠀
-                  ollooddolx000000000dO00000000000000000
+$4⠀⠀⠀⠀⡃⡊⡢⡗⠀⠀⠀⠀⢂⢕$1⠀⠄⠂⠀⠄⠐⠀⡀⠠⠀⠆⢀⠁⢀⠀⠡⠀⠄⠂$4⡸⡝⡮$5⡂⡲⠘⠈⠁⠘⠑⢀⢠⠇⠀⠀⠀⠀⠀⠀
-                   od0xooolk000000OOOdxO0000000000000000
+$4⠀⠀⠀⠀⢐⢑⠜⠀⠀⠀⠀⠀⠀⠂$1⠈⠠⢀⢁⠀⠂⠁⢀⠠⠐⡀⠄⠐⠀⡀⢁⠐⠀⢢$4⡫⡳$5⡱⡈$3⢀⢄⠅$5⠀⠠⠀⠀⠈⠠⠀⠀⠀⠀⠀⠀
-                    xdXKxolxO00000000dkOO000000000000000
+$4⠀⠀⠀⠀⠀⢅⠅⠀⠀⠀⠀⠀⠀⠀$1⠀⠀⠀⠀⠂⣄⡁⡀⠄⠂⢀⠠⠐⠀⢄⢠⡰⡸$4⣜⠮$5⡃⡆⠀⠀$3⠁⠁$5⠀⢀⠀⠈⢀⠀⠁⠀⠄⠠⠀⡀
-                         0dO000000000dO00000000000000000
+$5⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⡖⡌⢣⡒⡖⡆⡎⡏⡍⠔      $5⣅⠀⠈⠀⠐⡈⠀⠀$3⠸⣪$5⠀⢠⠉⢪⠪⡱⠐
-                          xkOOOOOOOOkoOO0000000OOOOOOOOO
+$6⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠀⠄⠀$6⡀⣄⣼⣿⣿⡌⡆⡣⢣⡱⡣⢣⠩⡊⢆⢑⠌⢀⠝⡌$5⠌⢇⢧⢓⢄⠁⠀⠀⡀⠠⠀⠀⡀⢨⢊⠈⠀⠀⠀
-                          xOOOOOOOOOkdOOOOOOOOOOOOOOOOOk
+$6⠀⠀⠀⠀⠀⠀⠀⠀⠠⠁⠀⠠⠀$6⢮⣟⣔⢮⣖⢽$7⣝⢮⡢⡓⢜⣜⢮$6⢬⣀⢶⠀⠈⠑⡀⠂⢱⠁$5⡔⢔⢑⢄⢅⢀⡀⠠⡠⠐⠁⠁⠁⠀⠀⠀
-     bwaaa~                00KK000000O0KK0k00000000000Od
+$6⠀⠀⠀⠀⠀⠀⠀⠠⠁⡀⠈⡀⠀$6⣟⣞⣞⢞⡮$7⡷⡽$8⣿⣿⣿⣿⣿$7⡽⣕$6⢷⢝⣖⡌⠀⠀⠠⠁⠠$5⠨⠢⠃⠑⠨⠢⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-                           O0KK000000k    kO0K00000000dd
+$6⠀⠀⠀⠀⠀⠀⣠⣡⣾⡀⠄⠐⠀$6⢗⡷⣝⣗$7⡯⡯$8⣿⣿⣿⣿⣿⣿⣿$7⢽⢽$6⣕⣗⠀⠄⠈⢀⠀⠡⠀⠅⠀⡢⠀⢨⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

stow/.config/fastfetch/config.jsonc

@@ -4,7 +4,18 @@
         "padding": {
             "top": 2,
             "right": 6
-        }
+        },
+        "color": {
+          "1": "38;5;231", // skin
+          "4": "38;5;217", // hair
+          "2": "38;5;206", // eyes
+          "3": "38;5;196", // hair tie
+          "5": "38;5;15", // kyubey
+          "6": "38;5;212", // clothes
+          "7": "38;5;241", // gem border
+          "8": "38;5;219", // gem inside
+          "9": "white",
+        },
     },
     "display": {
         "separator": " ",

stow/.config/matugen/custom.json

@@ -1,4 +1,5 @@
 {
-  "font": "ComicShannsMono Nerd Font",
+  "font": "Comic Neue",
-  "rounding": 10
+  "monospace_font": "ComicShannsMono Nerd Font",
+  "rounding": 0
 }

stow/.config/matugen/templates/colors.css

@@ -4,7 +4,7 @@
 */
 
 * {
-  font-family: {{ font }};
+  font-family: {{ font }}, {{monospace_font}};
   border-radius: {{ rounding }}px;
 }
 

stow/.config/matugen/templates/discord.css

@@ -18,6 +18,7 @@
 :root {
 	/* font, change to 'gg sans' for default discord font*/
 	--font: '{{ font }}';
+  --code-font: '{{ monospace_font }}';
 
 	/* top left corner text */
 	--corner-text: 'Midnight';
@@ -91,6 +92,10 @@ body {
   font-family: '{{ font }}';
 }
 
+code {
+  font-family: '{{monospace_font}}';
+}
+
 /* Selected chat/friend text */
 .selected_f5eb4b,
 .selected_f6f816 .link_d8bfb3 {

stow/.config/matugen/templates/ghostty

@@ -1 +1,2 @@
 background = {{colors.background.default.hex}}
+font-family = {{monospace_font}}

stow/.config/matugen/templates/sketchybar.sh

@@ -1,6 +1,16 @@
 export PRIMARY_COLOUR="0xFF{{colors.primary.default.hex_stripped}}"
+export PRIMARY_CONTAINER_COLOUR="0xFF{{colors.primary_container.default.hex_stripped}}"
+export ON_PRIMARY_CONTAINER_COLOUR="0xFF{{colors.on_primary_container.default.hex_stripped}}"
+
 export SECONDARY_COLOUR="0xFF{{colors.secondary.default.hex_stripped}}"
+export SECONDARY_CONTAINER_COLOUR="0xFF{{colors.secondary_container.default.hex_stripped}}"
+export ON_SECONDARY_CONTAINER_COLOUR="0xFF{{colors.on_secondary_container.default.hex_stripped}}"
+
+export TERTIARY_COLOUR="0xFF{{colors.tertiary.default.hex_stripped}}"
+export TERTIARY_CONTAINER_COLOUR="0xFF{{colors.tertiary_container.default.hex_stripped}}"
+export ON_TERTIARY_CONTAINER_COLOUR="0xFF{{colors.on_tertiary_container.default.hex_stripped}}"
+
 export BACKGROUND_COLOUR=0xFF"{{colors.background.default.hex_stripped}}"
 export FONT="{{ font }}"
-
+export MONOSPACE_FONT="{{ monospace_font }}"
 export ROUNDING="{{ rounding }}"

stow/.config/sketchybar/plugins/space.sh

@@ -4,7 +4,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/../colours.sh
 
 if [ $SELECTED = 'true' ]; then
-    sketchybar --set $NAME background.color=$PRIMARY_COLOUR label.color=$BACKGROUND_COLOUR label.padding_left=15 label.padding_right=15
+    sketchybar --set $NAME background.color=$PRIMARY_CONTAINER_COLOUR label.color=$ON_PRIMARY_CONTAINER_COLOUR label.padding_left=15 label.padding_right=15
 else
     sketchybar --set $NAME background.color=$BACKGROUND_COLOUR label.color=$PRIMARY_COLOUR label.padding_left=7 label.padding_right=7
 fi

stow/.config/sketchybar/sketchybarrc

@@ -13,7 +13,7 @@ sketchybar --bar \
 	corner_radius=0 \
 
 default=(
-  icon.font="ComicShannsMono Nerd Font:Regular:16.0"
+  icon.font="$MONOSPACE_FONT:Regular:16.0"
   label.font="$FONT:Bold:12.0"
   label.color=$PRIMARY_COLOUR
   icon.color=$SECONDARY_COLOUR