diff --git a/containers/wine.nix b/containers/wine.nix
index fa2eebe7..674cf069 100644
--- a/containers/wine.nix
+++ b/containers/wine.nix
@@ -41,27 +41,6 @@
         ../modules/pipewire.nix
       ];
 
-      programs = {
-        fish.enable = true;
-        neovim.enable = true;
-        starship.enable = true;
-      };
-
-      users = {
-        defaultUserShell = pkgs.fish;
-        mutableUsers = false;
-        allowNoPasswordLogin = true;
-
-        users.user = {
-          isNormalUser = true;
-          home = "/home/user";
-        };
-      };
-
-      environment = {
-        shells = with pkgs; [ fish ];
-      };
-
       environment.systemPackages = with pkgs; [
         wineWowPackages.stagingFull
         winetricks
diff --git a/setup.nix b/setup.nix
index 2e4fdea6..0101c12f 100644
--- a/setup.nix
+++ b/setup.nix
@@ -8,7 +8,9 @@
   ];
 
   home-manager.sharedModules = [
+    ./home/fish.nix
     ./home/gtk.nix
+    ./home/starship.nix
     ./home/xcursor.nix
     ./home/xresources.nix
   ];