From 104df464f94cda68cd17056c67f3f149f6492141 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Sun, 26 May 2024 17:41:49 +1200
Subject: [PATCH] refactor(sys): systemModules -> ooknet

---
 home/modules/desktop/tools/kdeconnect/default.nix     | 2 +-
 hosts/ooksdesk/default.nix                            | 4 ++--
 hosts/ooksmedia/default.nix                           | 4 ++--
 hosts/ooksmicro/default.nix                           | 4 ++--
 hosts/ookst480s/default.nix                           | 2 +-
 sys/modules/base/boot/loader/default.nix              | 2 +-
 sys/modules/base/boot/loader/systemd.nix              | 2 +-
 sys/modules/base/boot/plymouth.nix                    | 4 ++--
 sys/modules/base/default.nix                          | 2 +-
 sys/modules/base/displayManager/tuigreet.nix          | 2 +-
 sys/modules/base/host/admin.nix                       | 6 +++---
 sys/modules/base/host/hardware/common.nix             | 2 +-
 sys/modules/base/host/hardware/cpu/amd.nix            | 4 ++--
 sys/modules/base/host/hardware/cpu/default.nix        | 2 +-
 sys/modules/base/host/hardware/cpu/intel.nix          | 4 ++--
 sys/modules/base/host/hardware/features/audio.nix     | 2 +-
 sys/modules/base/host/hardware/features/backlight.nix | 2 +-
 sys/modules/base/host/hardware/features/battery.nix   | 6 +++---
 sys/modules/base/host/hardware/features/bluetooth.nix | 2 +-
 sys/modules/base/host/hardware/features/default.nix   | 2 +-
 sys/modules/base/host/hardware/features/ssd.nix       | 2 +-
 sys/modules/base/host/hardware/features/video.nix     | 2 +-
 sys/modules/base/host/hardware/gpu/amd.nix            | 2 +-
 sys/modules/base/host/hardware/gpu/default.nix        | 2 +-
 sys/modules/base/host/hardware/gpu/intel.nix          | 2 +-
 sys/modules/base/host/hardware/gpu/nvidia.nix         | 2 +-
 sys/modules/base/host/name.nix                        | 4 ++--
 sys/modules/base/host/role.nix                        | 2 +-
 sys/modules/base/host/type.nix                        | 2 +-
 sys/modules/base/networking/default.nix               | 2 +-
 sys/modules/base/networking/firewall.nix              | 2 +-
 sys/modules/base/networking/resolved.nix              | 2 +-
 sys/modules/base/networking/ssh.nix                   | 2 +-
 sys/modules/base/networking/tailscale.nix             | 4 ++--
 sys/modules/base/networking/tcp.nix                   | 2 +-
 sys/modules/base/nix/default.nix                      | 2 +-
 sys/modules/base/nix/nh.nix                           | 2 +-
 sys/modules/base/nix/nixpkgs.nix                      | 2 +-
 sys/modules/base/nix/subs.nix                         | 2 +-
 sys/modules/base/security/kernel.nix                  | 2 +-
 sys/modules/base/services/dbus.nix                    | 2 +-
 sys/modules/base/services/gnome.nix                   | 2 +-
 sys/modules/base/services/gvfs.nix                    | 2 +-
 sys/modules/base/services/system76Scheduler.nix       | 2 +-
 sys/modules/base/shell/bash/default.nix               | 4 ++--
 sys/modules/base/shell/fish/default.nix               | 6 +++---
 sys/modules/base/shell/zsh/default.nix                | 6 +++---
 sys/modules/base/virtualization/default.nix           | 2 +-
 sys/modules/roles/gaming/default.nix                  | 2 +-
 sys/modules/roles/media-server/services/nixarr.nix    | 2 +-
 sys/modules/roles/workstation/programs/1password.nix  | 2 +-
 sys/modules/roles/workstation/programs/dconf.nix      | 2 +-
 52 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/home/modules/desktop/tools/kdeconnect/default.nix b/home/modules/desktop/tools/kdeconnect/default.nix
