diff --git a/config/fish/conf.d/editor_environment.fish b/config/fish/conf.d/editor_environment.fish
deleted file mode 100644
index 2d9f120..0000000
--- a/config/fish/conf.d/editor_environment.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-set -q EDITOR || set -x EDITOR hx
-set -q VISUAL || set -x VISUAL $EDITOR
-set -q MANPAGER || set -x MANPAGER "bat -l man"
diff --git a/config/fish/conf.d/zoxide.fish b/config/fish/conf.d/zoxide.fish
deleted file mode 100644
index bb21e62..0000000
--- a/config/fish/conf.d/zoxide.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-if not status is-interactive && test "$CI" != true
-    exit
-end
-
-zoxide init fish | source
-alias cd="z"
diff --git a/config/fish/functions/cat.fish b/config/fish/functions/cat.fish
deleted file mode 100644
index abbc480..0000000
--- a/config/fish/functions/cat.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function cat --wraps=bat --description 'alias cat bat'
-  bat $argv
-        
-end
diff --git a/config/fish/functions/d.fish b/config/fish/functions/d.fish
deleted file mode 100644
index bcf8cb4..0000000
--- a/config/fish/functions/d.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function d --wraps=docker --description 'alias d docker'
-  docker $argv
-        
-end
diff --git a/config/fish/functions/dc.fish b/config/fish/functions/dc.fish
deleted file mode 100644
index 6106e9a..0000000
--- a/config/fish/functions/dc.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function dc --wraps='docker compose' --description 'alias dc docker compose'
-  docker compose $argv
-        
-end
diff --git a/config/fish/functions/docker.fish b/config/fish/functions/docker.fish
deleted file mode 100644
index b3d7ae8..0000000
--- a/config/fish/functions/docker.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function docker --wraps=podman --description 'alias docker=podman'
-    podman $argv
-end
diff --git a/config/fish/functions/gc.fish b/config/fish/functions/gc.fish
deleted file mode 100644
index 9b66544..0000000
--- a/config/fish/functions/gc.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function gc --wraps='git commit' --description 'alias gc git commit'
-  git commit $argv
-        
-end
diff --git a/config/fish/functions/gch.fish b/config/fish/functions/gch.fish
deleted file mode 100644
index 60e091f..0000000
--- a/config/fish/functions/gch.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function gch --wraps='git checkout' --description 'alias gch git checkout'
-  git checkout $argv
-        
-end
diff --git a/config/fish/functions/gp.fish b/config/fish/functions/gp.fish
deleted file mode 100644
index c6b33de..0000000
--- a/config/fish/functions/gp.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function gp --wraps='git push' --description 'alias gp git push'
-  git push $argv
-        
-end
diff --git a/config/fish/functions/gpl.fish b/config/fish/functions/gpl.fish
deleted file mode 100644
index 8637511..0000000
--- a/config/fish/functions/gpl.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function gpl --wraps='git pull' --description 'alias gpl git pull'
-  git pull $argv
-        
-end
diff --git a/config/fish/functions/gs.fish b/config/fish/functions/gs.fish
deleted file mode 100644
index 40c54fb..0000000
--- a/config/fish/functions/gs.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function gs --wraps='git status' --description 'alias gs git status'
-  git status $argv
-        
-end
diff --git a/config/fish/functions/k.fish b/config/fish/functions/k.fish
deleted file mode 100644
index d90b6b4..0000000
--- a/config/fish/functions/k.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function k --wraps=kubectl --description 'alias k kubectl'
-  kubectl $argv
-        
-end
diff --git a/config/fish/functions/kc.fish b/config/fish/functions/kc.fish
deleted file mode 100644
index 0224bff..0000000
--- a/config/fish/functions/kc.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function kc --wraps='kubectl config get-contexts' --description 'alias kc kubectl config get-contexts'
-  kubectl config get-contexts $argv
-        
-end
diff --git a/config/fish/functions/ks.fish b/config/fish/functions/ks.fish
deleted file mode 100644
index 8e5ffdf..0000000
--- a/config/fish/functions/ks.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function ks --wraps='kubectl config use-context' --description 'alias ks kubectl config use-context'
-  kubectl config use-context $argv
-        
-end
diff --git a/config/fish/functions/la.fish b/config/fish/functions/la.fish
deleted file mode 100644
index 9ff41cd..0000000
--- a/config/fish/functions/la.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function la --wraps='eza -lah --icons --git --no-user' --description 'alias la eza -lah --icons --git --no-user'
-  eza -lah --icons --git --no-user $argv
-        
-end
diff --git a/config/fish/functions/ls.fish b/config/fish/functions/ls.fish
deleted file mode 100644
index 01a9369..0000000
--- a/config/fish/functions/ls.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function ls --wraps='eza --icons=always --git' --description 'alias ls eza --icons=always --git'
-    eza --icons=always --git $argv
-end
diff --git a/config/fish/functions/mk.fish b/config/fish/functions/mk.fish
deleted file mode 100644
index 9d664fd..0000000
--- a/config/fish/functions/mk.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function mk --wraps=minikube --description 'alias mk minikube'
-  minikube $argv
-        
-end
diff --git a/config/fish/functions/tf.fish b/config/fish/functions/tf.fish
deleted file mode 100644
index 7cc7c5a..0000000
--- a/config/fish/functions/tf.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function tf --wraps=terraform --description 'alias tf terraform'
-  terraform $argv
-        
-end
diff --git a/config/fish/functions/top.fish b/config/fish/functions/top.fish
deleted file mode 100644
index d48a95c..0000000
--- a/config/fish/functions/top.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function top --wraps=bottom --wraps=btm --description 'alias top=btm'
-    btm $argv
-end
diff --git a/config/fish/functions/tree.fish b/config/fish/functions/tree.fish
deleted file mode 100644
index 07c87b3..0000000
--- a/config/fish/functions/tree.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function tree --wraps='eza -ah --icons=always --tree --level=3 --git-ignore --ignore-glob=".git|node_modules|.DS_Store"' --description 'alias tree eza -ah --icons=always --tree --level=3 --git-ignore --ignore-glob=".git|node_modules|.DS_Store"'
-  eza -ah --icons=always --tree --level=3 --git-ignore --ignore-glob=".git|node_modules|.DS_Store" $argv
-        
-end
diff --git a/modules/home/fish.nix b/modules/home/fish.nix
index 2c1a2bf..67e41bd 100644
--- a/modules/home/fish.nix
+++ b/modules/home/fish.nix
@@ -1,6 +1,14 @@
-{ pkgs, lib, ... }:
+{ pkgs, nixpkgs-unstable, lib, ... }:
 let
   starshipConfig = with builtins; fromTOML (readFile ./starship.toml);
