treewide: simplify modules imports

thiagokokada · Sep 20, 2023 · 9a255e2 · 9a255e2
1 parent ca6b998
commit 9a255e2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/hosts/miku-nixos/default.nix b/hosts/miku-nixos/default.nix
@@ -11,7 +11,6 @@ in
   imports = [
     ./hardware-configuration.nix
     ../../nixos
-    ../../nixos/cross-compiling.nix
     ../../nixos/games.nix
     inputs.hardware.nixosModules.common-cpu-intel
   ];

diff --git a/hosts/mirai-vps/default.nix b/hosts/mirai-vps/default.nix
@@ -9,9 +9,7 @@
     [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../nixos/home.nix
-      ../../nixos/minimal.nix
-      ../../nixos/server
+      ../../nixos
     ];
 
   nixos.home.imports = [
@@ -50,11 +48,5 @@
   # Define on which hard drive you want to install Grub.
   boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
 
-  # Enable IPv6
-  boot.kernel.sysctl = {
-    "net.ipv6.conf.ens3.autoconf" = 0;
-    "net.ipv6.conf.ens3.accept_ra" = 0;
-  };
-
   networking.hostName = "mirai-vps";
 }
diff --git a/hosts/sankyuu-nixos/default.nix b/hosts/sankyuu-nixos/default.nix
@@ -11,7 +11,6 @@ in
   imports = [
     ./hardware-configuration.nix
     ../../nixos
-    ../../nixos/cross-compiling.nix
     ../../nixos/games.nix
     inputs.hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
   ];

diff --git a/hosts/zatsune-nixos/default.nix b/hosts/zatsune-nixos/default.nix
@@ -9,9 +9,7 @@
     [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../nixos/home.nix
-      ../../nixos/minimal.nix
-      ../../nixos/server
+      ../../nixos
     ];
 
   nixos.home.imports = [

diff --git a/nixos/default.nix b/nixos/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./audio.nix
+    ./cross-compiling.nix
     ./desktop
     ./dev
     ./fonts.nix