modules: merge base and nixos

25 files changed, 71 insertions, 82 deletions

diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 4c3dbf8..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-_: {
-  imports = [
-    ./base
-    ./desktop
-    ./hardware
-    ./nixos
-  ];
-}
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
new file mode 100644
index 0000000..63700e1
--- /dev/null
+++ b/modules/nixos/base/default.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.getchoo.base;
+  inherit (lib) mkDefault mkEnableOption mkIf;
+in {
+  options.getchoo.base.enable = mkEnableOption "base nixos module";
+
+  imports = [
+    ./documentation.nix
+    ./locale.nix
+    ./network.nix
+    ./nix.nix
+    ./packages.nix
+    ./root.nix
+    ./security.nix
+    ./systemd.nix
+    ./virtualisation.nix
+  ];
+
+  config = mkIf cfg.enable {
+    getchoo.base = {
+      defaultPackages.enable = mkDefault true;
+      defaultLocale.enable = mkDefault true;
+      defaultRoot.enable = mkDefault true;
+      documentation.enable = mkDefault true;
+      networking.enable = mkDefault true;
+      nix-settings.enable = mkDefault true;
+    };
+  };
+}
diff --git a/modules/base/documentation.nix b/modules/nixos/base/documentation.nix
index 9064507..9064507 100644
--- a/modules/base/documentation.nix
+++ b/modules/nixos/base/documentation.nix
diff --git a/modules/nixos/locale.nix b/modules/nixos/base/locale.nix
index c362a6d..b79d328 100644
--- a/modules/nixos/locale.nix
+++ b/modules/nixos/base/locale.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.nixos.defaultLocale;
+  cfg = config.getchoo.base.defaultLocale;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.nixos.defaultLocale.enable = mkEnableOption "enable default locale";
+  options.getchoo.base.defaultLocale.enable = mkEnableOption "enable default locale";
 
   config = mkIf cfg.enable {
     i18n = {
diff --git a/modules/nixos/network.nix b/modules/nixos/base/network.nix
index 7dce2b1..dbcabac 100644
--- a/modules/nixos/network.nix
+++ b/modules/nixos/base/network.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.nixos.networking;
+  cfg = config.getchoo.base.networking;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.nixos.networking.enable = mkEnableOption "enable networking";
+  options.getchoo.base.networking.enable = mkEnableOption "enable networking";
 
   config = mkIf cfg.enable {
     networking.networkmanager = {
diff --git a/modules/base/default.nix b/modules/nixos/base/nix.nix
index 72911a5..38fcef0 100644
--- a/modules/base/default.nix
+++ b/modules/nixos/base/nix.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.base;
+  cfg = config.getchoo.base.nix-settings;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.enable = mkEnableOption "base module";
+  options.getchoo.base.nix-settings.enable = mkEnableOption "base nix settings";
 
   imports = [
     ./documentation.nix
@@ -18,11 +18,6 @@ in {
     channelPath = "/etc/nix/channels/nixpkgs";
   in
     mkIf cfg.enable {
-      getchoo.base = {
-        documentation.enable = mkDefault true;
-        defaultPackages.enable = mkDefault true;
-      };
-
       nix = {
         package = mkDefault pkgs.nixFlakes;
 
diff --git a/modules/base/packages.nix b/modules/nixos/base/packages.nix
index a082196..a082196 100644
--- a/modules/base/packages.nix
+++ b/modules/nixos/base/packages.nix
diff --git a/modules/nixos/root.nix b/modules/nixos/base/root.nix
index f2e5878..5f8d7d4 100644
--- a/modules/nixos/root.nix
+++ b/modules/nixos/base/root.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.nixos.defaultRoot;
+  cfg = config.getchoo.base.defaultRoot;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.nixos.defaultRoot.enable = mkEnableOption "enable default root user";
+  options.getchoo.base.defaultRoot.enable = mkEnableOption "enable default root user";
 
   config = mkIf cfg.enable {
     users.users.root = {
diff --git a/modules/nixos/security.nix b/modules/nixos/base/security.nix
index 403cfa5..403cfa5 100644
--- a/modules/nixos/security.nix
+++ b/modules/nixos/base/security.nix
diff --git a/modules/nixos/systemd.nix b/modules/nixos/base/systemd.nix
index 2888c0b..2888c0b 100644
--- a/modules/nixos/systemd.nix
+++ b/modules/nixos/base/systemd.nix
diff --git a/modules/nixos/base/virtualisation.nix b/modules/nixos/base/virtualisation.nix
new file mode 100644
index 0000000..7654fbb
--- /dev/null
+++ b/modules/nixos/base/virtualisation.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.getchoo.base.virtualisation;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.getchoo.base.virtualisation.enable = mkEnableOption "enable podman";
+
+  config.virtualisation = mkIf cfg.enable {
+    podman = {
+      enable = true;
+      enableNvidia = true;
+      extraPackages = with pkgs; [podman-compose];
+    };
+    oci-containers.backend = "podman";
+  };
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index bbe334e..3ae2f08 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,30 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.getchoo.nixos;
-  inherit (lib) mkDefault mkEnableOption mkIf;
-in {
-  options.getchoo.nixos.enable = mkEnableOption "base nixos module";
-
+_: {
   imports = [
-    ./locale.nix
-    ./network.nix
-    ./root.nix
-    ./security.nix
-    ./systemd.nix
-    ./virtualisation.nix
+    ./base
+    ./desktop
+    ./hardware
   ];
-
-  config = mkIf cfg.enable {
-    getchoo = {
-      base.enable = true;
-      nixos = {
-        defaultLocale.enable = mkDefault true;
-        defaultRoot.enable = mkDefault true;
-        networking.enable = mkDefault true;
-      };
-    };
-  };
 }
diff --git a/modules/desktop/audio.nix b/modules/nixos/desktop/audio.nix
index d04316b..d04316b 100644
--- a/modules/desktop/audio.nix
+++ b/modules/nixos/desktop/audio.nix
diff --git a/modules/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix
index 440bbc6..440bbc6 100644
--- a/modules/desktop/budgie/default.nix
+++ b/modules/nixos/desktop/budgie/default.nix
diff --git a/modules/desktop/default.nix b/modules/nixos/desktop/default.nix
index 50b8854..2536a55 100644
--- a/modules/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -19,7 +19,7 @@ in {
 
   config = mkIf cfg.enable {
     getchoo = {
-      nixos.enable = true;
+      base.enable = true;
       desktop = {
         audio.enable = mkDefault true;
         fonts.enable = mkDefault true;
diff --git a/modules/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index 95b2e4d..95b2e4d 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
diff --git a/modules/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index fd3d34d..fd3d34d 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
diff --git a/modules/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index 84960f3..84960f3 100644
--- a/modules/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
diff --git a/modules/hardware/default.nix b/modules/nixos/hardware/default.nix
index cefa15c..cefa15c 100644
--- a/modules/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
diff --git a/modules/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix
index c317226..c317226 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/nixos/hardware/nvidia.nix
diff --git a/modules/server/default.nix b/modules/nixos/server/default.nix
index 9692a82..504a333 100644
--- a/modules/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -15,17 +15,11 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    getchoo = {
-      base = {
-        enable = true;
-        documentation.enable = false;
-        defaultPackages.enable = false;
-      };
-
-      nixos = {
-        enable = true;
-        networking.enable = false;
-      };
+    getchoo.base = {
+      enable = true;
+      documentation.enable = false;
+      defaultPackages.enable = false;
+      networking.enable = false;
     };
 
     environment.systemPackages = [pkgs.cachix];
diff --git a/modules/server/secrets.nix b/modules/nixos/server/secrets.nix
index c0290cd..c0290cd 100644
--- a/modules/server/secrets.nix
+++ b/modules/nixos/server/secrets.nix
diff --git a/modules/server/services/default.nix b/modules/nixos/server/services/default.nix
index 68271b1..68271b1 100644
--- a/modules/server/services/default.nix
+++ b/modules/nixos/server/services/default.nix
diff --git a/modules/server/services/hercules.nix b/modules/nixos/server/services/hercules.nix
index 782e5a8..782e5a8 100644
--- a/modules/server/services/hercules.nix
+++ b/modules/nixos/server/services/hercules.nix
diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix
deleted file mode 100644
index 932cc6d..0000000
--- a/modules/nixos/virtualisation.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.getchoo.nixos.virtualisation;
-  inherit (lib) mkEnableOption mkIf;
-in {
-  options.getchoo.nixos.virtualisation.enable = mkEnableOption "enable podman";
-
-  config = mkIf cfg.enable {
-    virtualisation = {
-      podman = {
-        enable = true;
-        enableNvidia = true;
-        extraPackages = with pkgs; [podman-compose];
-      };
-      oci-containers.backend = "podman";
-    };
-  };
-}