From 5c38772ecaa74328a5885d9d4cc19226191001d7 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 31 Aug 2023 13:23:28 -0400
Subject: [PATCH] containers: Merge dev container with setup

This change further reduces build times, removes duplicate code, and
makes things simpler overall.
---
 containers/default.nix |  1 -
 containers/dev.nix     | 55 ------------------------------------------
 setup.nix              |  2 ++
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 containers/dev.nix

diff --git a/containers/default.nix b/containers/default.nix
index 7838c0e..2c4c14a 100644
--- a/containers/default.nix
+++ b/containers/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./dev.nix
     ./wine.nix
   ];
 }
diff --git a/containers/dev.nix b/containers/dev.nix
deleted file mode 100644
index 5c0b0e0..0000000
--- a/containers/dev.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ home-manager, stylix, ... }:
-
-{
-  containers.dev = {
-    privateNetwork = true;
-    ephemeral = true;
-    hostAddress = "192.168.100.30";
-    localAddress = "192.168.100.31";
-
-    bindMounts = {
-      "/mnt" = {
-        hostPath = "/home/user/containers/dev";
-        isReadOnly = false;
-      };
-
-      waylandDisplay = rec {
-        hostPath = "/run/user/1000";
-        mountPoint = hostPath;
-      };
-
-      x11Display = rec {
-        hostPath = "/tmp/.X11-unix";
-        mountPoint = hostPath;
-      };
-
-      dri = rec {
-        hostPath = "/dev/dri";
-        mountPoint = hostPath;
-      };
-    };
-
-    allowedDevices = [
-      {
-        modifier = "rw";
-        node = "/dev/dri/renderD128";
-      }
-    ];
-
-    config = { pkgs, ... }: {
-      imports = [
-        home-manager.nixosModules.home-manager
-        stylix.nixosModules.stylix
-        ../setup.nix
-        ../modules/nix.nix
-        ../modules/fish.nix
-      ];
-
-      home-manager.sharedModules = [
-        ../home/git.nix
-        ../home/neovim.nix
-        ../home/htop.nix
-      ];
-    };
-  };
-}
diff --git a/setup.nix b/setup.nix
index f94ac93..7249cda 100644
--- a/setup.nix
+++ b/setup.nix
@@ -17,10 +17,12 @@
 
   home-manager.sharedModules = [
     ./home/fish.nix
+    ./home/git.nix
     ./home/gtk.nix
     ./home/htop.nix
     ./home/joshuto.nix
     ./home/kitty.nix
+    ./home/neovim.nix
     ./home/xcursor.nix
     ./home/xresources.nix
   ];