Debloat

1 files changed, 57 insertions, 57 deletions

diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix
index c592226..4d7106e 100644
--- a/common/modules/matugen/templates/matugen-terminal.nix
+++ b/common/modules/matugen/templates/matugen-terminal.nix
@@ -11,34 +11,33 @@
           [colors-dark]
           foreground={{colors.on_surface.default.hex_stripped}}
           <* if {{ is_dark_mode }} *>
-          background={{colors.background.default.hex_stripped}}
+          background={{colors.surface.default.hex_stripped}}
           <* else *>
-          background={{colors.surface_container.default.hex_stripped}}
+          background={{colors.surface_container_low.default.hex_stripped}}
           <* endif *>
-          selection-foreground={{colors.on_surface.default.hex_stripped}}
+          selection-foreground={{colors.on_primary_container.default.hex_stripped}}
           selection-background={{colors.primary_container.default.hex_stripped}}
-          cursor = {{colors.background.default.hex_stripped}} {{colors.primary.default.hex_stripped}}
+          cursor = {{colors.on_primary.default.hex_stripped}} {{colors.primary.default.hex_stripped}}
 
-          regular0=\{{color0[1:]}}
-          regular1=\{{color1[1:]}}
-          regular2=\{{color2[1:]}}
-          regular3=\{{color3[1:]}}
-          regular4=\{{color4[1:]}}
-          regular5=\{{color5[1:]}}
-          regular6=\{{color6[1:]}}
-          regular7=\{{color7[1:]}}
+          regular0={{colors.surface_container_high.default.hex_stripped}}
+          regular1={{colors.error.default.hex_stripped}}
+          regular2={{colors.primary.default.hex_stripped}}
+          regular3={{colors.tertiary.default.hex_stripped}}
+          regular4={{colors.secondary.default.hex_stripped}}
+          regular5={{colors.primary_fixed.default.hex_stripped}}
+          regular6={{colors.secondary_fixed.default.hex_stripped}}
+          regular7={{colors.on_surface_variant.default.hex_stripped}}
 
-          bright0=\{{color8[1:]}}
-          bright1=\{{color9[1:]}}
-          bright2=\{{color10[1:]}}
-          bright3=\{{color11[1:]}}
-          bright4=\{{color12[1:]}}
-          bright5=\{{color13[1:]}}
-          bright6=\{{color14[1:]}}
-          bright7=\{{color15[1:]}}
+          bright0={{colors.outline.default.hex_stripped}}
+          bright1={{colors.error.default.hex_stripped | to_color | lighten: 10.0}}
+          bright2={{colors.primary_container.default.hex_stripped}}
+          bright3={{colors.tertiary_container.default.hex_stripped}}
+          bright4={{colors.secondary_container.default.hex_stripped}}
+          bright5={{colors.inverse_primary.default.hex_stripped}}
+          bright6={{colors.outline_variant.default.hex_stripped}}
+          bright7={{colors.on_surface.default.hex_stripped}}
 
-
-          dim-blend-towards=<* if {{ is_dark_mode }} *>black<* else *>white<* endif *>
+          # dim-blend-towards=<* if {{ is_dark_mode }} *>black<* else *>white<* endif *>
         '';
       };
     })
@@ -49,7 +48,7 @@
           <* if {{ is_dark_mode }} *>
           background = '{{colors.background.default.hex}}'
           <* else *>
-          background = '{{colors.surface_container.default.hex}}'
+          background = '{{colors.surface_container_low.default.hex}}'
           <* endif *>
           foreground = '{{colors.on_surface.default.hex}}'
 
@@ -62,56 +61,57 @@
           cursor = '{{colors.primary.default.hex}}'
 
           [colors.normal]
