diff --git a/flake.nix b/flake.nix
index abc35329..df389301 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
         user = "xenia";
         system = "x86_64-linux";
         group = "users";
-        shell = "zsh";
+        shell = "fish";
         systemModules = [ ./system/hyprland.nix ];
         homeModules = [
           ./home/accounts/default.nix
@@ -195,7 +195,7 @@
                 ];
               in {
                 root = {
-                  shell = pkgs.${shell};
+                  shell = pkgs.bash;
                   openssh = { inherit authorizedKeys; };
                 };
                 ${user} = {
diff --git a/home/default.nix b/home/default.nix
index 60a36386..52f25c6d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,6 +5,8 @@
     "${tokyonight-folke}/extras/sublime/tokyonight_night.tmTheme";
   programs = {
     bash.enable = true;
+    bat.enable = true;
+    fish.enable = true;
     readline = {
       enable = true;
       includeSystemConfig = true;
@@ -21,9 +23,9 @@
     fzf = {
       enable = true;
       enableBashIntegration = true;
+      enableFishIntegration = true;
       enableZshIntegration = true;
     };
-    bat.enable = true;
     git = {
       enable = true;
       package = pkgs.gitFull;
@@ -90,6 +92,7 @@
     starship = {
       enable = true;
       enableBashIntegration = true;
+      enableFishIntegration = true;
       enableZshIntegration = true;
       settings = {
         command_timeout = 1000;