diff --git a/homeManagerModules/fish.nix b/homeManagerModules/fish.nix
new file mode 100644
index 0000000..32c4965
--- /dev/null
+++ b/homeManagerModules/fish.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  programs.fish = {
+    enable = true;
+    plugins = [
+      {
+        name = "fish-you-should-use";
+        src = pkgs.fishPlugins.fish-you-should-use;
+      }
+    ];
+  };
+}
diff --git a/homeManagerModules/starship.nix b/homeManagerModules/starship.nix
index cad8372..baa6e37 100644
--- a/homeManagerModules/starship.nix
+++ b/homeManagerModules/starship.nix
@@ -2,6 +2,8 @@
 {
   programs.starship = {
     enable = true;
-    enableZshIntegration = true;
+    #enableZshIntegration = true;
+    enableTransience = true;
+    enableFishIntegration = true;
   };
 }
diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix
index 4363b55..e3874d3 100644
--- a/hosts/main-laptop/configuration.nix
+++ b/hosts/main-laptop/configuration.nix
@@ -49,6 +49,8 @@
     };
   };
 
+  programs.fish.enable = true;
+
   settings = {
     users.fedfer.enable = lib.mkForce true;
 
diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix
index f0e7fca..5a04eaa 100644
--- a/hosts/main-laptop/home.nix
+++ b/hosts/main-laptop/home.nix
@@ -2,7 +2,8 @@
 {
 
   imports = [
-    ../../homeManagerModules/zsh.nix
+    #../../homeManagerModules/zsh.nix
+    ../../homeManagerModules/fish.nix
     ../../homeManagerModules/starship.nix
 
     ../../homeManagerModules/desktopPrograms/firefox.nix
@@ -67,12 +68,12 @@
     nixd
     nixpkgs-fmt
     nixfmt-rfc-style
-    fira-code-nerdfont
     powertop
     git-credential-manager
     vesktop
     libreoffice-fresh
     valent
+    logseq
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/nixosModules/users/fedfer.nix b/nixosModules/users/fedfer.nix
index 19e91e0..ed288f4 100644
--- a/nixosModules/users/fedfer.nix
+++ b/nixosModules/users/fedfer.nix
@@ -18,7 +18,7 @@
         "networkmanager"
         "wheel"
       ];
-      shell = pkgs.zsh;
+      shell = pkgs.fish;
     };
   };
 }