-          black   = "\{{color0}}"
-          red     = "\{{color1}}"
-          green   = "\{{color2}}"
-          yellow  = "\{{color3}}"
-          blue    = "\{{color4}}"
-          magenta = "\{{color5}}"
-          cyan    = "\{{color6}}"
-          white   = "\{{color7}}"
+          black   = '{{colors.surface_container_high.default.hex}}'
+          red     = '{{colors.error.default.hex}}'
+          green   = '{{colors.primary.default.hex}}'
+          yellow  = '{{colors.tertiary.default.hex}}'
+          blue    = '{{colors.secondary.default.hex}}'
+          magenta = '{{colors.primary_fixed.default.hex}}'
+          cyan    = '{{colors.secondary_fixed.default.hex}}'
+          white   = '{{colors.on_surface_variant.default.hex}}'
 
           [colors.bright]
-          black   = "\{{color8}}"
-          red     = "\{{color9}}"
-          green   = "\{{color10}}"
-          yellow  = "\{{color11}}"
-          blue    = "\{{color12}}"
-          magenta = "\{{color13}}"
-          cyan    = "\{{color14}}"
-          white   = "\{{color15}}"
+          black   = '{{colors.outline.default.hex}}'
+          red     = '{{colors.error_container.default.hex | to_color | lighten: 10.0}}'
+          green   = '{{colors.primary_container.default.hex}}'
+          yellow  = '{{colors.tertiary_container.default.hex}}'
+          blue    = '{{colors.secondary_container.default.hex}}'
+          magenta = '{{colors.inverse_primary.default.hex}}'
+          cyan    = '{{colors.outline_variant.default.hex}}'
+          white   = '{{colors.on_surface.default.hex}}'
+
         '';
       };
     })
     (lib.mkIf config.beeMods.terminal.ghostty {
-      xdg.configFile."matugen/templates/ghostty.conf" = {
+      xdg.configFile."matugen/templates/ghostty-colors.conf" = {
         text = ''
           <* if {{ is_dark_mode }} *>
           background = {{colors.background.default.hex}}
           <* else *>
-          background = {{colors.surface_container.default.hex}}
+          background = {{colors.surface_container_low.default.hex}}
           <* endif *>
           foreground = {{colors.on_surface.default.hex}}
           cursor-color = {{colors.primary.default.hex}}
           selection-background = {{colors.primary_container.default.hex}}
           selection-foreground = {{colors.on_surface.default.hex}}
 
-          palette = 0=\{{color0}}
-          palette = 1=\{{color1}}
-          palette = 2=\{{color2}}
-          palette = 3=\{{color3}}
-          palette = 4=\{{color4}}
-          palette = 5=\{{color5}}
-          palette = 6=\{{color6}}
-          palette = 7=\{{color7}}
-          palette = 8=\{{color8}}
-          palette = 9=\{{color9}}
-          palette = 10=\{{color10}}
-          palette = 11=\{{color11}}
-          palette = 12=\{{color12}}
-          palette = 13=\{{color13}}
-          palette = 14=\{{color14}}
-          palette = 15=\{{color15}}
+          palette = 0={{colors.surface_container_high.default.hex}}
+          palette = 1={{colors.error.default.hex}}
+          palette = 2={{colors.primary.default.hex}}
+          palette = 3={{colors.tertiary.default.hex}}
+          palette = 4={{colors.secondary.default.hex}}
+          palette = 5={{colors.primary_fixed.default.hex}}
+          palette = 6={{colors.secondary_fixed.default.hex}}
+          palette = 7={{colors.on_surface_variant.default.hex}}
+          palette = 8={{colors.outline.default.hex}}
+          palette = 9={{colors.error_container.default.hex | to_color | lighten: 10.0}}
+          palette = 10={{colors.primary_container.default.hex}}
+          palette = 11={{colors.tertiary_container.default.hex}}
+          palette = 12={{colors.secondary_container.default.hex}}
+          palette = 13={{colors.inverse_primary.default.hex}}
+          palette = 14={{colors.outline_variant.default.hex}}
+          palette = 15={{colors.on_surface.default.hex}}
         '';
       };
     })