From 1d1cb3092f99e94726d9bb141dff7d122db145dc Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Thu, 30 May 2024 22:02:18 +1200
Subject: [PATCH] refactor(home): homeModules -> ooknet

---
 home/modules/config/default.nix               |   2 +-
 home/modules/config/home/default.nix          |   2 +-
 home/modules/config/mimeApps/default.nix      |   2 +-
 home/modules/config/nix/default.nix           |   2 +-
 home/modules/config/userDirs/default.nix      |   2 +-
 home/modules/console/editor/default.nix       |   2 +-
 home/modules/console/editor/helix/default.nix |   2 +-
 .../console/editor/helix/languages.nix        |   2 +-
 home/modules/console/editor/nvim/default.nix  |   2 +-
 .../console/editor/nvim/keymapping.nix        |   2 +-
 .../console/editor/nvim/plugins/default.nix   |   2 +-
 .../console/editor/nvim/plugins/indent.nix    |   2 +-
 .../console/editor/nvim/plugins/lualine.nix   |   2 +-
 .../console/editor/nvim/plugins/telescope.nix |   2 +-
 home/modules/console/editor/nvim/settings.nix |   2 +-
 home/modules/console/fileManager/default.nix  |   2 +-
 .../console/fileManager/lf/default.nix        |   2 +-
 home/modules/console/multiplexer/default.nix  |   2 +-
 .../console/multiplexer/tmux/default.nix      |   2 +-
 .../console/multiplexer/zellij/default.nix    |   2 +-
 home/modules/console/prompt/default.nix       |   9 +-
 home/modules/console/prompt/starship.nix      |  77 ++++++++++++
 .../console/prompt/starship/default.nix       | 110 ------------------
 home/modules/console/shell/bash/default.nix   |   2 +-
 home/modules/console/shell/default.nix        |   2 +-
 home/modules/console/shell/fish/default.nix   |   2 +-
 home/modules/console/shell/zsh/default.nix    |   4 +-
 home/modules/console/utility/default.nix      |   2 +-
 home/modules/console/utility/git/default.nix  |   2 +-
 .../console/utility/nixIndex/default.nix      |   2 +-
 home/modules/console/utility/ssh/default.nix  |   7 +-
 .../modules/console/utility/tools/default.nix |   4 +-
 home/modules/desktop/browser/default.nix      |   2 +-
 .../desktop/browser/firefox/default.nix       |   2 +-
 .../desktop/browser/schizofox/default.nix     |   4 +-
 .../desktop/communication/discord/default.nix |   6 +-
 .../creative/audio/audacity/default.nix       |   4 +-
 .../creative/image/inkscape/default.nix       |   4 +-
 .../desktop/gaming/bottles/default.nix        |   4 +-
 home/modules/desktop/gaming/default.nix       |   2 +-
 .../desktop/gaming/factorio/default.nix       |   2 +-
 .../modules/desktop/gaming/lutris/default.nix |   4 +-
 home/modules/desktop/media/image/default.nix  |   2 +-
 .../desktop/media/image/imv/default.nix       |   2 +-
 home/modules/desktop/media/music/default.nix  |   2 +-
 .../media/music/easyeffects/default.nix       |   4 +-
 .../desktop/media/music/tui/default.nix       |   4 +-
 home/modules/desktop/media/video/default.nix  |   2 +-
 .../desktop/media/video/jellyfin/default.nix  |   2 +-
 .../desktop/media/video/mpv/default.nix       |   2 +-
 .../desktop/media/video/youtube/default.nix   |   2 +-
 home/modules/desktop/productivity/default.nix |   2 +-
 .../desktop/productivity/obsidian/default.nix |   2 +-
 .../desktop/productivity/office/default.nix   |   4 +-
 .../desktop/productivity/zathura/default.nix  |   4 +-
 .../desktop/security/polkit/default.nix       |   4 +-
 home/modules/desktop/terminal/default.nix     |   4 +-
 .../modules/desktop/terminal/foot/default.nix |   4 +-
 .../desktop/terminal/kitty/default.nix        |   6 +-
 .../desktop/wayland/bar/ags/default.nix       |   2 +-
 home/modules/desktop/wayland/bar/default.nix  |   2 +-
 .../desktop/wayland/bar/waybar/default.nix    |   4 +-
 home/modules/desktop/wayland/default.nix      |   4 +-
 .../wayland/launcher/anyrun/default.nix       |   2 +-
 .../desktop/wayland/launcher/default.nix      |   2 +-
 .../desktop/wayland/launcher/rofi/default.nix |   4 +-
 .../desktop/wayland/launcher/tofi/default.nix |   4 +-
 .../desktop/wayland/lockscreen/default.nix    |   2 +-
 .../wayland/lockscreen/hyprlock/default.nix   |   4 +-
 .../wayland/lockscreen/swaylock/default.nix   |   6 +-
 .../desktop/wayland/notification/default.nix  |   2 +-
 .../wayland/notification/mako/default.nix     |   4 +-
 .../desktop/wayland/utility/default.nix       |   2 +-
 .../wayland/utility/gammastep/default.nix     |   2 +-
 .../desktop/wayland/utility/tools/default.nix |   2 +-
 .../desktop/wayland/windowManager/default.nix |   2 +-
 .../windowManager/hyprland/default.nix        |   2 +-
 .../windowManager/hyprland/extras/default.nix |   2 +-
 .../hyprland/extras/hyprcapture/default.nix   |   2 +-
 .../hyprland/extras/hyprshade/default.nix     |   2 +-
 .../hyprland/settings/appearance.nix          |   2 +-
 .../windowManager/hyprland/settings/binds.nix |   2 +-
 .../windowManager/hyprland/settings/env.nix   |   2 +-
 .../windowManager/hyprland/settings/exec.nix  |   2 +-
 .../hyprland/settings/gestures.nix            |   2 +-
 .../hyprland/settings/hyprpaper.nix           |   4 +-
 .../hyprland/settings/inputs.nix              |   2 +-
 .../windowManager/hyprland/settings/misc.nix  |   2 +-
 .../hyprland/settings/monitor.nix             |   2 +-
 .../windowManager/hyprland/settings/rules.nix |   2 +-
 home/modules/theme/cursor/default.nix         |   4 +-
 home/modules/theme/fonts/default.nix          |   4 +-
 home/modules/theme/gtk/default.nix            |   6 +-
 home/modules/theme/qt/default.nix             |   4 +-
 home/modules/theme/wallpaper/default.nix      |   6 +-
 home/profile/base/default.nix                 |   2 +-
 home/profile/gaming/default.nix               |   2 +-
 home/profile/hyprland/default.nix             |   2 +-
 home/profile/productivity/default.nix         |   2 +-
 home/profile/themes/minimal/default.nix       |   2 +-
 home/profile/themes/phone/default.nix         |   2 +-
 home/user/erika@ookst480.nix                  |   0
 home/user/ooks/ooksmedia/default.nix          |   2 +-
 home/user/ooks/ooksphone/default.nix          |   2 +-
 104 files changed, 214 insertions(+), 255 deletions(-)
 create mode 100644 home/modules/console/prompt/starship.nix
 delete mode 100644 home/modules/console/prompt/starship/default.nix
 delete mode 100644 home/user/erika@ookst480.nix

diff --git a/home/modules/config/default.nix b/home/modules/config/default.nix
index 8d4ce62..9170a3a 100644
--- a/home/modules/config/default.nix
+++ b/home/modules/config/default.nix
@@ -9,7 +9,7 @@
     ./mimeApps
   ];
 
