diff --git a/home/modules/base/home-manager.nix b/home/modules/base/home-manager.nix
index a88bf9b..a87ab9a 100644
--- a/home/modules/base/home-manager.nix
+++ b/home/modules/base/home-manager.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkDefault;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   programs.home-manager.enable = true;
   systemd.user.startServices = "sd-switch";
diff --git a/home/modules/console/editor/helix/languages.nix b/home/modules/console/editor/helix/languages.nix
index 2c3e91a..d23a828 100644
--- a/home/modules/console/editor/helix/languages.nix
+++ b/home/modules/console/editor/helix/languages.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf getExe;
   cfg = config.ooknet.editor.helix;
-  console = config.ooknet.console;
+  inherit (config.ooknet) console;
 in {
   config = mkIf (cfg.enable || console.editor == "helix") {
     programs.helix.languages = {
diff --git a/home/modules/console/shell/bash/default.nix b/home/modules/console/shell/bash/default.nix
index 2370ddb..a2f5ee6 100644
--- a/home/modules/console/shell/bash/default.nix
+++ b/home/modules/console/shell/bash/default.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.bash;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   config = mkIf (cfg.enable || admin.shell == "bash") {
     programs.bash.enable = true;
diff --git a/home/modules/console/shell/fish/aliases.nix b/home/modules/console/shell/fish/aliases.nix
index bba82f8..2e4667f 100644
--- a/home/modules/console/shell/fish/aliases.nix
+++ b/home/modules/console/shell/fish/aliases.nix
@@ -9,7 +9,7 @@
   inherit (pkgs) bat eza dust nh;
 
   cfg = config.ooknet.shell.fish;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   config = mkIf (cfg.enable || admin.shell == "fish") {
     programs.fish = {
diff --git a/home/modules/console/shell/fish/plugins.nix b/home/modules/console/shell/fish/plugins.nix
index b553777..b067209 100644
--- a/home/modules/console/shell/fish/plugins.nix
+++ b/home/modules/console/shell/fish/plugins.nix
@@ -7,22 +7,22 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.fish;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   config = mkIf (cfg.enable || admin.shell == "fish") {
     programs.fish = {
       plugins = [
         {
           name = "done";
-          src = pkgs.fishPlugins.done.src;
+          inherit (pkgs.fishPlugins.done) src;
         }
         {
           name = "autopair";
-          src = pkgs.fishPlugins.autopair.src;
+          inherit (pkgs.fishPlugins.autopair) src;
         }
         {
           name = "colored-man-pages";
-          src = pkgs.fishPlugins.colored-man-pages.src;
+          inherit (pkgs.fishPlugins.colored-man-pages) src;
         }
       ];
     };
diff --git a/home/modules/console/shell/zsh/default.nix b/home/modules/console/shell/zsh/default.nix
index 2449d8d..8a7759c 100644
--- a/home/modules/console/shell/zsh/default.nix
+++ b/home/modules/console/shell/zsh/default.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.zsh;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   imports = [
     ./plugins.nix
diff --git a/home/modules/console/shell/zsh/plugins.nix b/home/modules/console/shell/zsh/plugins.nix
index 75bcb50..8f9dc3e 100644
--- a/home/modules/console/shell/zsh/plugins.nix
+++ b/home/modules/console/shell/zsh/plugins.nix
@@ -7,7 +7,7 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.zsh;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   config = mkIf (cfg.enable || admin.shell == "zsh") {
     programs.zsh.plugins = [
diff --git a/home/modules/console/tools/fzf.nix b/home/modules/console/tools/fzf.nix
index a9b168a..d1d8b02 100644
--- a/home/modules/console/tools/fzf.nix
+++ b/home/modules/console/tools/fzf.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
   cfg = config.ooknet.tools.fzf;
 in {
   config = mkIf cfg.enable {
diff --git a/home/modules/console/tools/git.nix b/home/modules/console/tools/git.nix
index 6237ce0..d477d24 100644
--- a/home/modules/console/tools/git.nix
+++ b/home/modules/console/tools/git.nix
@@ -7,7 +7,7 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.git;
-  admin = osConfig.ooknet.host.admin;
+  inherit (osConfig.ooknet.host) admin;
 in {
   config = mkIf cfg.enable {
     programs.git = {
diff --git a/home/modules/desktop/file-manager/nemo.nix b/home/modules/desktop/file-manager/nemo.nix
index ffdcdb7..d6d8a53 100644
--- a/home/modules/desktop/file-manager/nemo.nix
+++ b/home/modules/desktop/file-manager/nemo.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf mkMerge;
   cfg = config.ooknet.fileManager.nemo;
-  fileManager = config.ooknet.desktop.fileManager;
+  inherit (config.ooknet.desktop) fileManager;
   nemoMime = {
     "inode/directory" = ["nemo.desktop"];
   };
diff --git a/home/modules/desktop/productivity/notes/obsidian.nix b/home/modules/desktop/productivity/notes/obsidian.nix
index f592cc3..ee09996 100644
--- a/home/modules/desktop/productivity/notes/obsidian.nix
+++ b/home/modules/desktop/productivity/notes/obsidian.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf mkMerge hm;
   cfg = config.ooknet.productivity.notes.obsidian;
-  notes = config.ooknet.desktop.notes;
+  inherit (config.ooknet.desktop) notes;
   # admin = osConfig.ooknet.host.admin;
   # TODO: use admin.githubUsername
   notesRepo = "git@github.com:ooks-io/notes.git";
diff --git a/home/modules/desktop/security/polkit.nix b/home/modules/desktop/security/polkit.nix
index 992e676..5e430d9 100644
--- a/home/modules/desktop/security/polkit.nix
+++ b/home/modules/desktop/security/polkit.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  polkit = config.ooknet.security.polkit;
+  inherit (config.ooknet.security) polkit;
 in {
   config = {
     systemd.user.services = {
diff --git a/home/modules/desktop/tools/ookbrightness.nix b/home/modules/desktop/tools/ookbrightness.nix
index da8ce20..c2a64c1 100644
--- a/home/modules/desktop/tools/ookbrightness.nix
+++ b/home/modules/desktop/tools/ookbrightness.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  features = osConfig.ooknet.host.hardware.features;
+  inherit (osConfig.ooknet.host.hardware) features;
   ookbrightness = pkgs.writeShellApplication {
     name = "ookbrightness";
     runtimeInputs = with pkgs; [brillo libnotify];
diff --git a/home/modules/desktop/tools/ookpower.nix b/home/modules/desktop/tools/ookpower.nix
index 7ec412e..f067679 100644
--- a/home/modules/desktop/tools/ookpower.nix
+++ b/home/modules/desktop/tools/ookpower.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  launcher = config.ooknet.wayland.launcher;
+  inherit (config.ooknet.wayland) launcher;
 in {
   config = mkIf (launcher == "rofi") {
     home.packages = [inputs.ooks-scripts.packages.${pkgs.system}.powermenu];
diff --git a/home/modules/desktop/tools/ookvolume.nix b/home/modules/desktop/tools/ookvolume.nix
index 51b17bf..d1a1fd4 100644
--- a/home/modules/desktop/tools/ookvolume.nix
+++ b/home/modules/desktop/tools/ookvolume.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  features = osConfig.ooknet.host.hardware.features;
+  inherit (osConfig.ooknet.host.hardware) features;
   ookvolume = pkgs.writeShellApplication {
     name = "ookvolume";
     runtimeInputs = with pkgs; [pamixer libnotify];
diff --git a/home/modules/desktop/tools/zellijMenu.nix b/home/modules/desktop/tools/zellijMenu.nix
index 2dd5e5d..6d869dd 100644
--- a/home/modules/desktop/tools/zellijMenu.nix
+++ b/home/modules/desktop/tools/zellijMenu.nix
@@ -5,9 +5,9 @@
   ...
 }: let
   inherit (lib) mkIf;
-  multiplexer = config.ooknet.console.multiplexer;
-  launcher = config.ooknet.wayland.launcher;
-  binds = config.ooknet.binds;
+  inherit (config.ooknet.console) multiplexer;
+  inherit (config.ooknet.wayland) launcher;
+  inherit (config.ooknet) binds;
   zellijmenu = pkgs.writeShellApplication {
     name = "zellijmenu";
     runtimeInputs = with pkgs; [coreutils rofi-wayland];
diff --git a/home/modules/desktop/wayland/compositor/hyprland/default.nix b/home/modules/desktop/wayland/compositor/hyprland/default.nix
index 3b221dd..c2e0a78 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/default.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/default.nix
@@ -5,7 +5,7 @@
   pkgs,
   ...
 }: let
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
   inherit (lib) mkIf;
 in {
   imports = [
diff --git a/home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix b/home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix
index 2d9c851..b52e2dd 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     home.packages = with inputs; [
diff --git a/home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix b/home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix
index d3448dd..b8fa982 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     home.packages = [pkgs.hyprshade];
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix
index 1ebbfa3..79f468a 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix
@@ -4,8 +4,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
-  binds = config.ooknet.binds;
+  inherit (config.ooknet) wayland;
+  inherit (config.ooknet) binds;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/env.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/env.nix
index f784385..66d31bd 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/env.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/env.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.env = [
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix
index f83e51d..5ac3bbd 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix
index 714773c..3dbc198 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.gestures = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix
index 9147e0e..d20b4f4 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.input = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix
index 80d4554..acd4128 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.misc = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix
index 128ccad..fb03e3a 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix
@@ -5,8 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf concatMap;
-  wayland = config.ooknet.wayland;
-  monitors = osConfig.ooknet.host.hardware.monitors;
+  inherit (config.ooknet) wayland;
+  inherit (osConfig.ooknet.host.hardware) monitors;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix
index 8bb8f0a..79dc686 100644
--- a/home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix
+++ b/home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  wayland = config.ooknet.wayland;
+  inherit (config.ooknet) wayland;
 in {
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
diff --git a/home/modules/desktop/wayland/variables.nix b/home/modules/desktop/wayland/variables.nix
index 3339f1f..2e0a59e 100644
--- a/home/modules/desktop/wayland/variables.nix
+++ b/home/modules/desktop/wayland/variables.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   cfg = config.ooknet.wayland;
-  gpu = osConfig.ooknet.host.hardware.gpu;
+  inherit (osConfig.ooknet.host.hardware) gpu;
 in {
   config = mkIf cfg.enable {
     home.sessionVariables =
diff --git a/home/profiles/desktop-environments/hyprland.nix b/home/profiles/desktop-environments/hyprland.nix
index bfe2717..52bf4cf 100644
--- a/home/profiles/desktop-environments/hyprland.nix
+++ b/home/profiles/desktop-environments/hyprland.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  desktop = config.ooknet.desktop;
+  inherit (config.ooknet) desktop;
 in {
   config = mkIf (desktop.environment == "hyprland") {
     ooknet.wayland = {
diff --git a/home/profiles/suites/console-tools.nix b/home/profiles/suites/console-tools.nix
index 4eda45b..fbfcae8 100644
--- a/home/profiles/suites/console-tools.nix
+++ b/home/profiles/suites/console-tools.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = osConfig.ooknet.host.profiles;
+  inherit (osConfig.ooknet.host) profiles;
 in {
   config = mkIf (elem "console-tools" profiles) {
     ooknet.tools = {
diff --git a/home/profiles/suites/creative.nix b/home/profiles/suites/creative.nix
index bafbfcf..2dc0e5e 100644
--- a/home/profiles/suites/creative.nix
+++ b/home/profiles/suites/creative.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = osConfig.ooknet.host.profiles;
+  inherit (osConfig.ooknet.host) profiles;
 in {
   config = mkIf (elem "creative" profiles) {
     ooknet.creative = {
diff --git a/home/profiles/suites/gaming.nix b/home/profiles/suites/gaming.nix
index 0d29ade..d4711e9 100644
--- a/home/profiles/suites/gaming.nix
+++ b/home/profiles/suites/gaming.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = osConfig.ooknet.host.profiles;
+  inherit (osConfig.ooknet.host) profiles;
 in {
   config = mkIf (elem "gaming" profiles) {
     ooknet.gaming = {
diff --git a/home/profiles/suites/media.nix b/home/profiles/suites/media.nix
index a71b034..9995648 100644
--- a/home/profiles/suites/media.nix
+++ b/home/profiles/suites/media.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = osConfig.ooknet.host.profiles;
+  inherit (osConfig.ooknet.host) profiles;
 in {
   config = mkIf (elem "media" profiles) {
     ooknet.media = {
diff --git a/home/profiles/suites/productivity.nix b/home/profiles/suites/productivity.nix
index 1aa7f49..ee81da3 100644
--- a/home/profiles/suites/productivity.nix
+++ b/home/profiles/suites/productivity.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = osConfig.ooknet.host.profiles;
+  inherit (osConfig.ooknet.host) profiles;
 in {
   config = mkIf (elem "productiviy" profiles) {
     ooknet.productivity = {
diff --git a/home/profiles/themes/minimal.nix b/home/profiles/themes/minimal.nix
index c5351e3..587bde1 100644
--- a/home/profiles/themes/minimal.nix
+++ b/home/profiles/themes/minimal.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  theme = config.ooknet.theme;
+  inherit (config.ooknet) theme;
 in {
   imports = [inputs.nix-colors.homeManagerModule];
   config = mkIf (theme == "minimal") {
diff --git a/home/profiles/themes/phone.nix b/home/profiles/themes/phone.nix
index 8be93c5..f976712 100644
--- a/home/profiles/themes/phone.nix
+++ b/home/profiles/themes/phone.nix
@@ -7,7 +7,7 @@
 }: let
   inherit (inputs.nix-colors) colorSchemes;
   inherit (lib) mkIf;
-  theme = config.ooknet.theme;
+  inherit (config.ooknet) theme;
 in {
   config = mkIf (theme == "phone") {
     colorscheme = colorSchemes.gruvbox-material-dark-soft;
diff --git a/home/roles/ooks-desktop-workstation.nix b/home/roles/ooks-desktop-workstation.nix
index 2552094..ded79c3 100644
--- a/home/roles/ooks-desktop-workstation.nix
+++ b/home/roles/ooks-desktop-workstation.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = osConfig.ooknet.host;
+  inherit (osConfig.ooknet) host;
 in {
   config = mkIf (host.admin.name == "ooks" && host.type == "desktop" && host.role == "workstation") {
     ooknet = {
diff --git a/home/roles/ooks-laptop-workstation.nix b/home/roles/ooks-laptop-workstation.nix
index 9576792..3c0b873 100644
--- a/home/roles/ooks-laptop-workstation.nix
+++ b/home/roles/ooks-laptop-workstation.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = osConfig.ooknet.host;
+  inherit (osConfig.ooknet) host;
 in {
   config = mkIf (host.admin.name == "ooks" && host.type == "laptop" && host.role == "workstation") {
     ooknet = {
diff --git a/home/roles/ooks-micro-workstation.nix b/home/roles/ooks-micro-workstation.nix
index cc6f78a..24adc3f 100644
--- a/home/roles/ooks-micro-workstation.nix
+++ b/home/roles/ooks-micro-workstation.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = osConfig.ooknet.host;
+  inherit (osConfig.ooknet) host;
 in {
   config = mkIf (host.admin.name == "ooks" && host.type == "micro" && host.role == "workstation") {
     ooknet = {
diff --git a/hosts/ooksmedia/modules/nixarr.nix b/hosts/ooksmedia/modules/nixarr.nix
index 90e56c5..257011e 100644
--- a/hosts/ooksmedia/modules/nixarr.nix
+++ b/hosts/ooksmedia/modules/nixarr.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  admin = config.ooknet.host.admin;
+  inherit (config.ooknet.host) admin;
   cfg = config.ooknet.services.nixarr;
 in {
   config = mkIf cfg.enable {
diff --git a/hosts/ooksphone/modules/openssh.nix b/hosts/ooksphone/modules/openssh.nix
index 1e0c329..fb7ca0c 100644
--- a/hosts/ooksphone/modules/openssh.nix
+++ b/hosts/ooksphone/modules/openssh.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.ssh = {
     enable = true;
     startAgent = true;
diff --git a/nixos/modules/base/displayManager/tuigreet.nix b/nixos/modules/base/displayManager/tuigreet.nix
index b6f730a..7f125f5 100644
--- a/nixos/modules/base/displayManager/tuigreet.nix
+++ b/nixos/modules/base/displayManager/tuigreet.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     services.greetd = {
diff --git a/nixos/modules/base/networking/default.nix b/nixos/modules/base/networking/default.nix
index 1ac0ee8..b01532c 100644
--- a/nixos/modules/base/networking/default.nix
+++ b/nixos/modules/base/networking/default.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   imports = [
     ./firewall.nix
diff --git a/nixos/modules/base/networking/firewall.nix b/nixos/modules/base/networking/firewall.nix
index 3fad5f1..560ec2f 100644
--- a/nixos/modules/base/networking/firewall.nix
+++ b/nixos/modules/base/networking/firewall.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     networking.firewall = {
diff --git a/nixos/modules/base/networking/resolved.nix b/nixos/modules/base/networking/resolved.nix
index 002ed22..024b580 100644
--- a/nixos/modules/base/networking/resolved.nix
+++ b/nixos/modules/base/networking/resolved.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     services.resolved = {
diff --git a/nixos/modules/base/networking/ssh.nix b/nixos/modules/base/networking/ssh.nix
index 72aef52..88f8c38 100644
--- a/nixos/modules/base/networking/ssh.nix
+++ b/nixos/modules/base/networking/ssh.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf mkDefault;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     services.openssh = {
diff --git a/nixos/modules/base/networking/tcp.nix b/nixos/modules/base/networking/tcp.nix
index 5de3a57..ecc6ddb 100644
--- a/nixos/modules/base/networking/tcp.nix
+++ b/nixos/modules/base/networking/tcp.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   # nyx module
   config = mkIf (host.type != "phone") {
diff --git a/nixos/modules/base/nix/default.nix b/nixos/modules/base/nix/default.nix
index 7f24944..46ff505 100644
--- a/nixos/modules/base/nix/default.nix
+++ b/nixos/modules/base/nix/default.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mapAttrs mapAttrsToList;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   imports = [
     ./nh.nix
diff --git a/nixos/modules/base/nix/nh.nix b/nixos/modules/base/nix/nh.nix
index 418a2c7..6e35476 100644
--- a/nixos/modules/base/nix/nh.nix
+++ b/nixos/modules/base/nix/nh.nix
@@ -5,8 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
-  admin = host.admin;
+  inherit (config.ooknet) host;
+  inherit (host) admin;
 in {
   config = mkIf (host.type != "phone") {
     environment.variables.FLAKE = mkIf admin.homeManager "/home/${admin.name}/.config/ooknet/";
diff --git a/nixos/modules/base/nix/nixpkgs.nix b/nixos/modules/base/nix/nixpkgs.nix
index a7e528e..b9c3806 100644
--- a/nixos/modules/base/nix/nixpkgs.nix
+++ b/nixos/modules/base/nix/nixpkgs.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     nixpkgs = {
diff --git a/nixos/modules/base/nix/subs.nix b/nixos/modules/base/nix/subs.nix
index 8964deb..fbfccdc 100644
--- a/nixos/modules/base/nix/subs.nix
+++ b/nixos/modules/base/nix/subs.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     nix.settings = {
diff --git a/nixos/modules/base/secrets.nix b/nixos/modules/base/secrets.nix
index dc725a0..314171d 100644
--- a/nixos/modules/base/secrets.nix
+++ b/nixos/modules/base/secrets.nix
@@ -6,9 +6,9 @@
 }: let
   inherit (lib) mkIf;
 
-  host = config.ooknet.host;
-  admin = host.admin;
-  tailscale = host.networking.tailscale;
+  inherit (config.ooknet) host;
+  inherit (host) admin;
+  inherit (host.networking) tailscale;
 in {
   age.identityPaths = [
     "/home/${admin.name}/.ssh/id_ed25519"
diff --git a/nixos/modules/base/security/kernel.nix b/nixos/modules/base/security/kernel.nix
index a21205d..4c834d9 100644
--- a/nixos/modules/base/security/kernel.nix
+++ b/nixos/modules/base/security/kernel.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) optionals mkForce concatLists;
   inherit (builtins) elem;
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
 in {
   security = {
     # Protects the kernel from being tampered with at runtime. prevents the ability to hibernate.
diff --git a/nixos/modules/host/admin.nix b/nixos/modules/host/admin.nix
index 9852779..365e232 100644
--- a/nixos/modules/host/admin.nix
+++ b/nixos/modules/host/admin.nix
@@ -17,7 +17,7 @@ in {
       isNormalUser = true;
       shell = pkgs.${cfg.shell};
       initialPassword = "password";
-      openssh.authorizedKeys.keys = [(keys.users."${cfg.name}")];
+      openssh.authorizedKeys.keys = [keys.users."${cfg.name}"];
       extraGroups =
         [
           "wheel"
diff --git a/nixos/modules/host/hardware/common.nix b/nixos/modules/host/hardware/common.nix
index a5470e4..33500f6 100644
--- a/nixos/modules/host/hardware/common.nix
+++ b/nixos/modules/host/hardware/common.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type != "phone") {
     hardware = {
diff --git a/nixos/modules/host/hardware/cpu/amd.nix b/nixos/modules/host/hardware/cpu/amd.nix
index 8daa5c1..ca7ef03 100644
--- a/nixos/modules/host/hardware/cpu/amd.nix
+++ b/nixos/modules/host/hardware/cpu/amd.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkMerge mkIf versionAtLeast versionOlder;
   inherit (builtins) elem;
-  cpu = config.ooknet.host.hardware.cpu;
+  inherit (config.ooknet.host.hardware) cpu;
   cfg = cpu.amd;
   kernelVersion = config.boot.kernelPackages.kernel.version;
   kernelVersionAtLeast = versionAtLeast kernelVersion;
diff --git a/nixos/modules/host/hardware/cpu/intel.nix b/nixos/modules/host/hardware/cpu/intel.nix
index f192446..042ed66 100644
--- a/nixos/modules/host/hardware/cpu/intel.nix
+++ b/nixos/modules/host/hardware/cpu/intel.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  cpu = config.ooknet.host.hardware.cpu;
+  inherit (config.ooknet.host.hardware) cpu;
 in {
   # TODO: put kvm/gvt behind virtualization module flag
 
diff --git a/nixos/modules/host/hardware/features/backlight.nix b/nixos/modules/host/hardware/features/backlight.nix
index a792b62..ca9ee3b 100644
--- a/nixos/modules/host/hardware/features/backlight.nix
+++ b/nixos/modules/host/hardware/features/backlight.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in {
diff --git a/nixos/modules/host/hardware/features/battery.nix b/nixos/modules/host/hardware/features/battery.nix
index 752e2e2..2cefe2f 100644
--- a/nixos/modules/host/hardware/features/battery.nix
+++ b/nixos/modules/host/hardware/features/battery.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
   cfg = config.ooknet.host.hardware.battery;
   inherit (lib) mkIf mkDefault;
   inherit (builtins) elem;
diff --git a/nixos/modules/host/hardware/features/bluetooth.nix b/nixos/modules/host/hardware/features/bluetooth.nix
index 87c42d8..6e25d20 100644
--- a/nixos/modules/host/hardware/features/bluetooth.nix
+++ b/nixos/modules/host/hardware/features/bluetooth.nix
@@ -5,7 +5,7 @@
   self,
   ...
 }: let
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in {
diff --git a/nixos/modules/host/hardware/features/ssd.nix b/nixos/modules/host/hardware/features/ssd.nix
index f8c4d65..a84534b 100644
--- a/nixos/modules/host/hardware/features/ssd.nix
+++ b/nixos/modules/host/hardware/features/ssd.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
   inherit (lib) mkIf;
   inherit (builtins) elem;
 in {
diff --git a/nixos/modules/host/hardware/features/video.nix b/nixos/modules/host/hardware/features/video.nix
index 685171d..6407f1b 100644
--- a/nixos/modules/host/hardware/features/video.nix
+++ b/nixos/modules/host/hardware/features/video.nix
@@ -8,7 +8,7 @@
   inherit (lib) mkIf;
   inherit (builtins) elem;
   isx86Linux = pkgs: with pkgs.stdenv; hostPlatform.isLinux && hostPlatform.isx86;
-  features = config.ooknet.host.hardware.features;
+  inherit (config.ooknet.host.hardware) features;
 in {
   config = mkIf (elem "video" features) {
     hardware = {
diff --git a/nixos/modules/host/hardware/gpu/amd.nix b/nixos/modules/host/hardware/gpu/amd.nix
index ccd580f..83db7b0 100644
--- a/nixos/modules/host/hardware/gpu/amd.nix
+++ b/nixos/modules/host/hardware/gpu/amd.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  gpu = config.ooknet.host.hardware.gpu;
+  inherit (config.ooknet.host.hardware) gpu;
   inherit (lib) mkIf mkDefault;
   inherit (builtins) elem;
 in {
diff --git a/nixos/modules/host/hardware/gpu/intel.nix b/nixos/modules/host/hardware/gpu/intel.nix
index cad8028..5776eac 100644
--- a/nixos/modules/host/hardware/gpu/intel.nix
+++ b/nixos/modules/host/hardware/gpu/intel.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  gpu = config.ooknet.host.hardware.gpu;
+  inherit (config.ooknet.host.hardware) gpu;
   inherit (lib) mkIf;
   inherit (builtins) elem;
   # vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
diff --git a/nixos/modules/host/hardware/gpu/nvidia.nix b/nixos/modules/host/hardware/gpu/nvidia.nix
index 56eb86f..ff9fbd4 100644
--- a/nixos/modules/host/hardware/gpu/nvidia.nix
+++ b/nixos/modules/host/hardware/gpu/nvidia.nix
@@ -4,11 +4,11 @@
   pkgs,
   ...
 }: let
-  gpu = config.ooknet.host.hardware.gpu;
+  inherit (config.ooknet.host.hardware) gpu;
   inherit (lib) mkIf mkDefault;
   inherit (builtins) elem;
   # production = config.boot.kernelPackages.nvidiaPackages.production;
-  beta = config.boot.kernelPackages.nvidiaPackages.beta;
+  inherit (config.boot.kernelPackages.nvidiaPackages) beta;
 in {
   # TODO: make option to choose nvidia package
   config = mkIf (gpu.type == "nvidia") {
diff --git a/nixos/modules/programs/1password.nix b/nixos/modules/programs/1password.nix
index c70aac4..18e3a58 100644
--- a/nixos/modules/programs/1password.nix
+++ b/nixos/modules/programs/1password.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  admin = config.ooknet.host.admin;
+  inherit (config.ooknet.host) admin;
   cfg = config.ooknet.programs._1password;
 in {
   config = mkIf cfg.enable {
diff --git a/nixos/options/host.nix b/nixos/options/host.nix
index b3d31e2..56000f4 100644
--- a/nixos/options/host.nix
+++ b/nixos/options/host.nix
@@ -7,9 +7,9 @@
   inherit (lib.types) bool enum listOf int submodule nullOr str;
   inherit (lib.lists) optionals concatLists;
 
-  admin = config.ooknet.host.admin;
-  hardware = config.ooknet.host.hardware;
-  tailscale = config.ooknet.host.networking.tailscale;
+  inherit (config.ooknet.host) admin;
+  inherit (config.ooknet.host) hardware;
+  inherit (config.ooknet.host.networking) tailscale;
 in {
   options.ooknet.host = {
     name = mkOption {
diff --git a/nixos/profiles/gaming.nix b/nixos/profiles/gaming.nix
index 09af84a..c675f14 100644
--- a/nixos/profiles/gaming.nix
+++ b/nixos/profiles/gaming.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = config.ooknet.host.profiles;
+  inherit (config.ooknet.host) profiles;
 in {
   config = mkIf (elem "gaming" profiles) {
     ooknet.gaming = {
diff --git a/nixos/profiles/media-server.nix b/nixos/profiles/media-server.nix
index a6cceb5..315a877 100644
--- a/nixos/profiles/media-server.nix
+++ b/nixos/profiles/media-server.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
-  profiles = config.ooknet.host.profiles;
+  inherit (config.ooknet.host) profiles;
 in {
   config = mkIf (elem "media-server" profiles) {
     ooknet.services.nixarr.enable = true;
diff --git a/nixos/roles/desktop-workstation.nix b/nixos/roles/desktop-workstation.nix
index b85ac34..3d24500 100644
--- a/nixos/roles/desktop-workstation.nix
+++ b/nixos/roles/desktop-workstation.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type == "desktop" && host.role == "workstation") {
     ooknet = {
diff --git a/nixos/roles/laptop-workstation.nix b/nixos/roles/laptop-workstation.nix
index 52874f0..be1679d 100644
--- a/nixos/roles/laptop-workstation.nix
+++ b/nixos/roles/laptop-workstation.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  inherit (config.ooknet) host;
 in {
   config = mkIf (host.type == "laptop" && host.role == "workstation") {
     ooknet = {