noidea im just tryna do something

3 files changed, 28 insertions, 36 deletions

diff --git a/common/modules/mango/scripts.nix b/common/modules/mango/scripts.nix
index 4fe7e2d..4379313 100644
--- a/common/modules/mango/scripts.nix
+++ b/common/modules/mango/scripts.nix
@@ -107,9 +107,12 @@ let
         xrdb -merge "$HOME/.Xresources"
         fi
 
-        ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
-          [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
-        ''}
+        ${lib.optionalString
+          (config.beeMods.terminal.default == "foot" || config.beeMods.terminal.default == "ghostty")
+          ''
+            [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
+          ''
+        }
     }
 
     cmd_wall() {
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 79a62b1..de39a06 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -53,7 +53,7 @@ in
             };
             ghostty = lib.mkIf config.beeMods.terminal.ghostty {
               template = "ghostty-colors.conf";
-              target = "~/.config/ghostty/colors.conf";
+              target = "~/.config/ghostty/themes/matugen";
             };
             zen = {
               template = "userChrome.css";
@@ -63,10 +63,12 @@ in
               template = "colors-xresources";
               target = "~/.config/x11/matugen.Xresources";
             };
-            sequences = lib.mkIf (config.beeMods.terminal.default == "foot") {
-              template = "sequences";
-              target = "~/.config/sequences";
-            };
+            sequences =
+              lib.mkIf (config.beeMods.terminal.default == "foot" || config.beeMods.terminal.default == "ghostty")
+                {
+                  template = "sequences";
+                  target = "~/.config/sequences";
+                };
           };
         };
       };
@@ -180,11 +182,14 @@ in
                 output_path = "~/.config/matugen/neovim_matugen.json"
               ''}
 
-              ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
-                [templates.sequences]
-                input_path = '~/.config/matugen/templates/sequences'
-                output_path = '~/.config/wallust/templates/sequences'
-              ''}
+              ${lib.optionalString
+                (config.beeMods.terminal.default == "foot" || config.beeMods.terminal.default == "ghostty")
+                ''
+                  [templates.sequences]
+                  input_path = '~/.config/matugen/templates/sequences'
+                  output_path = '~/.config/wallust/templates/sequences'
+                ''
+              }
 
               ${lib.optionalString config.beeMods.bspwm.enable ''
                 [templates.bspwm]
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index 7ab94e6..c47e991 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -11,34 +11,13 @@ in
       enable = true;
       enableFishIntegration = true;
       settings = {
-        config-file = lib.optionals config.beeMods.matugen.enable [ "~/.config/ghostty/colors.conf" ];
+        theme = lib.optionalString config.beeMods.matugen.enable "matugen";
 
         font-family = cfg.font.family;
         font-size = cfg.font.size;
-        alpha-blending = "linear";
+        # alpha-blending = "linear";
         window-padding-x = cfg.window.padding-x;
         window-padding-y = cfg.window.padding-y;
-        font-feature = [
-          "cv10"
-          "cv06"
-          "ss02"
-          "ss03"
-        ]
-        ++ (
-          if cfg.font.ligatures then
-            [
-              "calt"
-              "liga"
-              "dlig"
-            ]
-          else
-            [
-              "-calt"
-              "-liga"
-              "-dlig"
-            ]
-        );
-        bold-is-bright = cfg.font.bright_color_is_bold;
         gtk-titlebar = false;
         gtk-single-instance = true;
         gtk-tabs-location = "bottom";
@@ -47,7 +26,12 @@ in
         copy-on-select = false;
         confirm-close-surface = false;
         mouse-hide-while-typing = true;
+        window-decoration = "none";
         window-inherit-working-directory = false;
+        app-notifications = [
+          "no-clipboard-copy"
+          "no-config-reload"
+        ];
       };
     };
   };