diff --git a/system/home/alacritty/default.nix b/system/home/alacritty/default.nix
index 32c572a1..48bf8936 100644
--- a/system/home/alacritty/default.nix
+++ b/system/home/alacritty/default.nix
@@ -3,6 +3,7 @@
   programs.alacritty = {
     enable = true;
     settings = {
+      shell = "${config.programs.fish.package}/bin/fish";
       font = {
         size = fonts.sizes.applications;
         normal = {
@@ -45,28 +46,22 @@
         in
         {
           draw_bold_text_with_bright_colors = false;
-          primary = with config.scheme; {
-            background = "0x${base00}";
-            foreground = "0x${base05}";
+          primary = {
+            background = "0x${config.scheme.base00}";
+            foreground = "0x${config.scheme.base05}";
           };
-          cursor = with config.scheme; {
-            cursor = "0x${base05}";
-            text = "0x${base00}";
+          cursor = {
+            cursor = "0x${config.scheme.base05}";
+            text = "0x${config.scheme.base00}";
           };
-          normal =
-            with config.scheme;
-            {
-              black = "0x${base00-hex}";
-              white = "0x${base05-hex}";
-            }
-            // mapNamedColours;
-          bright =
-            with config.scheme;
-            {
-              black = "0x${base03-hex}";
-              white = "0x${base07-hex}";
-            }
-            // mapNamedBrightColours;
+          normal = {
+            black = "0x${config.scheme.base00-hex}";
+            white = "0x${config.scheme.base05-hex}";
+          } // mapNamedColours;
+          bright = {
+            black = "0x${config.scheme.base03-hex}";
+            white = "0x${config.scheme.base07-hex}";
+          } // mapNamedBrightColours;
         };
     };
   };