From 7dde5410e48b9ee9eccb7ac08868363a9ae72308 Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Tue, 1 Jul 2025 17:51:59 -0400
Subject: [PATCH] chore: cleanup redundant module declarations

---
 configurations/nixos/arma-reforger-tofu/default.nix  | 2 --
 configurations/nixos/base-tofu/default.nix           | 2 --
 configurations/nixos/caddy-tofu/default.nix          | 2 --
 configurations/nixos/forgejo-runner-tofu/default.nix | 2 --
 configurations/nixos/graylog-tofu/default.nix        | 2 --
 configurations/nixos/link-warden-tofu/default.nix    | 2 --
 configurations/nixos/medchart-tofu/default.nix       | 2 --
 configurations/nixos/observer-tofu/default.nix       | 2 --
 modules/nixos/common/default.nix                     | 9 ++++++++-
 9 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/configurations/nixos/arma-reforger-tofu/default.nix b/configurations/nixos/arma-reforger-tofu/default.nix
index 217a0e0..e5a4e46 100644
--- a/configurations/nixos/arma-reforger-tofu/default.nix
+++ b/configurations/nixos/arma-reforger-tofu/default.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  modulesPath,
   config,
   pkgs,
   lib,
@@ -14,7 +13,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
 
   services.arma.enable = true;
diff --git a/configurations/nixos/base-tofu/default.nix b/configurations/nixos/base-tofu/default.nix
index f3a4301..9ea3295 100644
--- a/configurations/nixos/base-tofu/default.nix
+++ b/configurations/nixos/base-tofu/default.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  modulesPath,
   config,
   ...
 }:
@@ -12,7 +11,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   services.yggdrasil.persistentKeys = false;
   deploy = {
diff --git a/configurations/nixos/caddy-tofu/default.nix b/configurations/nixos/caddy-tofu/default.nix
index e65ae2e..4f0be6e 100644
--- a/configurations/nixos/caddy-tofu/default.nix
+++ b/configurations/nixos/caddy-tofu/default.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  modulesPath,
   # config,
   ...
 }:
@@ -12,7 +11,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   services.caddy = {
     enable = true;
diff --git a/configurations/nixos/forgejo-runner-tofu/default.nix b/configurations/nixos/forgejo-runner-tofu/default.nix
index 7f6af15..39f7c25 100644
--- a/configurations/nixos/forgejo-runner-tofu/default.nix
+++ b/configurations/nixos/forgejo-runner-tofu/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   flake,
-  modulesPath,
   config,
   pkgs,
   ...
@@ -14,7 +13,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
 
   nix.settings = {
diff --git a/configurations/nixos/graylog-tofu/default.nix b/configurations/nixos/graylog-tofu/default.nix
index df4c5b1..c283787 100644
--- a/configurations/nixos/graylog-tofu/default.nix
+++ b/configurations/nixos/graylog-tofu/default.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  modulesPath,
   lib,
   config,
   pkgs,
@@ -14,7 +13,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   nixpkgs.config.allowUnfreePredicate =
     pkg:
diff --git a/configurations/nixos/link-warden-tofu/default.nix b/configurations/nixos/link-warden-tofu/default.nix
index 37c1804..b027f90 100644
--- a/configurations/nixos/link-warden-tofu/default.nix
+++ b/configurations/nixos/link-warden-tofu/default.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   flake,
-  modulesPath,
   config,
   ...
 }:
@@ -13,7 +12,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   networking = {
     hostName = "link-warden-tofu";
diff --git a/configurations/nixos/medchart-tofu/default.nix b/configurations/nixos/medchart-tofu/default.nix
index 2ae4e24..07726c0 100644
--- a/configurations/nixos/medchart-tofu/default.nix
+++ b/configurations/nixos/medchart-tofu/default.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  modulesPath,
   config,
   ...
 }:
@@ -12,7 +11,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   services.yggdrasil.persistentKeys = false;
   deploy = {
diff --git a/configurations/nixos/observer-tofu/default.nix b/configurations/nixos/observer-tofu/default.nix
index 4dbfd21..566c141 100644
--- a/configurations/nixos/observer-tofu/default.nix
+++ b/configurations/nixos/observer-tofu/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   flake,
-  modulesPath,
   # config,
   ...
 }:
@@ -13,7 +12,6 @@ in
 {
   imports = [
     self.nixosModules.default
-    "${modulesPath}/virtualisation/lxc-container.nix"
   ];
   services = {
     uptime-kuma = {
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
index f2e73e2..5814c44 100644
--- a/modules/nixos/common/default.nix
+++ b/modules/nixos/common/default.nix
@@ -1,10 +1,17 @@
-{ flake, pkgs, ... }:
+{
+  flake,
+  pkgs,
+  modulesPath,
+  ...
+}:
 {
   imports =
     with builtins;
     map (fn: ./${fn}) (filter (fn: fn != "default.nix") (attrNames (readDir ./.)))
     ++ [
       flake.inputs.disko.nixosModules.default
+
+      "${modulesPath}/virtualisation/lxc-container.nix"
     ];
   zramSwap.enable = true;
   nixpkgs.hostPlatform = "x86_64-linux";