index 93ebb2a..e2091d3 100644
--- a/home/modules/desktop/tools/kdeconnect/default.nix
+++ b/home/modules/desktop/tools/kdeconnect/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  host = osConfig.systemModules.host;
+  host = osConfig.ooknet.host;
 in
 
 {
diff --git a/hosts/ooksdesk/default.nix b/hosts/ooksdesk/default.nix
index 8f5ec32..4b2978b 100644
--- a/hosts/ooksdesk/default.nix
+++ b/hosts/ooksdesk/default.nix
@@ -9,7 +9,7 @@ in
 		./hardware-configuration.nix
 	];
 
-	systemModules.host = {
+	ooknet.host = {
 		name = "ooksdesk";
 		type = "desktop";
 		function = [ "workstation" "gaming" ];
@@ -27,7 +27,7 @@ in
 		};
 	};
   	
-	systemModules.networking.tailscale = {
+	ooknet.networking.tailscale = {
 		enable = true;
 		client = true;
 	};
diff --git a/hosts/ooksmedia/default.nix b/hosts/ooksmedia/default.nix
index 260974c..1240343 100644
--- a/hosts/ooksmedia/default.nix
+++ b/hosts/ooksmedia/default.nix
@@ -9,7 +9,7 @@ in
 		./hardware-configuration.nix
 	];
 
