From 9167763aeb57b6bddf5c23bf3dd7c80a687685e9 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 22 Jun 2023 12:24:54 -0400 Subject: [PATCH] meta: Move containers config to setup.nix The config sets up the containers, hence setup.nix. --- containers/gui.nix | 8 +------- containers/common/wayland.nix => setup.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 8 deletions(-) rename containers/common/wayland.nix => setup.nix (82%) diff --git a/containers/gui.nix b/containers/gui.nix index 4155031..177ffd1 100644 --- a/containers/gui.nix +++ b/containers/gui.nix @@ -1,5 +1,3 @@ -{ home-manager, stylix, ... }: - { containers.gui = { privateNetwork = true; @@ -25,11 +23,7 @@ config = { pkgs, ... }: { imports = [ - home-manager.nixosModules.home-manager - stylix.nixosModules.stylix - ./common/wayland.nix - ../modules/fonts.nix - ../modules/stylix.nix + ../setup.nix ]; environment.systemPackages = with pkgs; [ diff --git a/containers/common/wayland.nix b/setup.nix similarity index 82% rename from containers/common/wayland.nix rename to setup.nix index 3a074cc..311a997 100644 --- a/containers/common/wayland.nix +++ b/setup.nix @@ -1,6 +1,13 @@ -{ pkgs, ... }: +{ pkgs, home-manager, stylix, ... }: { + imports = [ + home-manager.nixosModules.home-manager + stylix.nixosModules.stylix + ./modules/fonts.nix + ./modules/stylix.nix + ]; + environment = { defaultPackages = [ ]; variables.TERM = "xterm-kitty";