diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index dc43db4..47769b1 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -8,8 +8,6 @@ noto-fonts-cjk-sans # gets japanese and chinese langs nerd-fonts.comic-shanns-mono # programming fonts corefonts # basic web fonts - - comic-neue ]; }; } diff --git a/stow/.config/fastfetch/ascii.txt b/stow/.config/fastfetch/ascii.txt index c557d4c..492247a 100644 --- a/stow/.config/fastfetch/ascii.txt +++ b/stow/.config/fastfetch/ascii.txt @@ -1,19 +1,19 @@ -$4⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀$3⡀$4 ⡣⠨⡂⠄⠠⠠⠠⡀⡂⠄⠄⠄⢄⢀⢀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⠀⠀⠀⢀⠠⠨ $3⡡$4⢪⠂⡃⠔⡨⠨⡨⠨⡐⠌⠌⢌⠊⠔⡐⡐⡡⢂⢑⢐⠄⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠄⠄⢆⠁⡀⠨⠨⡐⡐$3⢅$4⠊⠄⠕⡐⠡⡂⡑⠄⢅⠅⠕⡨⢈⢂⢂⠢⢂⠅⡂⡪⠨$3⡀$4⠂⠠⠀⢠⠠⢒⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⠀⡠⠊⢄⠅⢅⢂⠎⡐$3⡡$4⢑⠡⠊⢔⠐⡌⢌⢂⠪⢐⠌⠔⡐⡡⠨⠂⠌⡂⡂$3⠅$4⢌⠢⠐⠐⠣⡘⣸⢈⠢⠐⠀⠀⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠠⢁⠢⡡⠡⢊⢐⠔⡡⢂$3⠊$4⠔⡨⢌⢂⠕⡨⠐⠄⢕⢐⠜⠌⠔⡐⡡⠕⠡⠠$3⠠$4⡈⢀⠈⢀⠐⠈⠄⡇⠢⡡⢑⠒⠐⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠠⡁⡪⢐⠌⢌⢂⢆⡇⡢⢂⠕⡁⡪⢂⢢⢑⢐⠅⡕⠕⠁⢕⠡⢑⢐⠒⢱⠡⢑$3⠡$4⠨⢂⠌⠢⢐⠄⠘⡌⢌⢂⠅⢪⢀⠀⠀⠀⠀⠀⠀ -$4⠀⠀⡢⢊⠔⢡⠪⡐⠔⡮⣺⢐⢐⠌⠔⠅⠕⢕⢐⢅$1⠘⠁⡀⠂$4⡇⠌⡂⠎$1⡀$4⡌⢌⢂⠅$3⠕$4⠡⠨⢊⠔⡈⡂⡰⢐⢐⠅⠅⡀⠁⠄⠀⠀⠀⠀ -$4⠀⢐⠌⡂⢮⡫⢂⠪⡰⣝⢮⡣⢂⠅⢍⠈⡰$2⣖⣵⡗⠣$1⠁$4⢀⠀⠇⠅⡊$1⢀⠁⠀$4⠒⡰⡈⣎⢌⢊⠔⢔⠨⡐⢵⡐⡡⠨⡊⡀⠀⠀⠀⠀⠀⠀ -$4⠀⠕⠌⠂⢸⠐⢅⢊⠎⠊⡗⣱⢐⠡⡂⣜⠁$2⣜⢷⣳⢂$1⠐$4⠀⠠⠨$1⠈⡀⢀$2⠨⣫⣖⢦$4⢊⢨⢂⢂⠇⢅⠊⢜⡮⡺⡌⢌⡖⡐⠀⠀⠀⠀⠀⠀ -$4⠈⠈⠀⠀⠆⢕⠡⢢⠀⠸⢨⢚⢄⢑$1⠠⠐⠀$2⠣⣱⠑⠀$1⠄⠈⠀⠄⠂⠀⡀$2⢰⣗⣧⡉⢧$4⢐⠢⢭⠃⢅⢊⢇⠫⡫$5⡎⡢⢏⢆⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⢕⠡⢊⢮⡂⠀⢊⠪⡢⢢$1⠀⠄⠂⢀⠀⠄⠁⡀⢈⠀⠄⠐⠀⡀$2⢇⠗⡵⠁⢵⠀$4⡽⣱⠡⡑⡌⠆⡆$5⠫⡎⡄⢸⡐⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⡃⡊⡢⡗⠀⠀⠀⠀⢂⢕$1⠀⠄⠂⠀⠄⠐⠀⡀⠠⠀⠆⢀⠁⢀⠀⠡⠀⠄⠂$4⡸⡝⡮$5⡂⡲⠘⠈⠁⠘⠑⢀⢠⠇⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⢐⢑⠜⠀⠀⠀⠀⠀⠀⠂$1⠈⠠⢀⢁⠀⠂⠁⢀⠠⠐⡀⠄⠐⠀⡀⢁⠐⠀⢢$4⡫⡳$5⡱⡈$3⢀⢄⠅$5⠀⠠⠀⠀⠈⠠⠀⠀⠀⠀⠀⠀ -$4⠀⠀⠀⠀⠀⢅⠅⠀⠀⠀⠀⠀⠀⠀$1⠀⠀⠀⠀⠂⣄⡁⡀⠄⠂⢀⠠⠐⠀⢄⢠⡰⡸$4⣜⠮$5⡃⡆⠀⠀$3⠁⠁$5⠀⢀⠀⠈⢀⠀⠁⠀⠄⠠⠀⡀ -$5⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⡖⡌⢣⡒⡖⡆⡎⡏⡍⠔ $5⣅⠀⠈⠀⠐⡈⠀⠀$3⠸⣪$5⠀⢠⠉⢪⠪⡱⠐ -$6⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠀⠄⠀$6⡀⣄⣼⣿⣿⡌⡆⡣⢣⡱⡣⢣⠩⡊⢆⢑⠌⢀⠝⡌$5⠌⢇⢧⢓⢄⠁⠀⠀⡀⠠⠀⠀⡀⢨⢊⠈⠀⠀⠀ -$6⠀⠀⠀⠀⠀⠀⠀⠀⠠⠁⠀⠠⠀$6⢮⣟⣔⢮⣖⢽$7⣝⢮⡢⡓⢜⣜⢮$6⢬⣀⢶⠀⠈⠑⡀⠂⢱⠁$5⡔⢔⢑⢄⢅⢀⡀⠠⡠⠐⠁⠁⠁⠀⠀⠀ -$6⠀⠀⠀⠀⠀⠀⠀⠠⠁⡀⠈⡀⠀$6⣟⣞⣞⢞⡮$7⡷⡽$8⣿⣿⣿⣿⣿$7⡽⣕$6⢷⢝⣖⡌⠀⠀⠠⠁⠠$5⠨⠢⠃⠑⠨⠢⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -$6⠀⠀⠀⠀⠀⠀⣠⣡⣾⡀⠄⠐⠀$6⢗⡷⣝⣗$7⡯⡯$8⣿⣿⣿⣿⣿⣿⣿$7⢽⢽$6⣕⣗⠀⠄⠈⢀⠀⠡⠀⠅⠀⡢⠀⢨⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + kOOO000000000000000000000000KXXXOdddd + OkO00000Ok0000000000kk00000O00000kdodkOOKK + kO00kk0000kkkkkO000OOkOOk000xdO000000Oxk0000 + kO00Ok0Oxdc:xK0OO0000kodoclddO0kO0OO000kdO000 + Olddkxodd:;;:clOKOxkkkklcc::cdkdlloddddxxlk000 + 0Oodxxxk00xkkO00K000OO000K0OOO00O0OOOOOOOOkkkkO +OOO000000000xk0000kodddddddxxdoxkOOO00OO000KKKKKKKKKKK0x +OOO000OO000KKKK00KdloodooodddxdxxkOkOOkkxkkkxxxxxxddkKKK + kloddddooxxxO0OOOkxoxkkkkkkkxxkxxxxO + ooooodddold00000000kk000000000OOOOOO00O + oolloddddlx00000000Od000000000000000000 + ollooddolx000000000dO00000000000000000 + od0xooolk000000OOOdxO0000000000000000 + xdXKxolxO00000000dkOO000000000000000 + 0dO000000000dO00000000000000000 + xkOOOOOOOOkoOO0000000OOOOOOOOO + xOOOOOOOOOkdOOOOOOOOOOOOOOOOOk + bwaaa~ 00KK000000O0KK0k00000000000Od + O0KK000000k kO0K00000000dd diff --git a/stow/.config/fastfetch/config.jsonc b/stow/.config/fastfetch/config.jsonc index f8f28b8..f99849a 100644 --- a/stow/.config/fastfetch/config.jsonc +++ b/stow/.config/fastfetch/config.jsonc @@ -4,18 +4,7 @@ "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": " ", diff --git a/stow/.config/matugen/custom.json b/stow/.config/matugen/custom.json index 3d66f10..ecb9c29 100644 --- a/stow/.config/matugen/custom.json +++ b/stow/.config/matugen/custom.json @@ -1,5 +1,4 @@ { - "font": "Comic Neue", - "monospace_font": "ComicShannsMono Nerd Font", - "rounding": 0 + "font": "ComicShannsMono Nerd Font", + "rounding": 10 } diff --git a/stow/.config/matugen/templates/colors.css b/stow/.config/matugen/templates/colors.css index 329229c..5c08d26 100644 --- a/stow/.config/matugen/templates/colors.css +++ b/stow/.config/matugen/templates/colors.css @@ -4,7 +4,7 @@ */ * { - font-family: {{ font }}, {{monospace_font}}; + font-family: {{ font }}; border-radius: {{ rounding }}px; } diff --git a/stow/.config/matugen/templates/discord.css b/stow/.config/matugen/templates/discord.css index a592426..3618918 100644 --- a/stow/.config/matugen/templates/discord.css +++ b/stow/.config/matugen/templates/discord.css @@ -18,7 +18,6 @@ :root { /* font, change to 'gg sans' for default discord font*/ --font: '{{ font }}'; - --code-font: '{{ monospace_font }}'; /* top left corner text */ --corner-text: 'Midnight'; @@ -92,10 +91,6 @@ body { font-family: '{{ font }}'; } -code { - font-family: '{{monospace_font}}'; -} - /* Selected chat/friend text */ .selected_f5eb4b, .selected_f6f816 .link_d8bfb3 { diff --git a/stow/.config/matugen/templates/ghostty b/stow/.config/matugen/templates/ghostty index 36c1e94..ea7d03c 100644 --- a/stow/.config/matugen/templates/ghostty +++ b/stow/.config/matugen/templates/ghostty @@ -1,2 +1 @@ background = {{colors.background.default.hex}} -font-family = {{monospace_font}} diff --git a/stow/.config/matugen/templates/sketchybar.sh b/stow/.config/matugen/templates/sketchybar.sh index c795bb3..6556fa4 100644 --- a/stow/.config/matugen/templates/sketchybar.sh +++ b/stow/.config/matugen/templates/sketchybar.sh @@ -1,16 +1,6 @@ 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 }}" diff --git a/stow/.config/sketchybar/plugins/space.sh b/stow/.config/sketchybar/plugins/space.sh index 7614cf3..5381e9f 100755 --- a/stow/.config/sketchybar/plugins/space.sh +++ b/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_CONTAINER_COLOUR label.color=$ON_PRIMARY_CONTAINER_COLOUR label.padding_left=15 label.padding_right=15 + sketchybar --set $NAME background.color=$PRIMARY_COLOUR label.color=$BACKGROUND_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 diff --git a/stow/.config/sketchybar/sketchybarrc b/stow/.config/sketchybar/sketchybarrc index 60bb1bc..1486c2c 100755 --- a/stow/.config/sketchybar/sketchybarrc +++ b/stow/.config/sketchybar/sketchybarrc @@ -13,7 +13,7 @@ sketchybar --bar \ corner_radius=0 \ default=( - icon.font="$MONOSPACE_FONT:Regular:16.0" + icon.font="ComicShannsMono Nerd Font:Regular:16.0" label.font="$FONT:Bold:12.0" label.color=$PRIMARY_COLOUR icon.color=$SECONDARY_COLOUR