diff --git a/home/Monarch/tux.nix b/home/Monarch/tux.nix
index d5d3d275..031acd66 100644
--- a/home/Monarch/tux.nix
+++ b/home/Monarch/tux.nix
@@ -16,9 +16,12 @@
 
   home.packages = [pkgs.gcc];
 
-  programs.zsh.shellAliases.update = "home-manager switch";
-  programs.zsh.envExtra = ''
-    export CC=${pkgs.gcc}/bin/gcc
-    eval "$(/opt/homebrew/bin/brew shellenv)"
-  '';
+  programs.fish.shellAbbrs.update = "home-manager switch";
+  programs.zsh = {
+    shellAliases.update = "home-manager switch";
+    sessionVariables.CC = "${pkgs.gcc}/bin/gcc";
+    envExtra = ''
+      eval "$(/opt/homebrew/bin/brew shellenv)"
+    '';
+  };
 }
diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix
index 1526d515..9db3bd8c 100644
--- a/home/Vanguard/xenia.nix
+++ b/home/Vanguard/xenia.nix
@@ -3,10 +3,7 @@
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
-  home.packages = with pkgs; [
-    prismlauncher
-    nomachine-client
-  ];
+  home.packages = with pkgs; [prismlauncher nomachine-client];
 
   programs.fish.shellAbbrs.hypr = "exec Hyprland";
   xdg.configFile."hypr/hyprpaper.conf".text = ''
diff --git a/home/env/bat.nix b/home/env/bat.nix
index bc8f41c9..96cb1792 100644
--- a/home/env/bat.nix
+++ b/home/env/bat.nix
@@ -2,9 +2,17 @@
   programs.bat = {
     enable = true;
     config = {
-      theme = "Catppuccin-macchiato";
+      theme = "tokyonight";
     };
     themes = {
+      tokyonight = builtins.readFile (pkgs.fetchFromGitHub
+        {
+          owner = "folke";
+          repo = "tokyonight.nvim";
+          rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+          sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+        }
+        + "/extras/sublime/tokyonight_storm.tmTheme");
       Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
         {
           owner = "catppuccin";
diff --git a/home/env/fish.nix b/home/env/fish.nix
index c758d1f9..8439628f 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -1,10 +1,23 @@
-{...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
     shellAbbrs = {
       lg = "lazygit";
       nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch";
     };
+    plugins = [
+      {
+        name = "tokyonight";
+        src =
+          pkgs.fetchFromGitHub {
+            owner = "folke";
+            repo = "tokyonight.nvim";
+            rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+            sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+          }
+          + "/extras/fish/tokyonight_storm.fish";
+      }
+    ];
   };
   programs.keychain.enableFishIntegration = true;
   programs.starship.enableFishIntegration = true;
diff --git a/home/env/zsh.nix b/home/env/zsh.nix
index cd94ea9d..7a7230ac 100644
--- a/home/env/zsh.nix
+++ b/home/env/zsh.nix
@@ -1,15 +1,19 @@
 {config, ...}: {
   programs.zsh = {
     enable = true;
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    enableSyntaxHighlighting = true;
+    enableVteIntegration = true;
+    autocd = true;
+    dotDir = ".config/zsh";
+    historySubstringSearch.enable = true;
     shellAliases = {
       ll = "ls -l";
       lg = "lazygit";
       nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch";
     };
-    history = {
-      size = 10000;
-      path = "${config.xdg.dataHome}/zsh/history";
-    };
+    history.path = "${config.xdg.dataHome}/zsh/history";
   };
   programs.keychain.enableZshIntegration = true;
   programs.starship.enableZshIntegration = true;
diff --git a/home/git/common.nix b/home/git/common.nix
index c3ba232f..a351ce16 100644
--- a/home/git/common.nix
+++ b/home/git/common.nix
@@ -1,14 +1,33 @@
-{...}: {
+{pkgs, ...}: {
+  imports = [../env/bat.nix];
+  xdg.configFile."git/tokyonight_storm.gitconfig".source =
+    pkgs.fetchFromGitHub
+    {
+      owner = "folke";
+      repo = "tokyonight.nvim";
+      rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+      sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+    }
+    + "/extras/delta/tokyonight_storm.gitconfig";
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
+    includes = [{path = "tokyonight_storm.gitconfig";}];
     delta = {
       enable = true;
-      options.syntax-theme = "Catppuccin-macchiato";
+      options = {
+        blame-code-style = "syntax";
+        line-numbers = true;
+        navigate = true;
+        side-by-side = true;
+        syntax-theme = "tokyonight";
+        zero-style = "dim syntax";
+      };
     };
     extraConfig = {
       pull.rebase = false;
       init.defaultBranch = "main";
+      credential.helper = "store";
     };
   };
 }