diff --git a/flake.lock b/flake.lock
index d6db3c3..224e00d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726730453,
-        "narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=",
+        "lastModified": 1726775926,
+        "narHash": "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a31fe5ef162f2f963308289e6e27d37e3948a983",
+        "rev": "624fd86460e482017ed9c3c3c55a3758c06a4e7f",
         "type": "github"
       },
       "original": {
@@ -362,6 +362,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726449931,
+        "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-artwork": {
       "flake": false,
       "locked": {
@@ -476,11 +496,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1726764615,
-        "narHash": "sha256-8cVUZZd9Z/bT0JIQy/hOPta2nhZjT2b6xW7xZhFMh1M=",
+        "lastModified": 1726775124,
+        "narHash": "sha256-10CcmbM/IoMRUDDg9K3ptHNsMUSjpDB//hYc8s/K9cM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "4cec60b7d77b33f845c35fcd222376c0ea866a77",
+        "rev": "b8f61a42e5068cb93fac8a0267b4d4e88118bae4",
         "type": "github"
       },
       "original": {
@@ -525,6 +545,7 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
+        "nix-index-database": "nix-index-database",
         "nixos-artwork": "nixos-artwork",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
@@ -595,15 +616,15 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1718122552,
-        "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
-        "owner": "danth",
+        "lastModified": 1726776484,
+        "narHash": "sha256-SPnk08RnllF8CD9Ndbe828Z1OmlviJ+ZJLsiT7V/+4A=",
+        "owner": "pizzapim",
         "repo": "stylix",
-        "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
+        "rev": "d444b97c5e691a2a468000c939119798e42b4f0f",
         "type": "github"
       },
       "original": {
-        "owner": "danth",
+        "owner": "pizzapim",
         "ref": "release-24.05",
         "repo": "stylix",
         "type": "github"
diff --git a/flake.nix b/flake.nix
index f436958..f3edaea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,12 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nur.url = "github:nix-community/NUR";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    stylix.url = "github:danth/stylix/release-24.05";
+    stylix.url = "github:pizzapim/stylix/release-24.05";
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager?ref=release-24.05";
diff --git a/home.nix b/home.nix
index 6455af2..0612efd 100644
--- a/home.nix
+++ b/home.nix
@@ -3,6 +3,7 @@
     ./modules/home-manager/neovim
     ./modules/home-manager/firefox
     inputs.sops-nix.homeManagerModules.sops
+    inputs.nix-index-database.hmModules.nix-index
   ];
 
   xsession.enable = true;
@@ -152,6 +153,7 @@
     atuin = {
       enable = true;
       flags = [ "--disable-up-arrow" ];
+      enableFishIntegration = true;
 
       settings = {
         auto_sync = true;
@@ -160,38 +162,43 @@
       };
     };
 
-    zsh = {
+    fish = {
       enable = true;
-      autocd = true;
-      autosuggestion.enable = true;
 
-      prezto = {
-        enable = true;
-        utility.safeOps = false;
+      interactiveShellInit = ''
+        set -U fish_greeting
+      '';
+
+      shellAbbrs = {
+        htop = "btop";
+        gp = "git push";
+        gco = "git checkout";
+        gd = "git diff";
+        gc = "git commit";
+        gpl = "git pull";
+        gb = "git branch";
+        ga = "git add";
+        gl = "git log";
+        gs = "git status";
+        tf = "tofu";
       };
+    };
 
-      shellAliases =
-        let
-          gitExe = lib.getExe config.programs.git.package;
-        in
-        {
-          htop = lib.getExe pkgs.btop;
-          gp = "${gitExe} push";
-          gco = "${gitExe} checkout";
-          gd = "${gitExe} diff";
-          gc = "${gitExe} commit";
-          gpl = "${gitExe} pull";
-          gb = "${gitExe} branch";
-          ga = "${gitExe} add";
-          gl = "${gitExe} log";
-          gs = "${gitExe} status";
-          tf = lib.getExe pkgs.opentofu;
-        };
+    starship = {
+      enable = true;
+      enableFishIntegration = true;
+      enableTransience = true;
+      settings.nix_shell.heuristic = true;
+    };
+
+    nix-index = {
+      enable = true;
+      enableFishIntegration = true;
     };
 
     tmux = {
       enable = true;
-      shell = lib.getExe config.programs.zsh.package;
+      shell = lib.getExe config.programs.fish.package;
       shortcut = "a";
       clock24 = true;
       newSession = true;