-	systemModules.host = {
+	ooknet.host = {
 		name = "ooksmedia";
 		type = "desktop";
 		function = [
@@ -35,7 +35,7 @@ in
 		};
 	};
   	
-	systemModules.networking.tailscale = {
+	ooknet.networking.tailscale = {
 		enable = true;
 		server = true;
 	};
diff --git a/hosts/ooksmicro/default.nix b/hosts/ooksmicro/default.nix
index ed312ad..8737850 100644
--- a/hosts/ooksmicro/default.nix
+++ b/hosts/ooksmicro/default.nix
@@ -8,12 +8,12 @@
 
     activeProfiles = ["base" "laptop"];
 
-		systemModules.user = {
+		ooknet.user = {
 			ooks.enable = true;
 			shell.fish.enable = true;
 		};
 
-		systemModules.laptop.power = {
+		ooknet.laptop.power = {
 			powersave = {
 				minFreq = 800;
 				maxFreq = 1600;
diff --git a/hosts/ookst480s/default.nix b/hosts/ookst480s/default.nix
index cbf61af..429647f 100644
--- a/hosts/ookst480s/default.nix
+++ b/hosts/ookst480s/default.nix
@@ -11,7 +11,7 @@ in
 	];
 
 
-		systemModules.host = {
+		ooknet.host = {
 			name = "ookst480s";
 			type = "laptop";
 			function = [ "workstation" ];
diff --git a/sys/modules/base/boot/loader/default.nix b/sys/modules/base/boot/loader/default.nix
index 931ca7a..d8a8665 100644
--- a/sys/modules/base/boot/loader/default.nix
+++ b/sys/modules/base/boot/loader/default.nix
@@ -10,7 +10,7 @@ in
     # ./grub
   ];
 
-  options.systemModules.boot.loader = mkOption {
+  options.ooknet.boot.loader = mkOption {
     type = types.enum ["systemd" "grub"];
     default = "systemd";
   };
diff --git a/sys/modules/base/boot/loader/systemd.nix b/sys/modules/base/boot/loader/systemd.nix
index d20b61f..64f5e76 100644
--- a/sys/modules/base/boot/loader/systemd.nix
+++ b/sys/modules/base/boot/loader/systemd.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  bootloader = config.systemModules.boot.loader;
+  bootloader = config.ooknet.boot.loader;
 in
 
 {
diff --git a/sys/modules/base/boot/plymouth.nix b/sys/modules/base/boot/plymouth.nix
index ba0860b..06ad440 100644
--- a/sys/modules/base/boot/plymouth.nix
+++ b/sys/modules/base/boot/plymouth.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.systemModules.boot.plymouth;
+  cfg = config.sys.boot.plymouth;
 in
 
 {
-  options.systemModules.boot.plymouth.enable = mkEnableOption "";
+  options.sys.boot.plymouth.enable = mkEnableOption "";
 
   config = mkIf cfg.enable {
     boot.plymouth = {
diff --git a/sys/modules/base/default.nix b/sys/modules/base/default.nix
index a0dfafb..7b630db 100644
--- a/sys/modules/base/default.nix
+++ b/sys/modules/base/default.nix
@@ -15,7 +15,7 @@
   ];
 
 
-  options.systemModules = {
+  options.ooknet = {
     virtualisation = {
       enable = lib.mkEnableOption "Enable virtualisation module";
     };
diff --git a/sys/modules/base/displayManager/tuigreet.nix b/sys/modules/base/displayManager/tuigreet.nix
index e2b6adf..b282bc2 100644
--- a/sys/modules/base/displayManager/tuigreet.nix
+++ b/sys/modules/base/displayManager/tuigreet.nix
@@ -2,7 +2,7 @@
 let
   inherit (lib) mkIf;
   tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 {
   config = mkIf (host.type != "phone") {
diff --git a/sys/modules/base/host/admin.nix b/sys/modules/base/host/admin.nix
index cce85c2..9b37185 100644
--- a/sys/modules/base/host/admin.nix
+++ b/sys/modules/base/host/admin.nix
@@ -1,14 +1,14 @@
 { lib, config, pkgs, inputs, outputs, self, ... }:
 
 let
-  cfg = config.systemModules.host.admin;
-  host = config.systemModules.host;
+  cfg = config.ooknet.host.admin;
+  host = config.ooknet.host;
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
   inherit (lib) mkIf types mkOption;
 in
 
 {
-  options.systemModules.host.admin = {
+  options.ooknet.host.admin = {
     name = mkOption {
       type = types.str;
       default = "ooks";
diff --git a/sys/modules/base/host/hardware/common.nix b/sys/modules/base/host/hardware/common.nix
index 84f1dc6..064a223 100644
--- a/sys/modules/base/host/hardware/common.nix
+++ b/sys/modules/base/host/hardware/common.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/host/hardware/cpu/amd.nix b/sys/modules/base/host/hardware/cpu/amd.nix
index 4449b2d..0929a25 100644
--- a/sys/modules/base/host/hardware/cpu/amd.nix
+++ b/sys/modules/base/host/hardware/cpu/amd.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) mkMerge mkEnableOption mkIf versionAtLeast versionOlder;
   inherit (builtins) elem;
-  cpu = config.systemModules.host.hardware.cpu; 
+  cpu = config.ooknet.host.hardware.cpu; 
   cfg = cpu.amd;
   kernelVersion = config.boot.kernelPackages.kernel.version;
   kernelVersionAtLeast = versionAtLeast kernelVersion;
@@ -11,7 +11,7 @@ let
 in
 
 {
-  options.systemModules.host.hardware.cpu.amd.pstate.enable = mkEnableOption "Enable amd pstate module";
+  options.ooknet.host.hardware.cpu.amd.pstate.enable = mkEnableOption "Enable amd pstate module";
 
   config = mkIf (elem cpu.type ["amd"]) {
     environment.systemPackages = [pkgs.amdctl];
diff --git a/sys/modules/base/host/hardware/cpu/default.nix b/sys/modules/base/host/hardware/cpu/default.nix
index f309f87..1fd7074 100644
--- a/sys/modules/base/host/hardware/cpu/default.nix
+++ b/sys/modules/base/host/hardware/cpu/default.nix
@@ -10,7 +10,7 @@ in
     ./intel.nix
   ];
 
-  options.systemModules.host.hardware.cpu.type = mkOption {
+  options.ooknet.host.hardware.cpu.type = mkOption {
     type = with types; nullOr (enum ["intel" "amd"]);
     default = null;
     description = "Type of cpu system module to use";
diff --git a/sys/modules/base/host/hardware/cpu/intel.nix b/sys/modules/base/host/hardware/cpu/intel.nix
index e6749f2..6897742 100644
--- a/sys/modules/base/host/hardware/cpu/intel.nix
+++ b/sys/modules/base/host/hardware/cpu/intel.nix
@@ -3,13 +3,13 @@
 let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  hardware = config.systemModules.host.hardware.cpu;
+  cpu = config.ooknet.host.hardware.cpu;
 in
 
 {
   # TODO: put kvm/gvt behind virtualization module flag
 
-  config = mkIf (elem hardware.type ["intel"]) {
+  config = mkIf (elem cpu.type ["intel"]) {
     boot = {
       kernelModules = ["kvm-intel"];
       kernelParams = ["i915.fastboot=1" "enable_gvt=1"];
diff --git a/sys/modules/base/host/hardware/features/audio.nix b/sys/modules/base/host/hardware/features/audio.nix
index d61954b..cb589bc 100644
--- a/sys/modules/base/host/hardware/features/audio.nix
+++ b/sys/modules/base/host/hardware/features/audio.nix
@@ -5,7 +5,7 @@ let
   inherit (lib.generators) toLua;
   inherit (lib.lists) elem optionals;
   # inherit (builtins) elem;
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
   hasBT = (elem "bluetooth" features);
 in
 
diff --git a/sys/modules/base/host/hardware/features/backlight.nix b/sys/modules/base/host/hardware/features/backlight.nix
index 0a60789..456db78 100644
--- a/sys/modules/base/host/hardware/features/backlight.nix
+++ b/sys/modules/base/host/hardware/features/backlight.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in
diff --git a/sys/modules/base/host/hardware/features/battery.nix b/sys/modules/base/host/hardware/features/battery.nix
index f933c0a..a0bdbe6 100644
--- a/sys/modules/base/host/hardware/features/battery.nix
+++ b/sys/modules/base/host/hardware/features/battery.nix
@@ -2,15 +2,15 @@
 { lib, config, pkgs, ... }:
 
 let
-  features = config.systemModules.host.hardware.features;
-  cfg = config.systemModules.host.hardware.battery;
+  features = config.ooknet.host.hardware.features;
+  cfg = config.ooknet.host.hardware.battery;
   inherit (lib) mkIf mkDefault mkOption types;
   inherit (builtins) elem;
   MHz = x: x * 1000;
 in
   
 {
-  options.systemModules.host.hardware.battery = {
+  options.ooknet.host.hardware.battery = {
     powersave = {
       minFreq = mkOption {
         type = types.int;
diff --git a/sys/modules/base/host/hardware/features/bluetooth.nix b/sys/modules/base/host/hardware/features/bluetooth.nix
index 874ce99..22c7eac 100644
--- a/sys/modules/base/host/hardware/features/bluetooth.nix
+++ b/sys/modules/base/host/hardware/features/bluetooth.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, self, ... }:
 
 let
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in
diff --git a/sys/modules/base/host/hardware/features/default.nix b/sys/modules/base/host/hardware/features/default.nix
index ad81c07..ffb1959 100644
--- a/sys/modules/base/host/hardware/features/default.nix
+++ b/sys/modules/base/host/hardware/features/default.nix
@@ -14,7 +14,7 @@ in
     ./video.nix
   ];
 
-  options.systemModules.host.hardware.features = mkOption {
+  options.ooknet.host.hardware.features = mkOption {
     type = with types; listOf (enum ["audio" "video" "bluetooth" "backlight" "battery" "ssd"]);
     default = [];
     description = "What extra hardware feature system modules to use";
diff --git a/sys/modules/base/host/hardware/features/ssd.nix b/sys/modules/base/host/hardware/features/ssd.nix
index b0dd097..44154eb 100644
--- a/sys/modules/base/host/hardware/features/ssd.nix
+++ b/sys/modules/base/host/hardware/features/ssd.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in
diff --git a/sys/modules/base/host/hardware/features/video.nix b/sys/modules/base/host/hardware/features/video.nix
index 52d5e15..17c9617 100644
--- a/sys/modules/base/host/hardware/features/video.nix
+++ b/sys/modules/base/host/hardware/features/video.nix
@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf;
   inherit (builtins) elem;
   isx86Linux = pkgs: with pkgs.stdenv; hostPlatform.isLinux && hostPlatform.isx86;
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
 in
 
 {
diff --git a/sys/modules/base/host/hardware/gpu/amd.nix b/sys/modules/base/host/hardware/gpu/amd.nix
index c1a4a35..3135351 100644
--- a/sys/modules/base/host/hardware/gpu/amd.nix
+++ b/sys/modules/base/host/hardware/gpu/amd.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  gpu = config.systemModules.host.hardware.gpu;
+  gpu = config.ooknet.host.hardware.gpu;
   inherit (lib) mkIf mkDefault;
   inherit (builtins) elem;
 in
diff --git a/sys/modules/base/host/hardware/gpu/default.nix b/sys/modules/base/host/hardware/gpu/default.nix
index beffd6d..71e16d3 100644
--- a/sys/modules/base/host/hardware/gpu/default.nix
+++ b/sys/modules/base/host/hardware/gpu/default.nix
@@ -11,7 +11,7 @@ in
     ./nvidia.nix
   ];
 
-  options.systemModules.host.hardware.gpu.type = mkOption {
+  options.ooknet.host.hardware.gpu.type = mkOption {
     type = with types; nullOr (enum ["intel" "amd" "nvidia"]);
     default = null;
     description = "Type of gpu system module to use";
diff --git a/sys/modules/base/host/hardware/gpu/intel.nix b/sys/modules/base/host/hardware/gpu/intel.nix
index 6974a71..58de15b 100644
--- a/sys/modules/base/host/hardware/gpu/intel.nix
+++ b/sys/modules/base/host/hardware/gpu/intel.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  gpu = config.systemModules.host.hardware.gpu;
+  gpu = config.ooknet.host.hardware.gpu;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 
diff --git a/sys/modules/base/host/hardware/gpu/nvidia.nix b/sys/modules/base/host/hardware/gpu/nvidia.nix
index c0ddec9..7931278 100644
--- a/sys/modules/base/host/hardware/gpu/nvidia.nix
+++ b/sys/modules/base/host/hardware/gpu/nvidia.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  gpu = config.systemModules.host.hardware.gpu;
+  gpu = config.ooknet.host.hardware.gpu;
   inherit (lib) mkIf mkDefault;
   inherit (builtins) elem;
   production = config.boot.kernelPackages.nvidiaPackages.production;
diff --git a/sys/modules/base/host/name.nix b/sys/modules/base/host/name.nix
index 895cfc2..036fdae 100644
--- a/sys/modules/base/host/name.nix
+++ b/sys/modules/base/host/name.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) types mkOption;
-  cfg = config.systemModules.host;
+  cfg = config.ooknet.host;
 in
 
 {
-  options.systemModules.host = {
+  options.ooknet.host = {
     name = mkOption {
       type = types.str;
       default = "ooksgeneric";
diff --git a/sys/modules/base/host/role.nix b/sys/modules/base/host/role.nix
index 06dd37b..b612fd8 100644
--- a/sys/modules/base/host/role.nix
+++ b/sys/modules/base/host/role.nix
@@ -5,7 +5,7 @@ let
 in
 
 {
-  options.systemModules.host.function = mkOption {
+  options.ooknet.host.function = mkOption {
     type = with types; listOf (enum ["gaming" "workstation" "media-server"]);
     default = [];
     description = "Host's primary function/s";
diff --git a/sys/modules/base/host/type.nix b/sys/modules/base/host/type.nix
index 5226056..1abb275 100644
--- a/sys/modules/base/host/type.nix
+++ b/sys/modules/base/host/type.nix
@@ -5,7 +5,7 @@ let
 in
 
 {
-  options.systemModules.host.type = mkOption {
+  options.ooknet.host.type = mkOption {
     type = types.enum ["desktop" "laptop" "mixed" "server" "phone" "laptop" "micro" "vm"];
     default = "";
     description = "Declare what type of device the host is";
diff --git a/sys/modules/base/networking/default.nix b/sys/modules/base/networking/default.nix
index 93f89f9..877247d 100644
--- a/sys/modules/base/networking/default.nix
+++ b/sys/modules/base/networking/default.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/networking/firewall.nix b/sys/modules/base/networking/firewall.nix
index 417f3b9..7a78ebb 100644
--- a/sys/modules/base/networking/firewall.nix
+++ b/sys/modules/base/networking/firewall.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/networking/resolved.nix b/sys/modules/base/networking/resolved.nix
index 07fcfd8..2f9a6c5 100644
--- a/sys/modules/base/networking/resolved.nix
+++ b/sys/modules/base/networking/resolved.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/networking/ssh.nix b/sys/modules/base/networking/ssh.nix
index 7020429..7fb4393 100644
--- a/sys/modules/base/networking/ssh.nix
+++ b/sys/modules/base/networking/ssh.nix
@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkDefault;
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
   phoneKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINredx07UAk2l1wUPujYnmJci1+XEmcUuSX0DIYg6Vzz";
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/networking/tailscale.nix b/sys/modules/base/networking/tailscale.nix
index 09c3631..8ec4262 100644
--- a/sys/modules/base/networking/tailscale.nix
+++ b/sys/modules/base/networking/tailscale.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.systemModules.networking.tailscale;
+  cfg = config.ooknet.networking.tailscale;
   inherit (config.services) tailscale;
   inherit (lib.lists) optionals;
   inherit (lib.types) bool listOf str; 
@@ -10,7 +10,7 @@ let
 in
 
 {
-  options.systemModules.networking.tailscale = {
+  options.ooknet.networking.tailscale = {
     enable = mkEnableOption "Enable tailscale system module";
     server = mkOption {
       type = bool;
diff --git a/sys/modules/base/networking/tcp.nix b/sys/modules/base/networking/tcp.nix
index 635cf4f..2005d7d 100644
--- a/sys/modules/base/networking/tcp.nix
+++ b/sys/modules/base/networking/tcp.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/nix/default.nix b/sys/modules/base/nix/default.nix
index 3ebbf38..e4b109c 100644
--- a/sys/modules/base/nix/default.nix
+++ b/sys/modules/base/nix/default.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf mapAttrs mapAttrsToList;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/nix/nh.nix b/sys/modules/base/nix/nh.nix
index e1d521a..aafdfdb 100644
--- a/sys/modules/base/nix/nh.nix
+++ b/sys/modules/base/nix/nh.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/nix/nixpkgs.nix b/sys/modules/base/nix/nixpkgs.nix
index 3241932..7285e89 100644
--- a/sys/modules/base/nix/nixpkgs.nix
+++ b/sys/modules/base/nix/nixpkgs.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/nix/subs.nix b/sys/modules/base/nix/subs.nix
index 073bdc5..c9bb7ea 100644
--- a/sys/modules/base/nix/subs.nix
+++ b/sys/modules/base/nix/subs.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/security/kernel.nix b/sys/modules/base/security/kernel.nix
index a22560f..fa372c0 100644
--- a/sys/modules/base/security/kernel.nix
+++ b/sys/modules/base/security/kernel.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) optionals mkForce concatLists;
   inherit (builtins) elem;
-  features = config.systemModules.host.hardware.features;
+  features = config.ooknet.host.hardware.features;
 in
 
 {
diff --git a/sys/modules/base/services/dbus.nix b/sys/modules/base/services/dbus.nix
index 104b40d..da92ade 100644
--- a/sys/modules/base/services/dbus.nix
+++ b/sys/modules/base/services/dbus.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf;
   inherit (lib.lists) any elem;
-  hasFunction = f: elem f config.systemModules.host.function;
+  hasFunction = f: elem f config.ooknet.host.function;
 in
 
 {
diff --git a/sys/modules/base/services/gnome.nix b/sys/modules/base/services/gnome.nix
index f3157fe..c1d65b0 100644
--- a/sys/modules/base/services/gnome.nix
+++ b/sys/modules/base/services/gnome.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host; 
+  host = config.ooknet.host; 
 in
 
 {
diff --git a/sys/modules/base/services/gvfs.nix b/sys/modules/base/services/gvfs.nix
index 451a49f..2dddc0a 100644
--- a/sys/modules/base/services/gvfs.nix
+++ b/sys/modules/base/services/gvfs.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/services/system76Scheduler.nix b/sys/modules/base/services/system76Scheduler.nix
index 97a880b..aba328a 100644
--- a/sys/modules/base/services/system76Scheduler.nix
+++ b/sys/modules/base/services/system76Scheduler.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/base/shell/bash/default.nix b/sys/modules/base/shell/bash/default.nix
index e30b028..eb2f54f 100644
--- a/sys/modules/base/shell/bash/default.nix
+++ b/sys/modules/base/shell/bash/default.nix
@@ -2,8 +2,8 @@
 
 let
   inherit (lib) mkIf;
-  adminShell = config.systemModules.host.admin.shell;
-  cfg = config.systemModules.shell.zsh;
+  adminShell = config.ooknet.host.admin.shell;
+  cfg = config.ooknet.shell.zsh;
 in
 
 {
diff --git a/sys/modules/base/shell/fish/default.nix b/sys/modules/base/shell/fish/default.nix
index b59dcb0..29d32d0 100644
--- a/sys/modules/base/shell/fish/default.nix
+++ b/sys/modules/base/shell/fish/default.nix
@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  adminShell = config.systemModules.host.admin.shell;
-  cfg = config.systemModules.shell.fish;
+  adminShell = config.ooknet.host.admin.shell;
+  cfg = config.ooknet.shell.fish;
 in
 
 {
-  options.systemModules.shell.fish.enable = mkEnableOption "Enable fish module";
+  options.ooknet.shell.fish.enable = mkEnableOption "Enable fish module";
 
   config = mkIf (adminShell == "fish" || cfg.enable) {
     programs.fish = {
diff --git a/sys/modules/base/shell/zsh/default.nix b/sys/modules/base/shell/zsh/default.nix
index f03f6de..9854435 100644
--- a/sys/modules/base/shell/zsh/default.nix
+++ b/sys/modules/base/shell/zsh/default.nix
@@ -2,13 +2,13 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  adminShell = config.systemModules.host.admin.shell;
-  cfg = config.systemModules.shell.zsh;
+  adminShell = config.ooknet.host.admin.shell;
+  cfg = config.ooknet.shell.zsh;
 in
 
 {
 
-  options.systemModules.shell.zsh.enable = mkEnableOption "Enable zsh module";
+  options.ooknet.shell.zsh.enable = mkEnableOption "Enable zsh module";
 
   config = mkIf (adminShell == "zsh" || cfg.enable) {
     programs.zsh = {
diff --git a/sys/modules/base/virtualization/default.nix b/sys/modules/base/virtualization/default.nix
index 82ec901..40adac1 100644
--- a/sys/modules/base/virtualization/default.nix
+++ b/sys/modules/base/virtualization/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.systemModules.virtualisation;
+  cfg = config.ooknet.virtualisation;
 in
 
 {
diff --git a/sys/modules/roles/gaming/default.nix b/sys/modules/roles/gaming/default.nix
index 597245a..86783c3 100644
--- a/sys/modules/roles/gaming/default.nix
+++ b/sys/modules/roles/gaming/default.nix
@@ -22,7 +22,7 @@ let
       gtk3-x11
     ];
   };
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/roles/media-server/services/nixarr.nix b/sys/modules/roles/media-server/services/nixarr.nix
index 0652eff..63d7157 100644
--- a/sys/modules/roles/media-server/services/nixarr.nix
+++ b/sys/modules/roles/media-server/services/nixarr.nix
@@ -1,7 +1,7 @@
 { config, inputs, ... }:
 
 let
-  admin = config.systemModules.host.admin;
+  admin = config.ooknet.host.admin;
 in
   
 {
diff --git a/sys/modules/roles/workstation/programs/1password.nix b/sys/modules/roles/workstation/programs/1password.nix
index ee33044..7e3c6c4 100644
--- a/sys/modules/roles/workstation/programs/1password.nix
+++ b/sys/modules/roles/workstation/programs/1password.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {
diff --git a/sys/modules/roles/workstation/programs/dconf.nix b/sys/modules/roles/workstation/programs/dconf.nix
index c9cc39d..ecbd75f 100644
--- a/sys/modules/roles/workstation/programs/dconf.nix
+++ b/sys/modules/roles/workstation/programs/dconf.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  host = config.systemModules.host;
+  host = config.ooknet.host;
 in
 
 {