diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
index e12f091..154df38 100644
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    fish-rust
+    fish
     fzf
     bat
     eza
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
index 39284b0..3c2b7dd 100644
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@@ -1,12 +1,11 @@
-{
-  pkgs,
-  lib,
-  i3dotfiles,
-  ...
-}: {
+{i3dotfiles, ...}: {
   programs.starship = {
     enable = true;
     enableFishIntegration = true;
-    settings = lib.importTOML "${i3dotfiles}/starship.toml";
+  };
+
+  xdg.configFile."starship.toml" = {
+    source = "${i3dotfiles}/starship.toml";
+    force = true;
   };
 }
diff --git a/hosts/modules/user.nix b/hosts/modules/user.nix
index c14f135..3281a4c 100644
--- a/hosts/modules/user.nix
+++ b/hosts/modules/user.nix
@@ -1,12 +1,10 @@
-{pkgs, ...}: let
-  fish-rust = pkgs.callPackage ../pkgs/fish-rust {};
-in {
+{pkgs, ...}: {
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.cobray = {
     isNormalUser = true;
     description = "Mon Aie";
     extraGroups = ["networkmanager" "wheel" "docker" "video"];
-    shell = pkgs.bash;
+    shell = pkgs.fish;
   };
 
   security.sudo = {
@@ -16,6 +14,5 @@ in {
 
   programs.fish = {
     enable = true;
-    package = fish-rust;
   };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0108762..48e22e8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -8,7 +8,6 @@
   };
 in {
   inherit (rpcs3Pkgs) pugixml SDL3 rpcs3_latest;
-  fish-rust = pkgs.callPackage ./fish-rust {};
   clear-sans = pkgs.callPackage ./clear-sans {};
   binary-font = pkgs.callPackage ./binary-font {};
   minijinja-cli = pkgs.callPackage ./minijinja-cli {};