From 7a07f70f7c6bf561ad0f6eb1fdd3e9c3214107c5 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 22 Jun 2023 13:06:00 -0400
Subject: [PATCH] meta: Include fish/starship in all containers

---
 containers/wine.nix | 21 ---------------------
 setup.nix           |  2 ++
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/containers/wine.nix b/containers/wine.nix
index fa2eebe..674cf06 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 2e4fdea..0101c12 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
   ];