+  unstable = import nixpkgs-unstable {
+    system = pkgs.stdenv.hostPlatform.system;
+
+    config.allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [
+        "1password-cli"
+      ];
+  };
 in
 {
   xdg.configFile = {
@@ -20,6 +28,26 @@ in
     };
   };
 
+  home.sessionVariables = {
+    EDITOR = "hx";
+    VISUAL = "hx";
+    MANPAGER = "bat -l man";
+  };
+
+  home.shellAliases = {
+    # alias for bat
+    cat = "bat";
+    # alias for bottom
+    top = "btm";
+    # git aliases
+    gs = "git status";
+    gc = "git commit";
+    gch = "git checkout";
+    gp = "git push";
+    gpl = "git pull";
+  };
+
+  programs.bottom.enable = true;
   programs.fd.enable = true;
   programs.git.enable = true;
   programs.gh = {
@@ -30,6 +58,14 @@ in
     enable = true;
     enableFishIntegration = true;
     git = true;
+    icons = "always";
+    colors = "always";
+  };
+
+  programs.delta = {
+    enable = true;
+    enableJujutsuIntegration = true;
+    enableGitIntegration = true;
   };
 
   programs.fish = {
@@ -87,6 +123,20 @@ in
     ];
   };
 
+  programs.jujutsu = {
+    enable = true;
+    package = unstable.jujutsu;
+    settings = {
+      user = {
+        email = "chris.vanderloo@icloud.com";
+        name = "Chris van der Loo";
+      };
+      ui = {
+        default-command = "log";
+      };
+    };
+  };
+
   programs.ghostty.enableFishIntegration = true;
   programs.zoxide = {
     enable = true;
diff --git a/modules/home/kubernetes.nix b/modules/home/kubernetes.nix
index abbf6af..baa88db 100644
--- a/modules/home/kubernetes.nix
+++ b/modules/home/kubernetes.nix
@@ -1,4 +1,9 @@
 { pkgs, ... }: {
+  home.shellAliases = {
+    k = "kubectl";
+    kc = "kubectl config get-contexts";
+    ks = "kubectl config set-context";
+  };
   programs.k9s.enable = true;
   home.packages = with pkgs; [
     kubectl
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index efbe386..7f83a9f 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -40,7 +40,6 @@ in {
     # Astro
     astro-language-server
   ] ++ [
-    unstable.jujutsu
     unstable._1password-cli
   ];
 }
diff --git a/modules/home/podman.nix b/modules/home/podman.nix
index fafcee1..97c3897 100644
--- a/modules/home/podman.nix
+++ b/modules/home/podman.nix
@@ -1,4 +1,11 @@
 { pkgs, ... }: {
+
+  home.shellAliases = {
+    docker = "podman";
+    d = "podman";
+    dc = "podman-compose";
+  };
+
   home.packages = with pkgs; [
     podman
     podman-compose