diff --git a/hosts/riscake/configuration.nix b/hosts/riscake/configuration.nix
index 090074c..6f4a437 100644
--- a/hosts/riscake/configuration.nix
+++ b/hosts/riscake/configuration.nix
@@ -57,6 +57,8 @@
         };
 
       extraConfig = ''
+        yabai -m signal --add app='^Ghostty$' event=window_created action='yabai -m space --layout bsp'
+        yabai -m signal --add app='^Ghostty$' event=window_destroyed action='yabai -m space --layout bsp'
         yabai -m rule --add app='System Settings' manage=off
         yabai -m rule --add app='Finder' manage=off
       '';
diff --git a/modules/shared/home-manager/fish.nix b/modules/shared/home-manager/fish.nix
index a3d3a78..3de74e9 100644
--- a/modules/shared/home-manager/fish.nix
+++ b/modules/shared/home-manager/fish.nix
@@ -2,6 +2,11 @@
 
 {
   programs = {
+    atuin = {
+      enable = true;
+      daemon.enable = true;
+    };
+
     dircolors = {
       enable = false;
       enableFishIntegration = config.programs.fish.enable;
@@ -46,19 +51,21 @@
       settings = {
         command_timeout = 3000;
         format = "$username$hostname$nix_shell$character";
-        right_format = "$directory$git_branch$git_commit$git_state$git_status";
+        right_format = "$directory$git_branch$git_state$git_commit$git_status";
 
         character = {
-          success_symbol = "[♥](bold green)";
-          error_symbol = "[♥](bold red)";
-          vimcmd_symbol = "[♡](bold purple)";
-          vimcmd_replace_symbol = "[♡](bold green)";
-          vimcmd_replace_one_symbol = "[♡](bold green)";
-          vimcmd_visual_symbol = "[♡](bold yellow)";
+          success_symbol = "[ ♥ ](fg:black bg:cyan)";
+          error_symbol = "[ ♥ ](fg:black bg:red)";
+          vimcmd_symbol = "[ ♡ ](fg:black bg:purple)";
+          vimcmd_replace_symbol = "[ ♡ ](fg:black bg:green)";
+          vimcmd_replace_one_symbol = "[ ♡ ](fg:black bg:green)";
+          vimcmd_visual_symbol = "[ ♡ ](fg:black bg:yellow)";
         };
 
         username = {
-          format = "[$user]($style) ";
+          style_user = "bg:purple fg:black";
+          style_root = "bg:red fg:black";
+          format = "[ $user ]($style)";
           disabled = false;
           show_always = true;
         };
@@ -70,23 +77,33 @@
           disabled = false;
         };
 
-        git_commit.format = ''( [\($hash$tag\)]($style))'';
-        git_state.format = " [\\($state( $progress_current/$progress_total)\\)]($style)";
+        git_commit = {
+          style = "fg:black bg:purple";
+          format = ''[ $hash$tag ]($style)'';
+        };
+
+        git_state = {
+          style = "fg:black bg:red";
+          format = "[ $state $progress_current/$progress_total ]($style)";
+        };
 
         git_status = {
-          ahead = "↑";
-          behind = "↓";
+          style = "fg:black bg:red";
+          ahead = "▲";
+          behind = "▼";
           conflicted = "±";
           deleted = "×";
-          diverged = "↕";
+          diverged = "◊";
+          up_to_date = "√";
           modified = "‼";
           renamed = "≡";
-          stashed = "⌂";
-          format = ''( [\[$all_status$ahead_behind\]]($style))'';
+          stashed = "▽";
+          format = ''[ $all_status$ahead_behind ]($style)'';
         };
 
         git_branch = {
-          format = " → [$symbol$branch(:$remote_branch)]($style)";
+          style = "fg:black bg:green";
+          format = "[ $symbol$branch(:$remote_branch) ]($style)";
           symbol = "";
         };
 
@@ -94,11 +111,16 @@
         line_break.disabled = true;
 
         directory = {
-          read_only = "(ro)";
-          format = "[$read_only]($read_only_style) [$path]($style)";
+          style = "bg:blue fg:black";
+          read_only_style = "bg:red fg:black";
+          read_only = " RO ";
+          format = "[$read_only]($read_only_style)[ $path ]($style)";
         };
 
-        nix_shell.format = "[(\\($name\\))]($style) ";
+        nix_shell = {
+          style = "fg:black bg:yellow";
+          format = "[ $name ]($style)";
+        };
       };
     };
 
diff --git a/users/moni/home.nix b/users/moni/home.nix
index d8e88b0..df27ee1 100644
--- a/users/moni/home.nix
+++ b/users/moni/home.nix
@@ -25,21 +25,6 @@
     };
   };
 
-  xdg.configFile."ghostty/testing.glsl".text = ''
-    void mainImage(out vec4 fragColor, in vec2 fragCoord)
-    {
-            vec2 uv = fragCoord.xy / iResolution.xy;
-            vec3 gradientStartColor = vec3(0.188,0.204,0.275);
-            vec3 gradientEndColor = vec3(0.067,0.067,0.106);
-            float mixValue = distance(uv, vec2(0.25, 0.5));
-            vec3 gradientColor = mix(gradientStartColor, gradientEndColor, mixValue);
-            vec4 terminalColor = texture(iChannel0, uv);
-            float mask = 1.0 - step(0.5, dot(terminalColor.rgb, vec3(1.0)));
-            vec3 blendedColor = mix(terminalColor.rgb, gradientColor, mask);
-            fragColor = vec4(blendedColor, terminalColor.a);
-    }
-  '';
-
   programs = {
     fish = {
       interactiveShellInit = ''