*: remove use of top-level modules

including them twice causes conflicting declaration errors maybe https://github.com/NixOS/nix/issues/7270(?)
denbeigh2000 · Aug 26, 2023 · 306f7b1 · 306f7b1
1 parent a74fd20
commit 306f7b1
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 23 deletions.
diff --git a/configs/nixos/bruce.nix b/configs/nixos/bruce.nix
@@ -9,15 +9,19 @@
       }
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [
-            cloud
-            www
-            ahoy
-            ci
-            nix-cache
-            standard
-            tailscale
-            terraform
+          imports = [
+            # NOTE: Deduping imports from flake modules is broken(?)
+            # https://github.com/NixOS/nix/issues/7270
+            # Can't easily re-use from self.nixosModules (either here
+            # or within) until resolved
+            ../../modules/nixos/cloud
+            ../../modules/nixos/nginx
+            ../../modules/nixos/ahoy.nix
+            ../../modules/nixos/ci.nix
+            ../../modules/nixos/nix-cache.nix
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/tailscale.nix
+            ../../modules/nixos/terraform.nix
           ];
           config = {
             denbeigh = {

diff --git a/configs/nixos/coder-ec2-aarch64-plain.nix b/configs/nixos/coder-ec2-aarch64-plain.nix
@@ -4,7 +4,11 @@
     modules = [
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [ standard cloud aws-aarch64 ];
+          imports = [
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/cloud
+            ../../modules/nixos/cloud/aws-aarch64
+          ];
           config = {
             denbeigh.machine.hostname = "plain";
             denbeigh.user.enable = false;

diff --git a/configs/nixos/coder-ec2-aarch64.nix b/configs/nixos/coder-ec2-aarch64.nix
@@ -5,7 +5,10 @@
     modules = [
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [ standard aws-aarch64 ];
+          imports = [
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/cloud/aws/aarch64.nix
+          ];
           config = {
             denbeigh.machine.hostname = "dev";
           };

diff --git a/configs/nixos/coder-ec2-x86.nix b/configs/nixos/coder-ec2-x86.nix
@@ -4,7 +4,11 @@
     modules = [
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [ standard aws cloud ];
+          imports = [
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/cloud/aws
+            ../../modules/nixos/cloud
+          ];
           config = {
             denbeigh.machine.hostname = "dev";
           };

diff --git a/configs/nixos/faye.nix b/configs/nixos/faye.nix
@@ -4,9 +4,9 @@
     modules = [
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [
-            standard
-            router
+          imports = [
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/router
           ];
           config = {
             boot = {

diff --git a/configs/nixos/feliccia.nix b/configs/nixos/feliccia.nix
@@ -4,10 +4,10 @@
     modules = [
       ({ self, ... }:
         {
-          imports = with self.nixosModules; [
-            standard
-            development
-            gaming
+          imports = [
+            ../../modules/nixos/standard.nix
+            ../../modules/nixos/development.nix
+            ../../modules/nixos/gaming.nix
           ];
           config = {
             boot.loader.grub = {

diff --git a/configs/nixos/live.nix b/configs/nixos/live.nix
@@ -8,8 +8,8 @@
       }
       ({ self, modulesPath, ... }: {
         imports = [
-          self.nixosModules.cloud
-          self.nixosModules.standard
+          ../../modules/nixos/cloud
+          ../../modules/nixos/standard.nix
           "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
         ];
       })

diff --git a/modules/nixos/standard.nix b/modules/nixos/standard.nix
@@ -12,7 +12,6 @@ in
 
     ../common/standard.nix
     ../common/variables.nix
-    # TODO: Expose these as top-level modules, import them through `self.nixosModules`
     ./denbeigh.nix
     ./utils.nix
     ./graphical.nix

diff --git a/modules/nixos/use-nix-cache.nix b/modules/nixos/use-nix-cache.nix
@@ -8,7 +8,10 @@ in
 {
   # Ensures services.nix-cache options are defined
   # (but they're disabled by default)
-  imports = [ ./nix-cache.nix ../common/use-nix-cache.nix ];
+  imports = [
+    ./nix-cache.nix
+    ../common/use-nix-cache.nix
+  ];
 
   config.denbeigh.nix-cache.enable = mkDefault (!config.denbeigh.services.nix-cache.enable);
 }