From ec496e1a690e9f9ff5414164b4b161a8486aaa29 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 6 Apr 2024 22:46:47 -0400 Subject: [PATCH] meta: Rename shared.nix to default.nix This should make it easier to tell that this is the default configuration inherited by all containers. --- containers/{shared.nix => default.nix} | 5 +++-- modules/containers.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename containers/{shared.nix => default.nix} (93%) diff --git a/containers/shared.nix b/containers/default.nix similarity index 93% rename from containers/shared.nix rename to containers/default.nix index 86cfd244..64d90158 100644 --- a/containers/shared.nix +++ b/containers/default.nix @@ -22,8 +22,9 @@ }; environment = { - defaultPackages = [ ]; - variables.TERM = "xterm-kitty"; + variables = { + TERM = "xterm-kitty"; + }; sessionVariables = { WAYLAND_DISPLAY = "wayland-1"; diff --git a/modules/containers.nix b/modules/containers.nix index 99408d0c..7c41d6ed 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -57,7 +57,7 @@ in config = { lib, pkgs, ... }: { imports = [ - ../containers/shared.nix + ../containers ../containers/wine.nix ]; };