modules: prefix with getchoo

17 files changed, 64 insertions, 63 deletions

diff --git a/modules/base/default.nix b/modules/base/default.nix
index b9a7c8b..72911a5 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.base;
+  cfg = config.getchoo.base;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.base.enable = mkEnableOption "base module";
+  options.getchoo.base.enable = mkEnableOption "base module";
 
   imports = [
     ./documentation.nix
@@ -18,7 +18,7 @@ in {
     channelPath = "/etc/nix/channels/nixpkgs";
   in
     mkIf cfg.enable {
-      base = {
+      getchoo.base = {
         documentation.enable = mkDefault true;
         defaultPackages.enable = mkDefault true;
       };
@@ -35,12 +35,6 @@ in {
         settings = {
           auto-optimise-store = true;
           experimental-features = ["nix-command" "flakes"];
-          trusted-substituters = [
-            "https://nix-community.cachix.org"
-          ];
-          trusted-public-keys = [
-            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          ];
         };
 
         nixPath = [
diff --git a/modules/base/documentation.nix b/modules/base/documentation.nix
index 0f3b9d3..9064507 100644
--- a/modules/base/documentation.nix
+++ b/modules/base/documentation.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.base.documentation;
+  cfg = config.getchoo.base.documentation;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.base.documentation.enable = mkEnableOption "base module documentation";
+  options.getchoo.base.documentation.enable = mkEnableOption "base module documentation";
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [man-pages man-pages-posix];
diff --git a/modules/base/packages.nix b/modules/base/packages.nix
index 68f56aa..a082196 100644
--- a/modules/base/packages.nix
+++ b/modules/base/packages.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.base.defaultPackages;
+  cfg = config.getchoo.base.defaultPackages;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.base.defaultPackages.enable = mkEnableOption "base module default packages";
+  options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages";
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
index cbfbf55..d04316b 100644
--- a/modules/desktop/audio.nix
+++ b/modules/desktop/audio.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.audio;
+  cfg = config.getchoo.desktop.audio;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.audio.enable = mkEnableOption "enable audio support";
+  options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support";
 
   config = mkIf cfg.enable {
     services = {
diff --git a/modules/desktop/budgie/default.nix b/modules/desktop/budgie/default.nix
index 0053e4b..440bbc6 100644
--- a/modules/desktop/budgie/default.nix
+++ b/modules/desktop/budgie/default.nix
@@ -4,12 +4,14 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.budgie;
+  cfg = config.getchoo.desktop.budgie;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.budgie.enable = mkEnableOption "enable budgie";
+  options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie";
 
   config = mkIf cfg.enable {
+    getchoo.desktop.enable = true;
+
     services.xserver = {
       displayManager.lightdm.greeters.slick = {
         theme = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index a758d78..50b8854 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop;
+  cfg = config.getchoo.desktop;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
   imports = [
@@ -15,14 +15,15 @@ in {
     ./plasma
   ];
 
-  options.desktop.enable = mkEnableOption "desktop module";
+  options.getchoo.desktop.enable = mkEnableOption "desktop module";
 
   config = mkIf cfg.enable {
-    nixos.enable = true;
-
-    desktop = {
-      audio.enable = mkDefault true;
-      fonts.enable = mkDefault true;
+    getchoo = {
+      nixos.enable = true;
+      desktop = {
+        audio.enable = mkDefault true;
+        fonts.enable = mkDefault true;
+      };
     };
 
     environment = {
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index 9e968f7..95b2e4d 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -4,10 +4,10 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.fonts;
+  cfg = config.getchoo.desktop.fonts;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.fonts.enable = mkEnableOption "enable default fonts";
+  options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts";
 
   config = mkIf cfg.enable {
     fonts = {
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
index 55b53f5..fd3d34d 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.gnome;
+  cfg = config.getchoo.desktop.gnome;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.gnome.enable = mkEnableOption "enable gnome";
+  options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome";
 
   config = mkIf cfg.enable {
-    desktop.enable = true;
+    getchoo.desktop.enable = true;
 
     environment = {
       gnome.excludePackages = with pkgs; [
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
index 7434f52..84960f3 100644
--- a/modules/desktop/plasma/default.nix
+++ b/modules/desktop/plasma/default.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.plasma;
+  cfg = config.getchoo.desktop.plasma;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.plasma.enable = mkEnableOption "enable plasma";
+  options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma";
 
   config = mkIf cfg.enable {
-    desktop.enable = true;
+    getchoo.desktop.enable = true;
 
     environment.systemPackages = with pkgs; [pinentry-qt];
 
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 00f3169..cefa15c 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.myHardware;
+  cfg = config.getchoo.hardware;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.myHardware.enable = mkEnableOption "hardware module";
+  options.getchoo.hardware.enable = mkEnableOption "hardware module";
 
   imports = [
     ./nvidia.nix
diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
index 12f6550..c317226 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/hardware/nvidia.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  cfg = config.myHardware.nvidia;
+  cfg = config.getchoo.hardware.nvidia;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.myHardware.nvidia.enable = mkEnableOption "enable nvidia support";
+  options.getchoo.hardware.nvidia.enable = mkEnableOption "enable nvidia support";
 
   config = mkIf cfg.enable {
-    myHardware.enable = true;
+    getchoo.hardware.enable = true;
 
     hardware = {
       nvidia = {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 5767d6b..bbe334e 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.nixos;
+  cfg = config.getchoo.nixos;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.nixos.enable = mkEnableOption "base nixos module";
+  options.getchoo.nixos.enable = mkEnableOption "base nixos module";
 
   imports = [
     ./locale.nix
@@ -18,11 +18,13 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    base.enable = true;
-    nixos = {
-      defaultLocale.enable = mkDefault true;
-      defaultRoot.enable = mkDefault true;
-      networking.enable = mkDefault true;
+    getchoo = {
+      base.enable = true;
+      nixos = {
+        defaultLocale.enable = mkDefault true;
+        defaultRoot.enable = mkDefault true;
+        networking.enable = mkDefault true;
+      };
     };
   };
 }
diff --git a/modules/nixos/locale.nix b/modules/nixos/locale.nix
index 1ac2466..c362a6d 100644
--- a/modules/nixos/locale.nix
+++ b/modules/nixos/locale.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.nixos.defaultLocale;
+  cfg = config.getchoo.nixos.defaultLocale;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.nixos.defaultLocale.enable = mkEnableOption "enable default locale";
+  options.getchoo.nixos.defaultLocale.enable = mkEnableOption "enable default locale";
 
   config = mkIf cfg.enable {
     i18n = {
diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix
index 8ad670e..7dce2b1 100644
--- a/modules/nixos/network.nix
+++ b/modules/nixos/network.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.nixos.networking;
+  cfg = config.getchoo.nixos.networking;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.nixos.networking.enable = mkEnableOption "enable networking";
+  options.getchoo.nixos.networking.enable = mkEnableOption "enable networking";
 
   config = mkIf cfg.enable {
     networking.networkmanager = {
diff --git a/modules/nixos/root.nix b/modules/nixos/root.nix
index a49e3bf..f2e5878 100644
--- a/modules/nixos/root.nix
+++ b/modules/nixos/root.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.nixos.defaultRoot;
+  cfg = config.getchoo.nixos.defaultRoot;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.nixos.defaultRoot.enable = mkEnableOption "enable default root user";
+  options.getchoo.nixos.defaultRoot.enable = mkEnableOption "enable default root user";
 
   config = mkIf cfg.enable {
     users.users.root = {
diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix
index 5f2fec3..932cc6d 100644
--- a/modules/nixos/virtualisation.nix
+++ b/modules/nixos/virtualisation.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.nixos.virtualisation;
+  cfg = config.getchoo.nixos.virtualisation;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.nixos.virtualisation.enable = mkEnableOption "enable podman";
+  options.getchoo.nixos.virtualisation.enable = mkEnableOption "enable podman";
 
   config = mkIf cfg.enable {
     virtualisation = {
diff --git a/modules/server/default.nix b/modules/server/default.nix
index c68eb13..cce7625 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -4,25 +4,27 @@
   pkgs,
   ...
 }: let
-  cfg = config.server;
+  cfg = config.getchoo.server;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.server.enable = mkEnableOption "enable server configuration";
+  options.getchoo.server.enable = mkEnableOption "enable server configuration";
 
   config = mkIf cfg.enable {
-    base = {
-      enable = true;
-      documentation.enable = false;
-      defaultPackages.enable = false;
+    getchoo = {
+      base = {
+        enable = true;
+        documentation.enable = false;
+        defaultPackages.enable = false;
+      };
+
+      nixos = {
+        enable = true;
+        networking.enable = false;
+      };
     };
 
     environment.systemPackages = [pkgs.cachix];
 
-    nixos = {
-      enable = true;
-      networking.enable = false;
-    };
-
     networking = {
       firewall = let
         ports = [80 420];