-  options.homeModules.config = {
+  options.ooknet.config = {
     nix.enable = lib.mkEnableOption "enable nix configuration module";
     home.enable = lib.mkEnableOption "enable home configuration module";
     userDirs.enable = lib.mkEnableOption "enable userDirs configuration module";
diff --git a/home/modules/config/home/default.nix b/home/modules/config/home/default.nix
index 4ad5b61..d5e254b 100644
--- a/home/modules/config/home/default.nix
+++ b/home/modules/config/home/default.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.config.home;
+  cfg = config.ooknet.config.home;
 in
 
 {
diff --git a/home/modules/config/mimeApps/default.nix b/home/modules/config/mimeApps/default.nix
index 5c9eb5d..e9806ff 100644
--- a/home/modules/config/mimeApps/default.nix
+++ b/home/modules/config/mimeApps/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.config.mimeApps;
+  cfg = config.ooknet.config.mimeApps;
 
   browser = ["${config.home.sessionVariables.BROWSER}.desktop"];
   zathura = ["org.pwmt.zethura.desktop.desktop"];
diff --git a/home/modules/config/nix/default.nix b/home/modules/config/nix/default.nix
index 6914812..09294d5 100644
--- a/home/modules/config/nix/default.nix
+++ b/home/modules/config/nix/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, outputs, ... }:
 
 let
-  cfg = config.homeModules.config.nix;
+  cfg = config.ooknet.config.nix;
 in
 
 {
diff --git a/home/modules/config/userDirs/default.nix b/home/modules/config/userDirs/default.nix
index d5d9a63..477e582 100644
--- a/home/modules/config/userDirs/default.nix
+++ b/home/modules/config/userDirs/default.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.config.userDirs;
+  cfg = config.ooknet.config.userDirs;
 in
 
 {
diff --git a/home/modules/console/editor/default.nix b/home/modules/console/editor/default.nix
index 0f37368..3e3c85c 100644
--- a/home/modules/console/editor/default.nix
+++ b/home/modules/console/editor/default.nix
@@ -6,7 +6,7 @@
     # ./nvim
   ];
 
-  options.homeModules.console.editor = {
+  options.ooknet.console.editor = {
     helix = {
       enable = lib.mkEnableOption "Enable helix text editor";
       default = lib.mkOption {
diff --git a/home/modules/console/editor/helix/default.nix b/home/modules/console/editor/helix/default.nix
index 9076e4b..c8f8e2f 100644
--- a/home/modules/console/editor/helix/default.nix
+++ b/home/modules/console/editor/helix/default.nix
@@ -1,6 +1,6 @@
 { inputs, config, pkgs, lib, ... }:
 let
-  cfg = config.homeModules.console.editor.helix;
+  cfg = config.ooknet.console.editor.helix;
   inherit (config) colorscheme;
 in
 {
diff --git a/home/modules/console/editor/helix/languages.nix b/home/modules/console/editor/helix/languages.nix
index cf75133..f4c369b 100644
--- a/home/modules/console/editor/helix/languages.nix
+++ b/home/modules/console/editor/helix/languages.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, ... }: 
 
 let
-  cfg = config.homeModules.console.editor.helix;
+  cfg = config.ooknet.console.editor.helix;
 in
 
 {
diff --git a/home/modules/console/editor/nvim/default.nix b/home/modules/console/editor/nvim/default.nix
index 619924c..6dcdf27 100644
--- a/home/modules/console/editor/nvim/default.nix
+++ b/home/modules/console/editor/nvim/default.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (config.colorscheme) palette;
-  cfg = config.homeModules.console.editor.nvim;
+  cfg = config.ooknet.console.editor.nvim;
 in
   
 {
diff --git a/home/modules/console/editor/nvim/keymapping.nix b/home/modules/console/editor/nvim/keymapping.nix
index fd8e36c..aa07722 100644
--- a/home/modules/console/editor/nvim/keymapping.nix
+++ b/home/modules/console/editor/nvim/keymapping.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.homeModules.console.editor.nvim;
+  cfg = config.ooknet.console.editor.nvim;
 in
 
 {
diff --git a/home/modules/console/editor/nvim/plugins/default.nix b/home/modules/console/editor/nvim/plugins/default.nix
index 6252beb..f3b83d1 100644
--- a/home/modules/console/editor/nvim/plugins/default.nix
+++ b/home/modules/console/editor/nvim/plugins/default.nix
@@ -7,7 +7,7 @@
     ./lualine.nix
   ];
 
-  options.homeModules.console.editor.nvim.plugins = {
+  options.ooknet.console.editor.nvim.plugins = {
     indentBlankline = lib.mkOption {
       type = lib.types.bool;
       default = false;
diff --git a/home/modules/console/editor/nvim/plugins/indent.nix b/home/modules/console/editor/nvim/plugins/indent.nix
index 2530645..382b960 100644
--- a/home/modules/console/editor/nvim/plugins/indent.nix
+++ b/home/modules/console/editor/nvim/plugins/indent.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.homeModules.console.editor.nvim.plugins;
+  cfg = config.ooknet.console.editor.nvim.plugins;
 in
 
 {
diff --git a/home/modules/console/editor/nvim/plugins/lualine.nix b/home/modules/console/editor/nvim/plugins/lualine.nix
index 8dd26e6..48bb2d5 100644
--- a/home/modules/console/editor/nvim/plugins/lualine.nix
+++ b/home/modules/console/editor/nvim/plugins/lualine.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.homeModules.console.editor.nvim.plugins;
+  cfg = config.ooknet.console.editor.nvim.plugins;
 in
 
 {
diff --git a/home/modules/console/editor/nvim/plugins/telescope.nix b/home/modules/console/editor/nvim/plugins/telescope.nix
index 16f82f0..1657324 100644
--- a/home/modules/console/editor/nvim/plugins/telescope.nix
+++ b/home/modules/console/editor/nvim/plugins/telescope.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.homeModules.console.editor.nvim.plugins;
+  cfg = config.ooknet.console.editor.nvim.plugins;
 in
 
 {
diff --git a/home/modules/console/editor/nvim/settings.nix b/home/modules/console/editor/nvim/settings.nix
index 500b7fd..e0b955c 100644
--- a/home/modules/console/editor/nvim/settings.nix
+++ b/home/modules/console/editor/nvim/settings.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (config.colorscheme) palette;
-  cfg = config.homeModules.console.editor.nvim;
+  cfg = config.ooknet.console.editor.nvim;
 in
 
 {
diff --git a/home/modules/console/fileManager/default.nix b/home/modules/console/fileManager/default.nix
index b3ad9cd..e553e64 100644
--- a/home/modules/console/fileManager/default.nix
+++ b/home/modules/console/fileManager/default.nix
@@ -7,7 +7,7 @@
     # ./ranger
   ];
 
-  options.homeModules.console.fileManager = {
+  options.ooknet.console.fileManager = {
     lf = {
       enable = lib.mkEnableOption "Enable lf file manager";
       default = lib.mkOption {
diff --git a/home/modules/console/fileManager/lf/default.nix b/home/modules/console/fileManager/lf/default.nix
index 1dbdbf3..212d55d 100644
--- a/home/modules/console/fileManager/lf/default.nix
+++ b/home/modules/console/fileManager/lf/default.nix
@@ -4,7 +4,7 @@
 #     - ripdrag support
 #     - color parity with eza
 let
- cfg = config.homeModules.console.fileManager.lf;
+ cfg = config.ooknet.console.fileManager.lf;
 in
 
 {
diff --git a/home/modules/console/multiplexer/default.nix b/home/modules/console/multiplexer/default.nix
index 219321c..efcc864 100644
--- a/home/modules/console/multiplexer/default.nix
+++ b/home/modules/console/multiplexer/default.nix
@@ -6,7 +6,7 @@
     ./tmux
   ];
 
-  options.homeModules.console.multiplexer = {
+  options.ooknet.console.multiplexer = {
     zellij = {
       enable = lib.mkEnableOption "Enable zellij multiplexer";
     };
diff --git a/home/modules/console/multiplexer/tmux/default.nix b/home/modules/console/multiplexer/tmux/default.nix
index 1e7a6d7..7f9d1cc 100644
--- a/home/modules/console/multiplexer/tmux/default.nix
+++ b/home/modules/console/multiplexer/tmux/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.homeModules.console.multiplexer.tmux;
+  cfg = config.ooknet.console.multiplexer.tmux;
   inherit (config.colorscheme) palette;
 in
 
diff --git a/home/modules/console/multiplexer/zellij/default.nix b/home/modules/console/multiplexer/zellij/default.nix
index 6966e2d..69eadf5 100644
--- a/home/modules/console/multiplexer/zellij/default.nix
+++ b/home/modules/console/multiplexer/zellij/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 let
   inherit (config.colorscheme) palette;
-  cfg = config.homeModules.console.multiplexer.zellij;
+  cfg = config.ooknet.console.multiplexer.zellij;
 in
 
 {
diff --git a/home/modules/console/prompt/default.nix b/home/modules/console/prompt/default.nix
index 8b1eed5..fc29043 100644
--- a/home/modules/console/prompt/default.nix
+++ b/home/modules/console/prompt/default.nix
@@ -1,12 +1,5 @@
-{ lib, ... }:
 {
   imports = [
-    ./starship
+    ./starship.nix
   ];
-
-  options.homeModules.console.prompt = {
-    starship = {
-      enable = lib.mkEnableOption "Enable starship prompt";
-    };
-  };
 }
diff --git a/home/modules/console/prompt/starship.nix b/home/modules/console/prompt/starship.nix
new file mode 100644
index 0000000..2c351dd
--- /dev/null
+++ b/home/modules/console/prompt/starship.nix
@@ -0,0 +1,77 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.ooknet.console.prompt.starship;
+  inherit (lib) concatStrings mkEnableOption mkIf;
+in
+
+{
+  options.ooknet.console.prompt.starship.enable = mkEnableOption "";
+  config = mkIf cfg.enable {
+    programs.starship = {
+      enable = true;
+      settings = {
+        format = concatStrings [
+          "$username"
+          "$hostname"
+          "$nix_shell"
+          "$shlvl"
+          "$directory"
+          "$git_branch"
+          "$git_commit"
+          "$git_state"
+          "$git_status"
+          "$jobs"
+          "$character"
+        ];
+
+        directory = {
+          truncation_length = 0;
+          truncate_to_repo = true;
+        };
+
+        fill = {
+          symbol = " ";
+          disabled = false;
+        };
+
+        character = {
+          error_symbol = "[](bold red)";
+          success_symbol = "[](bold green)";
+          vimcmd_symbol = "[](bold yellow)";
+          vimcmd_visual_symbol = "[](bold cyan)";
+          vimcmd_replace_symbol = "[](bold purple)";
+          vimcmd_replace_one_symbol = "[](bold purple)";
+        };
+
+        aws.symbol = "  ";
+        conda.symbol = " ";
+        dart.symbol = " ";
+        directory.read_only = " ";
+        docker_context.symbol = " ";
+        elixir.symbol = " ";
+        elm.symbol = " ";
+        gcloud.symbol = " ";
+        git_branch.symbol = " ";
+        golang.symbol = " ";
+        hg_branch.symbol = " ";
+        java.symbol = " ";
+        julia.symbol = " ";
+        memory_usage.symbol = "󰍛 ";
+        nim.symbol = "󰆥 ";
+        nodejs.symbol = " ";
+        package.symbol = "󰏗 ";
+        perl.symbol = " ";
+        php.symbol = " ";
+        python.symbol = " ";
+        ruby.symbol = " ";
+        rust.symbol = " ";
+        scala.symbol = " ";
+        shlvl.symbol = "";
+        swift.symbol = "󰛥 ";
+        terraform.symbol = "󱁢";
+      };
+    };
+  };
+}
+
diff --git a/home/modules/console/prompt/starship/default.nix b/home/modules/console/prompt/starship/default.nix
deleted file mode 100644
index e64c3f7..0000000
--- a/home/modules/console/prompt/starship/default.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.homeModules.console.prompt.starship;
-in
-
-{
-  config = lib.mkIf cfg.enable {
-    programs.starship = {
-      enable = true;
-      settings = {
-        format =
-          let
-            git = "$git_branch$git_commit$git_state$git_status";
-            cloud = "$aws$gcloud$openstack";
-          in
-          ''
-            ($nix_shell)$directory(${git})(- ${cloud})$jobs$character
-          '';
-
-        fill = {
-          symbol = " ";
-          disabled = false;
-        };
-
-        # Core
-        username = {
-          format = "[$user]($style)";
-          show_always = true;
-        };
-        hostname = {
-          format = "[@$hostname]($style) ";
-          ssh_only = false;
-          style = "bold green";
-        };
-        shlvl = {
-          format = "[$shlvl]($style) ";
-          style = "bold cyan";
-          threshold = 2;
-          repeat = true;
-          disabled = false;
-        };
-        cmd_duration = {
-          format = "took [$duration]($style) ";
-        };
-
-        directory = {
-          format = "[$path]($style)( [$read_only]($read_only_style)) ";
-        };
-        nix_shell = {
-          format = "[($name \\(develop\\) <- )$symbol]($style) ";
-          impure_msg = "";
-          symbol = " ";
-          style = "bold red";
-        };
-
-        character = {
-          error_symbol = "[](bold red)";
-          success_symbol = "[](bold green)";
-          vimcmd_symbol = "[](bold yellow)";
-          vimcmd_visual_symbol = "[](bold cyan)";
-          vimcmd_replace_symbol = "[](bold purple)";
-          vimcmd_replace_one_symbol = "[](bold purple)";
-        };
-
-        time = {
-          format = "\\\[[$time]($style)\\\]";
-          disabled = false;
-        };
-
-        # Cloud
-        gcloud = {
-          format = "on [$symbol$active(/$project)(\\($region\\))]($style)";
-        };
-        aws = {
-          format = "on [$symbol$profile(\\($region\\))]($style)";
-        };
-
-        # Icon changes only \/
-        aws.symbol = "  ";
-        conda.symbol = " ";
-        dart.symbol = " ";
-        directory.read_only = " ";
-        docker_context.symbol = " ";
-        elixir.symbol = " ";
-        elm.symbol = " ";
-        gcloud.symbol = " ";
-        git_branch.symbol = " ";
-        golang.symbol = " ";
-        hg_branch.symbol = " ";
-        java.symbol = " ";
-        julia.symbol = " ";
-        memory_usage.symbol = "󰍛 ";
-        nim.symbol = "󰆥 ";
-        nodejs.symbol = " ";
-        package.symbol = "󰏗 ";
-        perl.symbol = " ";
-        php.symbol = " ";
-        python.symbol = " ";
-        ruby.symbol = " ";
-        rust.symbol = " ";
-        scala.symbol = " ";
-        shlvl.symbol = "";
-        swift.symbol = "󰛥 ";
-        terraform.symbol = "󱁢";
-      };
-    };
-  };
-}
-
diff --git a/home/modules/console/shell/bash/default.nix b/home/modules/console/shell/bash/default.nix
index cdc635f..5b4e550 100644
--- a/home/modules/console/shell/bash/default.nix
+++ b/home/modules/console/shell/bash/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  cfg = config.homeModules.console.shell.bash;
+  cfg = config.ooknet.console.shell.bash;
 in
 {
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/console/shell/default.nix b/home/modules/console/shell/default.nix
index f10fcc1..41b4809 100644
--- a/home/modules/console/shell/default.nix
+++ b/home/modules/console/shell/default.nix
@@ -6,7 +6,7 @@
     ./zsh
   ];
 
-  options.homeModules.console.shell = {
+  options.ooknet.console.shell = {
     fish = {
       enable = lib.mkEnableOption "Enable fish configuration";
     };
diff --git a/home/modules/console/shell/fish/default.nix b/home/modules/console/shell/fish/default.nix
index 9fcaee9..521c3d4 100644
--- a/home/modules/console/shell/fish/default.nix
+++ b/home/modules/console/shell/fish/default.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  cfg = config.homeModules.console.shell.fish;
+  cfg = config.ooknet.console.shell.fish;
   inherit (lib) mkIf;
   hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages;
   hasEza = hasPackage "eza";
diff --git a/home/modules/console/shell/zsh/default.nix b/home/modules/console/shell/zsh/default.nix
index 4f421c6..aa12938 100644
--- a/home/modules/console/shell/zsh/default.nix
+++ b/home/modules/console/shell/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.homeModules.console.shell.zsh;
+  cfg = config.ooknet.console.shell.zsh;
 in
 
 {
-  options.homeModules.console.shell.zsh.enable = mkEnableOption "";
+  options.ooknet.console.shell.zsh.enable = mkEnableOption "";
 
   config = mkIf cfg.enable {
     programs.zsh = {
diff --git a/home/modules/console/utility/default.nix b/home/modules/console/utility/default.nix
index b878df2..0483aea 100644
--- a/home/modules/console/utility/default.nix
+++ b/home/modules/console/utility/default.nix
@@ -7,7 +7,7 @@
     ./ssh
   ];
 
-  options.homeModules.console.utility = {
+  options.ooknet.console.utility = {
     nixIndex = {
       enable = lib.mkEnableOption "Enable nixIndex configuration";
     };
diff --git a/home/modules/console/utility/git/default.nix b/home/modules/console/utility/git/default.nix
index 80bbe48..5fe77ca 100644
--- a/home/modules/console/utility/git/default.nix
+++ b/home/modules/console/utility/git/default.nix
@@ -1,6 +1,6 @@
 { pkgs, config, lib, ... }:
   let 
-    cfg = config.homeModules.console.utility.git;
+    cfg = config.ooknet.console.utility.git;
   in
 { 
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/console/utility/nixIndex/default.nix b/home/modules/console/utility/nixIndex/default.nix
index d757c9e..09cd677 100644
--- a/home/modules/console/utility/nixIndex/default.nix
+++ b/home/modules/console/utility/nixIndex/default.nix
@@ -1,6 +1,6 @@
 { pkgs, config, lib, ... }:
 let
-  cfg = config.homeModules.console.utility.nixIndex;
+  cfg = config.ooknet.console.utility.nixIndex;
   update-script = pkgs.writeShellApplication {
     name = "fetch-nix-index-database";
     runtimeInputs = with pkgs; [ wget coreutils ];
diff --git a/home/modules/console/utility/ssh/default.nix b/home/modules/console/utility/ssh/default.nix
index 1c13e59..dcc3d82 100644
--- a/home/modules/console/utility/ssh/default.nix
+++ b/home/modules/console/utility/ssh/default.nix
@@ -1,8 +1,8 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.console.utility.ssh;
-  hasFish = mkIf config.homeModules.console.shell.fish.enable;
+  cfg = config.ooknet.console.utility.ssh;
+  hasFish = mkIf config.ooknet.console.shell.fish.enable;
   inherit (lib) mkIf;
 in
 
@@ -16,9 +16,8 @@ in
             IdentityAgent "~/.1password/agent.sock"
       '';
     };
-    programs.fish.interactiveShellInit = hasFish ''
+    programs.fish.interactiveShellInit = hasFish /* fish */ ''
       set -gx SSH_AUTH_SOCK ~/.1password/agent.sock
     '';
   };
-  
 }
diff --git a/home/modules/console/utility/tools/default.nix b/home/modules/console/utility/tools/default.nix
index ea81f66..60bc2d1 100644
--- a/home/modules/console/utility/tools/default.nix
+++ b/home/modules/console/utility/tools/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 let
-  cfg = config.homeModules.console.utility.tools;
+  cfg = config.ooknet.console.utility.tools;
 in
 {
   config = lib.mkIf cfg.enable {
@@ -61,7 +61,7 @@ in
       };
       fzf = {
         enable = true;
-        enableFishIntegration = lib.mkIf config.homeModules.console.shell.fish.enable true;
+        enableFishIntegration = lib.mkIf config.ooknet.console.shell.fish.enable true;
         defaultCommand = "rg --files --hidden";
         changeDirWidgetOptions = [
           "--preview 'eza --icons -L 3 -T --color always {} | head -200'"
diff --git a/home/modules/desktop/browser/default.nix b/home/modules/desktop/browser/default.nix
index d3d0869..e3adccc 100644
--- a/home/modules/desktop/browser/default.nix
+++ b/home/modules/desktop/browser/default.nix
@@ -8,7 +8,7 @@
     #./brave -- still needs tio be implemented
   ];
 
-  options.homeModules.desktop.browser = {
+  options.ooknet.desktop.browser = {
     firefox = {
       enable = lib.mkEnableOption "Enable firefox browser";
       default = lib.mkOption {
diff --git a/home/modules/desktop/browser/firefox/default.nix b/home/modules/desktop/browser/firefox/default.nix
index 7536ae6..1838fab 100644
--- a/home/modules/desktop/browser/firefox/default.nix
+++ b/home/modules/desktop/browser/firefox/default.nix
@@ -2,7 +2,7 @@
 
 let
   addons = inputs.firefox-addons.packages.${pkgs.system};
-  cfg = config.homeModules.desktop.browser.firefox;
+  cfg = config.ooknet.desktop.browser.firefox;
   inherit (lib) mkIf;
 in
 {
diff --git a/home/modules/desktop/browser/schizofox/default.nix b/home/modules/desktop/browser/schizofox/default.nix
index 80eed31..ddc10ed 100644
--- a/home/modules/desktop/browser/schizofox/default.nix
+++ b/home/modules/desktop/browser/schizofox/default.nix
@@ -1,8 +1,8 @@
 { inputs, config, lib, ... }:
 
 let
-  cfg = config.homeModules.desktop.browser.schizofox;
-  fonts = config.homeModules.theme.fonts;
+  cfg = config.ooknet.desktop.browser.schizofox;
+  fonts = config.ooknet.theme.fonts;
   inherit (config.colorscheme) palette;
 in
 
diff --git a/home/modules/desktop/communication/discord/default.nix b/home/modules/desktop/communication/discord/default.nix
index b119f8b..78a3a23 100644
--- a/home/modules/desktop/communication/discord/default.nix
+++ b/home/modules/desktop/communication/discord/default.nix
@@ -1,14 +1,14 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.communication.discord;
-  fonts = config.homeModules.theme.fonts;
+  cfg = config.ooknet.desktop.communication.discord;
+  fonts = config.ooknet.theme.fonts;
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf mkEnableOption;
 in
 
 {
-  options.homeModules.desktop.communication.discord.enable = mkEnableOption "Enable discord home manager module";
+  options.ooknet.desktop.communication.discord.enable = mkEnableOption "Enable discord home manager module";
   config = mkIf cfg.enable {
     home.packages = [ pkgs.vesktop ];
 
diff --git a/home/modules/desktop/creative/audio/audacity/default.nix b/home/modules/desktop/creative/audio/audacity/default.nix
index 6f69341..2c83bdf 100644
--- a/home/modules/desktop/creative/audio/audacity/default.nix
+++ b/home/modules/desktop/creative/audio/audacity/default.nix
@@ -1,12 +1,12 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.creative.audio.audacity;
+  cfg = config.ooknet.desktop.creative.audio.audacity;
   inherit (lib) mkIf mkEnableOption;
 in
 
 {
-  options.homeModules.desktop.creative.audio.audacity.enable = mkEnableOption "Enable audacity home module";
+  options.ooknet.desktop.creative.audio.audacity.enable = mkEnableOption "Enable audacity home module";
   config = mkIf cfg.enable {
     home.packages = [ pkgs.audacity ];
   };
diff --git a/home/modules/desktop/creative/image/inkscape/default.nix b/home/modules/desktop/creative/image/inkscape/default.nix
index fa4bb14..d563ce5 100644
--- a/home/modules/desktop/creative/image/inkscape/default.nix
+++ b/home/modules/desktop/creative/image/inkscape/default.nix
@@ -1,12 +1,12 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.creative.audio.inkscape;
+  cfg = config.ooknet.desktop.creative.audio.inkscape;
   inherit (lib) mkIf mkEnableOption;
 in
 
 {
-  options.homeModules.desktop.creative.audio.inkscape.enable = mkEnableOption "Enable inkscape home module";
+  options.ooknet.desktop.creative.audio.inkscape.enable = mkEnableOption "Enable inkscape home module";
   config = mkIf cfg.enable {
     home.packages = [ pkgs.inkscape-with-extensions ];
   };
diff --git a/home/modules/desktop/gaming/bottles/default.nix b/home/modules/desktop/gaming/bottles/default.nix
index 80e4401..0209447 100644
--- a/home/modules/desktop/gaming/bottles/default.nix
+++ b/home/modules/desktop/gaming/bottles/default.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.homeModules.desktop.gaming.bottles;
+  cfg = config.ooknet.desktop.gaming.bottles;
 in
 
 {
-  options.homeModules.desktop.gaming.bottles.enable = mkEnableOption "Enable bottles home-manager modules";
+  options.ooknet.desktop.gaming.bottles.enable = mkEnableOption "Enable bottles home-manager modules";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/modules/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix
index 24800f5..7972160 100644
--- a/home/modules/desktop/gaming/default.nix
+++ b/home/modules/desktop/gaming/default.nix
@@ -8,7 +8,7 @@
     ./bottles
   ];
 
-  options.homeModules.desktop.gaming = {
+  options.ooknet.desktop.gaming = {
     factorio = {
       enable = lib.mkEnableOption "Enable factorio home module";
     };
diff --git a/home/modules/desktop/gaming/factorio/default.nix b/home/modules/desktop/gaming/factorio/default.nix
index c0b8c9d..db9d7da 100644
--- a/home/modules/desktop/gaming/factorio/default.nix
+++ b/home/modules/desktop/gaming/factorio/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg=config.homeModules.desktop.gaming.factorio;
+  cfg=config.ooknet.desktop.gaming.factorio;
 in
 
 {
diff --git a/home/modules/desktop/gaming/lutris/default.nix b/home/modules/desktop/gaming/lutris/default.nix
index 7985dbc..67dacc9 100644
--- a/home/modules/desktop/gaming/lutris/default.nix
+++ b/home/modules/desktop/gaming/lutris/default.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.homeModules.desktop.gaming.lutris;
+  cfg = config.ooknet.desktop.gaming.lutris;
 in
 
 {
-  options.homeModules.desktop.gaming.lutris.enable = mkEnableOption "Enable lutris home-manager module";
+  options.ooknet.desktop.gaming.lutris.enable = mkEnableOption "Enable lutris home-manager module";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/modules/desktop/media/image/default.nix b/home/modules/desktop/media/image/default.nix
index 167517d..54c743f 100644
--- a/home/modules/desktop/media/image/default.nix
+++ b/home/modules/desktop/media/image/default.nix
@@ -4,7 +4,7 @@
     ./imv
   ];
 
-  options.homeModules.desktop.media.image = {
+  options.ooknet.desktop.media.image = {
     imv = {
       enable = lib.mkEnableOption "Enable imv image viewer";
     };
diff --git a/home/modules/desktop/media/image/imv/default.nix b/home/modules/desktop/media/image/imv/default.nix
index 67d455c..9c9e2f3 100644
--- a/home/modules/desktop/media/image/imv/default.nix
+++ b/home/modules/desktop/media/image/imv/default.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  cfg = config.homeModules.desktop.media.image.imv;
+  cfg = config.ooknet.desktop.media.image.imv;
 in
 {
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/desktop/media/music/default.nix b/home/modules/desktop/media/music/default.nix
index 3dde328..9144298 100644
--- a/home/modules/desktop/media/music/default.nix
+++ b/home/modules/desktop/media/music/default.nix
@@ -6,7 +6,7 @@
     ./tui
   ];
 
-  options.homeModules.desktop.media.music = {
+  options.ooknet.desktop.media.music = {
     tui = {
       enable = lib.mkEnableOption "Enable tui music";
     };
diff --git a/home/modules/desktop/media/music/easyeffects/default.nix b/home/modules/desktop/media/music/easyeffects/default.nix
index 727c758..15084e1 100644
--- a/home/modules/desktop/media/music/easyeffects/default.nix
+++ b/home/modules/desktop/media/music/easyeffects/default.nix
@@ -1,12 +1,12 @@
 {lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.media.music.easyeffects;
+  cfg = config.ooknet.desktop.media.music.easyeffects;
   inherit (lib) mkIf mkEnableOption;
 in
 
 {
-  options.homeModules.desktop.media.music.easyeffects.enable = mkEnableOption "Enable easy effects home module";
+  options.ooknet.desktop.media.music.easyeffects.enable = mkEnableOption "Enable easy effects home module";
   config = mkIf cfg.enable {
     services.easyeffects = {
       enable = true;
diff --git a/home/modules/desktop/media/music/tui/default.nix b/home/modules/desktop/media/music/tui/default.nix
index 29d7237..abe49a1 100644
--- a/home/modules/desktop/media/music/tui/default.nix
+++ b/home/modules/desktop/media/music/tui/default.nix
@@ -2,8 +2,8 @@
 
 let
   inherit (config.colorscheme) palette;
-  cfg = config.homeModules.desktop.media.music.tui;
-  zellij = config.homeModules.console.multiplexer.zellij;
+  cfg = config.ooknet.desktop.media.music.tui;
+  zellij = config.ooknet.console.multiplexer.zellij;
   spotify-cli = pkgs.spotify-player.override {
     withImage = false;
     withSixel = false;
diff --git a/home/modules/desktop/media/video/default.nix b/home/modules/desktop/media/video/default.nix
index 8e6d3b6..02d8048 100644
--- a/home/modules/desktop/media/video/default.nix
+++ b/home/modules/desktop/media/video/default.nix
@@ -6,7 +6,7 @@
     ./mpv
   ];
   
-  options.homeModules.desktop.media.video = {
+  options.ooknet.desktop.media.video = {
     mpv = {
       enable = lib.mkEnableOption "Enable mpv video player";
     };
diff --git a/home/modules/desktop/media/video/jellyfin/default.nix b/home/modules/desktop/media/video/jellyfin/default.nix
index 80dffa5..8d29826 100644
--- a/home/modules/desktop/media/video/jellyfin/default.nix
+++ b/home/modules/desktop/media/video/jellyfin/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 let
-  cfg = config.homeModules.desktop.media.video.jellyfin;
+  cfg = config.ooknet.desktop.media.video.jellyfin;
 in
 {
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/desktop/media/video/mpv/default.nix b/home/modules/desktop/media/video/mpv/default.nix
index 48e82f2..4d7972d 100644
--- a/home/modules/desktop/media/video/mpv/default.nix
+++ b/home/modules/desktop/media/video/mpv/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.media.video.mpv;
+  cfg = config.ooknet.desktop.media.video.mpv;
 in
 {
   config = {
diff --git a/home/modules/desktop/media/video/youtube/default.nix b/home/modules/desktop/media/video/youtube/default.nix
index 27e4ae2..733e531 100644
--- a/home/modules/desktop/media/video/youtube/default.nix
+++ b/home/modules/desktop/media/video/youtube/default.nix
@@ -1,6 +1,6 @@
 { lib, config, pkgs, ...}:
 let
-  cfg = config.homeModules.desktop.media.video.youtube;
+  cfg = config.ooknet.desktop.media.video.youtube;
 in
 {
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/desktop/productivity/default.nix b/home/modules/desktop/productivity/default.nix
index c25a9a1..e740f59 100644
--- a/home/modules/desktop/productivity/default.nix
+++ b/home/modules/desktop/productivity/default.nix
@@ -7,7 +7,7 @@
     ./office
   ];
 
-  options.homeModules.desktop.productivity = {
+  options.ooknet.desktop.productivity = {
     obsidian = {
       enable = lib.mkEnableOption "enable obsidian home module";
     };
diff --git a/home/modules/desktop/productivity/obsidian/default.nix b/home/modules/desktop/productivity/obsidian/default.nix
index 724e3ae..2a4b9d0 100644
--- a/home/modules/desktop/productivity/obsidian/default.nix
+++ b/home/modules/desktop/productivity/obsidian/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.productivity.obsidian;
+  cfg = config.ooknet.desktop.productivity.obsidian;
 in
 
 {
diff --git a/home/modules/desktop/productivity/office/default.nix b/home/modules/desktop/productivity/office/default.nix
index 86f9d0d..f335511 100644
--- a/home/modules/desktop/productivity/office/default.nix
+++ b/home/modules/desktop/productivity/office/default.nix
@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.homeModules.desktop.productivity.office;
+  cfg = config.ooknet.desktop.productivity.office;
 in
 
 {
-  options.homeModules.desktop.productivity.office.enable = mkEnableOption "enable office home module";
+  options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module";
   config = mkIf cfg.enable {
     home.packages = [ pkgs.libreoffice ];
   };
diff --git a/home/modules/desktop/productivity/zathura/default.nix b/home/modules/desktop/productivity/zathura/default.nix
index d96e77f..e474fac 100644
--- a/home/modules/desktop/productivity/zathura/default.nix
+++ b/home/modules/desktop/productivity/zathura/default.nix
@@ -1,9 +1,9 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.productivity.zathura;
+  cfg = config.ooknet.desktop.productivity.zathura;
   inherit (config.colorscheme) palette;
-  fonts = config.homeModules.theme.fonts;
+  fonts = config.ooknet.theme.fonts;
 in
 
 {
diff --git a/home/modules/desktop/security/polkit/default.nix b/home/modules/desktop/security/polkit/default.nix
index 8bd661f..b6235cf 100644
--- a/home/modules/desktop/security/polkit/default.nix
+++ b/home/modules/desktop/security/polkit/default.nix
@@ -3,11 +3,11 @@
 let
   inherit (lib) mkIf types mkOption; 
   inherit (builtins) elem;
-  cfg = config.homeModules.desktop.security.polkit;
+  cfg = config.ooknet.desktop.security.polkit;
 in
 
 {
-  options.homeModules.desktop.security.polkit = mkOption {
+  options.ooknet.desktop.security.polkit = mkOption {
     type = types.enum ["gnome" "pantheon"]; # TODO: add kde agent
     default = "";
     description = "Type of polkit agent module to use";
diff --git a/home/modules/desktop/terminal/default.nix b/home/modules/desktop/terminal/default.nix
index 0eea826..8275a2a 100644
--- a/home/modules/desktop/terminal/default.nix
+++ b/home/modules/desktop/terminal/default.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }:
   let
-    cfg = config.homeModules.desktop.terminal;
+    cfg = config.ooknet.desktop.terminal;
   in
 {
 
@@ -9,7 +9,7 @@
     ./kitty
   ];
 
-  options.homeModules.desktop.terminal = {
+  options.ooknet.desktop.terminal = {
     foot = {
       enable = lib.mkEnableOption "Enable foot terminal";
       default = lib.mkOption {
diff --git a/home/modules/desktop/terminal/foot/default.nix b/home/modules/desktop/terminal/foot/default.nix
index eaf1565..8cb572d 100644
--- a/home/modules/desktop/terminal/foot/default.nix
+++ b/home/modules/desktop/terminal/foot/default.nix
@@ -2,8 +2,8 @@
 
 let
   inherit (config.colorscheme) palette;
-  fonts = config.homeModules.theme.fonts;
-  cfg = config.homeModules.desktop.terminal.foot;
+  fonts = config.ooknet.theme.fonts;
+  cfg = config.ooknet.desktop.terminal.foot;
 in
 
 {
diff --git a/home/modules/desktop/terminal/kitty/default.nix b/home/modules/desktop/terminal/kitty/default.nix
index c250c4d..75919ad 100644
--- a/home/modules/desktop/terminal/kitty/default.nix
+++ b/home/modules/desktop/terminal/kitty/default.nix
@@ -2,9 +2,9 @@
 
 let
   inherit (config.colorscheme) palette;
-  fonts = config.homeModules.theme.font;
-  cfg = config.homeModules.desktop.terminal.kitty;
-  fish = config.homeModules.console.shell.fish;
+  fonts = config.ooknet.theme.font;
+  cfg = config.ooknet.desktop.terminal.kitty;
+  fish = config.ooknet.console.shell.fish;
 in
 {
 
diff --git a/home/modules/desktop/wayland/bar/ags/default.nix b/home/modules/desktop/wayland/bar/ags/default.nix
index 810cbfb..3de027c 100644
--- a/home/modules/desktop/wayland/bar/ags/default.nix
+++ b/home/modules/desktop/wayland/bar/ags/default.nix
@@ -1,7 +1,7 @@
 { lib, config, inputs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.bar.ags;
+  cfg = config.ooknet.desktop.wayland.bar.ags;
 in
 
 {
diff --git a/home/modules/desktop/wayland/bar/default.nix b/home/modules/desktop/wayland/bar/default.nix
index 3dc43d4..49af6a7 100644
--- a/home/modules/desktop/wayland/bar/default.nix
+++ b/home/modules/desktop/wayland/bar/default.nix
@@ -6,7 +6,7 @@
     ./waybar
   ];
 
-  options.homeModules.desktop.wayland.bar = {
+  options.ooknet.desktop.wayland.bar = {
     eww = {
       enable = lib.mkEnableOption "Enable Eww bar";
     };
diff --git a/home/modules/desktop/wayland/bar/waybar/default.nix b/home/modules/desktop/wayland/bar/waybar/default.nix
index e037f7c..efc7c0d 100644
--- a/home/modules/desktop/wayland/bar/waybar/default.nix
+++ b/home/modules/desktop/wayland/bar/waybar/default.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let
-  fonts = config.homeModules.theme.fonts;
-  cfg = config.homeModules.desktop.wayland.bar.waybar;
+  fonts = config.ooknet.theme.fonts;
+  cfg = config.ooknet.desktop.wayland.bar.waybar;
   monitorWidth =  (lib.head config.monitors).width - 20;
   inherit (config.colorscheme) palette;
 in
diff --git a/home/modules/desktop/wayland/default.nix b/home/modules/desktop/wayland/default.nix
index 6a4d2ba..744ce77 100644
--- a/home/modules/desktop/wayland/default.nix
+++ b/home/modules/desktop/wayland/default.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland;
+  cfg = config.ooknet.desktop.wayland;
 in
 {
   imports = [
@@ -13,7 +13,7 @@ in
     ./launcher
   ];
 
-  options.homeModules.desktop.wayland = {
+  options.ooknet.desktop.wayland = {
     enable = lib.mkEnableOption "Enable wayland specific confurations";
     nvidia = lib.mkOption {
       type = lib.types.bool;
diff --git a/home/modules/desktop/wayland/launcher/anyrun/default.nix b/home/modules/desktop/wayland/launcher/anyrun/default.nix
index 8a83cb7..0e8baa3 100644
--- a/home/modules/desktop/wayland/launcher/anyrun/default.nix
+++ b/home/modules/desktop/wayland/launcher/anyrun/default.nix
@@ -1,7 +1,7 @@
 { config, lib, inputs, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.launcher.anyrun;
+  cfg = config.ooknet.desktop.wayland.launcher.anyrun;
 in
 
 {
diff --git a/home/modules/desktop/wayland/launcher/default.nix b/home/modules/desktop/wayland/launcher/default.nix
index b05a96f..c375122 100644
--- a/home/modules/desktop/wayland/launcher/default.nix
+++ b/home/modules/desktop/wayland/launcher/default.nix
@@ -7,7 +7,7 @@
     ./tofi
   ];
 
-  options.homeModules.desktop.wayland.launcher = {
+  options.ooknet.desktop.wayland.launcher = {
     anyrun = {
       enable = lib.mkEnableOption "enable anyrun launcher module";
     };
diff --git a/home/modules/desktop/wayland/launcher/rofi/default.nix b/home/modules/desktop/wayland/launcher/rofi/default.nix
index 957e26e..60b7a4c 100644
--- a/home/modules/desktop/wayland/launcher/rofi/default.nix
+++ b/home/modules/desktop/wayland/launcher/rofi/default.nix
@@ -1,8 +1,8 @@
 { lib, config, pkgs, ... }:
 
 let
-  fonts = config.homeModules.theme.fonts;
-  cfg = config.homeModules.desktop.wayland.launcher.rofi;
+  fonts = config.ooknet.theme.fonts;
+  cfg = config.ooknet.desktop.wayland.launcher.rofi;
 in
 
 {
diff --git a/home/modules/desktop/wayland/launcher/tofi/default.nix b/home/modules/desktop/wayland/launcher/tofi/default.nix
index d066abe..ddfc590 100644
--- a/home/modules/desktop/wayland/launcher/tofi/default.nix
+++ b/home/modules/desktop/wayland/launcher/tofi/default.nix
@@ -1,8 +1,8 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.launcher.tofi;
-  fonts = config.homeModules.theme.fonts;
+  cfg = config.ooknet.desktop.wayland.launcher.tofi;
+  fonts = config.ooknet.theme.fonts;
   inherit (config.colorscheme) palette;
 in
 
diff --git a/home/modules/desktop/wayland/lockscreen/default.nix b/home/modules/desktop/wayland/lockscreen/default.nix
index 9ba48ff..5143130 100644
--- a/home/modules/desktop/wayland/lockscreen/default.nix
+++ b/home/modules/desktop/wayland/lockscreen/default.nix
@@ -7,7 +7,7 @@
     ./hyprlock
   ];
 
-  options.homeModules.desktop.wayland.lockscreen = {
+  options.ooknet.desktop.wayland.lockscreen = {
     swaylock = {
       enable = lib.mkEnableOption "Enable Swaylock screen";
     };
diff --git a/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix b/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix
index 88876d1..6fccd48 100644
--- a/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix
+++ b/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix
@@ -1,8 +1,8 @@
 { lib, config, inputs, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.lockscreen.hyprlock;
-  fonts = config.homeModules.theme.fonts;
+  cfg = config.ooknet.desktop.wayland.lockscreen.hyprlock;
+  fonts = config.ooknet.theme.fonts;
   inherit (config.colorscheme) palette;
 in
 
diff --git a/home/modules/desktop/wayland/lockscreen/swaylock/default.nix b/home/modules/desktop/wayland/lockscreen/swaylock/default.nix
index 3249e09..fe87cd9 100644
--- a/home/modules/desktop/wayland/lockscreen/swaylock/default.nix
+++ b/home/modules/desktop/wayland/lockscreen/swaylock/default.nix
@@ -2,9 +2,9 @@
 
 let
   inherit (config.colorscheme) palette;
-  fonts = config.homeModules.theme.fonts;
-  wallpaperPath = config.homeModules.theme.wallpaper.path;
-  cfg = config.homeModules.desktop.wayland.lockscreen.swaylock;
+  fonts = config.ooknet.theme.fonts;
+  wallpaperPath = config.ooknet.theme.wallpaper.path;
+  cfg = config.ooknet.desktop.wayland.lockscreen.swaylock;
 in
 {
   config = lib.mkIf cfg.enable {
diff --git a/home/modules/desktop/wayland/notification/default.nix b/home/modules/desktop/wayland/notification/default.nix
index acb0445..50f9b75 100644
--- a/home/modules/desktop/wayland/notification/default.nix
+++ b/home/modules/desktop/wayland/notification/default.nix
@@ -6,7 +6,7 @@
     #./dunst -- still needs to be implemented
   ];
 
-  options.homeModules.desktop.wayland.notification = {
+  options.ooknet.desktop.wayland.notification = {
     mako = {
       enable = lib.mkEnableOption "Enable mako notification daemon";
     };
diff --git a/home/modules/desktop/wayland/notification/mako/default.nix b/home/modules/desktop/wayland/notification/mako/default.nix
index e1da750..c2bef67 100644
--- a/home/modules/desktop/wayland/notification/mako/default.nix
+++ b/home/modules/desktop/wayland/notification/mako/default.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 let
   inherit (config.colorscheme) palette variant;
-  fonts = config.homeModules.theme.fonts;
-  cfg = config.homeModules.desktop.wayland.notification.mako;
+  fonts = config.ooknet.theme.fonts;
+  cfg = config.ooknet.desktop.wayland.notification.mako;
 in {
   config = lib.mkIf cfg.enable {
     services.mako  = {
diff --git a/home/modules/desktop/wayland/utility/default.nix b/home/modules/desktop/wayland/utility/default.nix
index 9861f45..64e213c 100644
--- a/home/modules/desktop/wayland/utility/default.nix
+++ b/home/modules/desktop/wayland/utility/default.nix
@@ -6,7 +6,7 @@
     ./tools
   ];
 
-  options.homeModules.desktop.wayland.utility = {
+  options.ooknet.desktop.wayland.utility = {
     tools = {
       enable = lib.mkEnableOption "Enable wayland specific tools";
     };
diff --git a/home/modules/desktop/wayland/utility/gammastep/default.nix b/home/modules/desktop/wayland/utility/gammastep/default.nix
index e4adb8b..83a7e94 100644
--- a/home/modules/desktop/wayland/utility/gammastep/default.nix
+++ b/home/modules/desktop/wayland/utility/gammastep/default.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.utility.gammastep;
+  cfg = config.ooknet.desktop.wayland.utility.gammastep;
 in
 
 {
diff --git a/home/modules/desktop/wayland/utility/tools/default.nix b/home/modules/desktop/wayland/utility/tools/default.nix
index 6174448..3bc587b 100644
--- a/home/modules/desktop/wayland/utility/tools/default.nix
+++ b/home/modules/desktop/wayland/utility/tools/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.utility.tools;
+  cfg = config.ooknet.desktop.wayland.utility.tools;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/default.nix b/home/modules/desktop/wayland/windowManager/default.nix
index 761bbb4..8177a43 100644
--- a/home/modules/desktop/wayland/windowManager/default.nix
+++ b/home/modules/desktop/wayland/windowManager/default.nix
@@ -5,7 +5,7 @@
     ./hyprland
   ];
 
-  options.homeModules.desktop.wayland.windowManager = { 
+  options.ooknet.desktop.wayland.windowManager = { 
     hyprland = {
       enable = lib.mkEnableOption "Enable Hyprland window-manager";
     };
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/default.nix
index a7f04cf..c026044 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/default.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/default.nix
@@ -1,6 +1,6 @@
 { lib, config, pkgs, inputs, ... }: 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
   inherit (import ./pkgs {inherit pkgs;}) hyprbrightness hyprvolume;
   inherit (inputs.ooks-scripts.packages.${pkgs.system}) powermenu zellijmenu;
 in
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix
index 824076a..76e65c3 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix
@@ -6,7 +6,7 @@
     ./hyprshade
   ];
 
-  options.homeModules.desktop.wayland.windowManager.hyprland.extras = {
+  options.ooknet.desktop.wayland.windowManager.hyprland.extras = {
     hyprcapture = {
       enable = lib.mkEnableOption "Enable hyprcapture screenshot/recording module";
     };
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix
index e35beb5..9ff6b25 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, inputs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland.extras.hyprcapture;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland.extras.hyprcapture;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix
index 195984f..7fd2338 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland.extras.hyprshade;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland.extras.hyprshade;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix
index d477121..6dcd3d8 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
   pointer = config.home.pointerCursor;
   inherit (config.colorscheme) palette;
 in
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix
index d0c3ecc..85d43a9 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: 
 
 let
-    cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+    cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix
index 4b9b312..45765f5 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix
index e8f53bb..128e5fa 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix
index 98036cf..8ecd6fa 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix
index 711750d..0279186 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix
@@ -1,8 +1,8 @@
 { lib, config, inputs,  ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
-  wallpaperPath = config.homeModules.theme.wallpaper.path;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
+  wallpaperPath = config.ooknet.theme.wallpaper.path;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix
index 5118051..0cf8126 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix
index a20defa..7dac1fe 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix
index 25bc26f..5036411 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 
 {
diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix
index 05c723a..40250da 100644
--- a/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix
+++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
+  cfg = config.ooknet.desktop.wayland.windowManager.hyprland;
 in
 {
   config = {
diff --git a/home/modules/theme/cursor/default.nix b/home/modules/theme/cursor/default.nix
index bd19b1b..aa08c53 100644
--- a/home/modules/theme/cursor/default.nix
+++ b/home/modules/theme/cursor/default.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }: 
 let
-  cfg = config.homeModules.theme.cursor;
+  cfg = config.ooknet.theme.cursor;
 in
 
 {
-  options.homeModules.theme.cursor = {
+  options.ooknet.theme.cursor = {
     enable = lib.mkEnableOption "Enable cursor module";
     package = lib.mkOption {
       type = lib.types.package;
diff --git a/home/modules/theme/fonts/default.nix b/home/modules/theme/fonts/default.nix
index cde586e..869a928 100644
--- a/home/modules/theme/fonts/default.nix
+++ b/home/modules/theme/fonts/default.nix
@@ -15,10 +15,10 @@ let
       example = "pkgs.fira-code";
     };
   };
-  cfg = config.homeModules.theme.fonts;
+  cfg = config.ooknet.theme.fonts;
 in
 {
-  options.homeModules.theme.fonts = {
+  options.ooknet.theme.fonts = {
     enable = lib.mkEnableOption "Whether to enable font profiles";
     monospace = mkFontOption "monospace";
     regular = mkFontOption "regular";
diff --git a/home/modules/theme/gtk/default.nix b/home/modules/theme/gtk/default.nix
index 89e52ec..9972fe4 100644
--- a/home/modules/theme/gtk/default.nix
+++ b/home/modules/theme/gtk/default.nix
@@ -2,10 +2,10 @@
 
 let
   inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme;
-  cfg = config.homeModules.theme.gtk;
+  cfg = config.ooknet.theme.gtk;
 in
 {
-  options.homeModules.theme.gtk = {
+  options.ooknet.theme.gtk = {
     enable = lib.mkEnableOption "Enable gtk theme module";
     # TODO: add theme option
   };
@@ -14,7 +14,7 @@ in
     gtk = {
       enable = true;
       font = {
-        name = config.homeModules.theme.fonts.regular.family;
+        name = config.ooknet.theme.fonts.regular.family;
         size = 12;
       };
       theme = {
diff --git a/home/modules/theme/qt/default.nix b/home/modules/theme/qt/default.nix
index a376c37..fdf8e86 100644
--- a/home/modules/theme/qt/default.nix
+++ b/home/modules/theme/qt/default.nix
@@ -1,9 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.homeModules.theme.qt;
+  cfg = config.ooknet.theme.qt;
 in
 {
-  options.homeModules.theme.qt.enable = lib.mkEnableOption "Enable qt module";
+  options.ooknet.theme.qt.enable = lib.mkEnableOption "Enable qt module";
 
   config = lib.mkIf cfg.enable {
     qt = {
diff --git a/home/modules/theme/wallpaper/default.nix b/home/modules/theme/wallpaper/default.nix
index 22c074e..d89bc42 100644
--- a/home/modules/theme/wallpaper/default.nix
+++ b/home/modules/theme/wallpaper/default.nix
@@ -3,10 +3,10 @@ let
   inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) nixWallpaperFromScheme;
   inherit (lib) types mkDefault mkIf mkOption mkEnableOption;
 
-  cfg = config.homeModules.theme.wallpaper;
+  cfg = config.ooknet.theme.wallpaper;
 in
 {
-  options.homeModules.theme.wallpaper = {
+  options.ooknet.theme.wallpaper = {
     enable = mkEnableOption "Enable wallpaper module";
     path = mkOption {
       type = types.path;
@@ -16,7 +16,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    homeModules.theme.wallpaper.path =
+    ooknet.theme.wallpaper.path =
       let
         largest = f: xs: builtins.head (builtins.sort (a: b: a > b) (map f xs));
         largestWidth = largest (x: x.width) config.monitors;
diff --git a/home/profile/base/default.nix b/home/profile/base/default.nix
index 511bf5b..4e0d5c4 100644
--- a/home/profile/base/default.nix
+++ b/home/profile/base/default.nix
@@ -12,7 +12,7 @@ in
 
     systemd.user.startServices = mkDefault "sd-switch";
 
-    homeModules = {
+    ooknet = {
       config = {
         home.enable = true;
         userDirs.enable = true;
diff --git a/home/profile/gaming/default.nix b/home/profile/gaming/default.nix
index 92dff77..9a73302 100644
--- a/home/profile/gaming/default.nix
+++ b/home/profile/gaming/default.nix
@@ -9,7 +9,7 @@ in
   ];
   
   config = lib.mkIf cfg.enable {
-    homeModules.desktop = {
+    ooknet.desktop = {
       gaming = {
         lutris.enable = false;
       };
diff --git a/home/profile/hyprland/default.nix b/home/profile/hyprland/default.nix
index 3c3338e..67a66bf 100644
--- a/home/profile/hyprland/default.nix
+++ b/home/profile/hyprland/default.nix
@@ -9,7 +9,7 @@ in
   ];
   
   config = lib.mkIf cfg.enable {
-    homeModules.desktop = {
+    ooknet.desktop = {
 
       wayland = {
         enable = true;
diff --git a/home/profile/productivity/default.nix b/home/profile/productivity/default.nix
index b86306b..3ee8fb0 100644
--- a/home/profile/productivity/default.nix
+++ b/home/profile/productivity/default.nix
@@ -9,7 +9,7 @@ in
   ];
   
   config = lib.mkIf cfg.enable {
-    homeModules.desktop = {
+    ooknet.desktop = {
       productivity = {
         obsidian.enable = true;
         zathura.enable = true;
diff --git a/home/profile/themes/minimal/default.nix b/home/profile/themes/minimal/default.nix
index 531a311..87e6509 100644
--- a/home/profile/themes/minimal/default.nix
+++ b/home/profile/themes/minimal/default.nix
@@ -13,7 +13,7 @@ in
     home.file.".colorscheme".text = config.colorscheme.slug;
     home.sessionVariables.COLOR_SCHEME = "${config.colorscheme.slug}";
 
-    homeModules.theme = {
+    ooknet.theme = {
       fonts.enable = true;
       fonts.regular = {
         family = "Fira Sans";
diff --git a/home/profile/themes/phone/default.nix b/home/profile/themes/phone/default.nix
index 8db386f..e7bab0b 100644
--- a/home/profile/themes/phone/default.nix
+++ b/home/profile/themes/phone/default.nix
@@ -13,7 +13,7 @@ in
     home.file.".colorscheme".text = config.colorscheme.slug;
     home.sessionVariables.COLOR_SCHEME = "${config.colorscheme.slug}";
 
-    homeModules.theme = {
+    ooknet.theme = {
       fonts.enable = true;
       fonts.regular = {
         family = "Fira Sans";
diff --git a/home/user/erika@ookst480.nix b/home/user/erika@ookst480.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/home/user/ooks/ooksmedia/default.nix b/home/user/ooks/ooksmedia/default.nix
index 4e3e9e9..20df3ad 100644
--- a/home/user/ooks/ooksmedia/default.nix
+++ b/home/user/ooks/ooksmedia/default.nix
@@ -11,7 +11,7 @@
 
   home.sessionVariables.HN = "ooksmedia";
 
-  homeModules.desktop.wayland.nvidia = true;
+  ooknet.desktop.wayland.nvidia = true;
   
   monitors = [{
     name = "HDMI-A-1";
diff --git a/home/user/ooks/ooksphone/default.nix b/home/user/ooks/ooksphone/default.nix
index b74245b..6d778fa 100644
--- a/home/user/ooks/ooksphone/default.nix
+++ b/home/user/ooks/ooksphone/default.nix
@@ -8,7 +8,7 @@
   
   theme.phone.enable = true;
 
-  homeModules = {
+  ooknet = {
     console = {
       editor.helix.enable = true;
       shell.fish.enable = true;