From 1274d0e1f0cef368a2522bb6528b7080d6de0b2b Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Sat, 14 Mar 2026 12:29:41 +0100
Subject: [PATCH] Adding networking

---
 Droidnix/README.html                          | 794 +++++++++---------
 Droidnix/README.org                           |  46 +-
 .../flake/machines/traveldroid/networking.nix |   7 -
 .../hyprland/animations_effects/top.nix       |   7 -
 .../generated.12/hyprland/decorations/top.nix |   7 -
 Droidnix/generated.12/hyprland/hyprland.nix   |  42 -
 .../hyprland/keyboard_binds/top.nix           |  20 -
 .../hyprland/notifications/top.nix            |   7 -
 .../hyprland/statusbar_tray/top.nix           |   7 -
 .../hyprland/task_launcher/top.nix            |   7 -
 .../hyprland/task_launcher/wofi.nix           |  35 -
 .../task_window_workspace_switcher/top.nix    |   7 -
 Droidnix/generated.12/hyprland/top.nix        |  14 -
 .../hyprland/window_rules/top.nix             |   7 -
 .../mangowc/animations_effects/top.nix        |   7 -
 .../generated.12/mangowc/decorations/top.nix  |   7 -
 .../mangowc/keyboard_binds/top.nix            |  24 -
 .../mangowc/notifications/top.nix             |   7 -
 .../mangowc/statusbar_tray/top.nix            |   7 -
 .../mangowc/task_launcher/top.nix             |   7 -
 .../mangowc/task_launcher/wofi.nix            |   4 -
 .../task_window_workspace_switcher/top.nix    |   7 -
 Droidnix/generated.12/mangowc/top.nix         |  14 -
 .../generated.12/mangowc/window_rules/top.nix |   7 -
 .../system/applications/accessibility/top.nix |   7 -
 .../applications/file_management/top.nix      |   7 -
 .../system/applications/gaming/top.nix        |   7 -
 .../media_playback_editing/top.nix            |   7 -
 .../applications/office_productivity/top.nix  |   7 -
 .../applications/terminal_shell/kitty.nix     |  59 --
 .../applications/terminal_shell/starship.nix  |  27 -
 .../applications/terminal_shell/top.nix       |   9 -
 .../applications/terminal_shell/zsh.nix       |  61 --
 .../generated.12/system/applications/top.nix  |  12 -
 .../system/core/login-tuigreeter.nix          |  14 -
 Droidnix/generated.12/system/core/top.nix     |   9 -
 Droidnix/generated.12/system/core/wayland.nix |  35 -
 .../system/development/databases/top.nix      |   7 -
 .../system/development/devops_ci_cd/top.nix   |   7 -
 .../development/programming_languages/top.nix |   7 -
 .../generated.12/system/development/top.nix   |  11 -
 .../system/development/virtualization/top.nix |   7 -
 .../development/web_development/top.nix       |   7 -
 .../system/system_management/audio/top.nix    |   7 -
 .../system/system_management/backups/top.nix  |   7 -
 .../system_management/bluetooth/top.nix       |   7 -
 .../system_management/disk_management/top.nix |   7 -
 .../hardware_sensors/top.nix                  |   7 -
 .../logging_monitoring/top.nix                |   7 -
 .../system_management/login_manager/top.nix   |   7 -
 .../system_management/monitor_setup/top.nix   |   7 -
 .../system_management/networking/top.nix      |   7 -
 .../power_management/top.nix                  |   7 -
 .../printers_scanners/top.nix                 |   7 -
 .../system/system_management/security/top.nix |   7 -
 .../system_management/system_updates/top.nix  |   7 -
 .../system/system_management/top.nix          |  19 -
 Droidnix/generated.12/system/top.nix          |  10 -
 Droidnix/generated.12/top.nix                 |   8 -
 Droidnix/generated/hyprland/hyprland.nix      |  16 +-
 .../generated/hyprland/keyboard_binds/top.nix |   2 +-
 .../generated/mangowc/keyboard_binds/top.nix  |  25 +-
 .../applications/terminal_shell/kitty.nix     |  52 +-
 .../applications/terminal_shell/starship.nix  |  37 +-
 .../applications/terminal_shell/zsh.nix       | 122 ++-
 .../generated/system/applications/top.nix     |   4 +-
 Droidnix/generated/system/core/top.nix        |   4 +-
 Droidnix/generated/system/core/wayland.nix    |  23 -
 68 files changed, 556 insertions(+), 1262 deletions(-)
 delete mode 100644 Droidnix/generated.12/hyprland/animations_effects/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/decorations/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/hyprland.nix
 delete mode 100644 Droidnix/generated.12/hyprland/keyboard_binds/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/notifications/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/statusbar_tray/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/task_launcher/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/task_launcher/wofi.nix
 delete mode 100644 Droidnix/generated.12/hyprland/task_window_workspace_switcher/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/top.nix
 delete mode 100644 Droidnix/generated.12/hyprland/window_rules/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/animations_effects/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/decorations/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/keyboard_binds/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/notifications/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/statusbar_tray/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/task_launcher/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/task_launcher/wofi.nix
 delete mode 100644 Droidnix/generated.12/mangowc/task_window_workspace_switcher/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/top.nix
 delete mode 100644 Droidnix/generated.12/mangowc/window_rules/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/accessibility/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/file_management/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/gaming/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/media_playback_editing/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/office_productivity/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/terminal_shell/kitty.nix
 delete mode 100644 Droidnix/generated.12/system/applications/terminal_shell/starship.nix
 delete mode 100644 Droidnix/generated.12/system/applications/terminal_shell/top.nix
 delete mode 100644 Droidnix/generated.12/system/applications/terminal_shell/zsh.nix
 delete mode 100644 Droidnix/generated.12/system/applications/top.nix
 delete mode 100644 Droidnix/generated.12/system/core/login-tuigreeter.nix
 delete mode 100644 Droidnix/generated.12/system/core/top.nix
 delete mode 100644 Droidnix/generated.12/system/core/wayland.nix
 delete mode 100644 Droidnix/generated.12/system/development/databases/top.nix
 delete mode 100644 Droidnix/generated.12/system/development/devops_ci_cd/top.nix
 delete mode 100644 Droidnix/generated.12/system/development/programming_languages/top.nix
 delete mode 100644 Droidnix/generated.12/system/development/top.nix
 delete mode 100644 Droidnix/generated.12/system/development/virtualization/top.nix
 delete mode 100644 Droidnix/generated.12/system/development/web_development/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/audio/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/backups/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/bluetooth/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/disk_management/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/hardware_sensors/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/logging_monitoring/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/login_manager/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/monitor_setup/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/networking/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/power_management/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/printers_scanners/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/security/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/system_updates/top.nix
 delete mode 100644 Droidnix/generated.12/system/system_management/top.nix
 delete mode 100644 Droidnix/generated.12/system/top.nix
 delete mode 100644 Droidnix/generated.12/top.nix

diff --git a/Droidnix/README.html b/Droidnix/README.html
index 26f528396..82d869c18 100644
--- a/Droidnix/README.html
+++ b/Droidnix/README.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2026-03-13 vr 23:51 -->
+<!-- 2026-03-14 za 12:29 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure</title>
@@ -204,131 +204,131 @@
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents" role="doc-toc">
 <ul>
-<li><a href="#orgc8ed851">Shortcuts</a></li>
+<li><a href="#org7f32bd0">Shortcuts</a></li>
 <li><a href="#introduction">Introduction&#xa0;&#xa0;&#xa0;<span class="tag"><span class="intro">intro</span></span></a>
 <ul>
-<li><a href="#orgd110335">What is Droidnix</a>
+<li><a href="#orgac27cac">What is Droidnix</a>
 <ul>
-<li><a href="#org28666b3">Installed components:</a></li>
-<li><a href="#orgbc57772">Goals, project Structure, import hierarchy</a></li>
+<li><a href="#org1431f4a">Installed components:</a></li>
+<li><a href="#org7397729">Goals, project Structure, import hierarchy</a></li>
 </ul>
 </li>
 </ul>
 </li>
-<li><a href="#org121200f">Root Level</a></li>
-<li><a href="#orgef72c22">Generated Structure</a>
+<li><a href="#org1bf662d">Root Level</a></li>
+<li><a href="#org59f4bfb">Generated Structure</a>
 <ul>
-<li><a href="#org2a59c3d">System (<code>generated/system/</code>)</a>
+<li><a href="#org1d2e458">System (<code>generated/system/</code>)</a>
 <ul>
-<li><a href="#org9c3ec0b">Applications (<code>applications/</code>)</a></li>
-<li><a href="#orgdc23e0f">Development (<code>development/</code>)</a></li>
-<li><a href="#orge468077">System Management (<code>system_management/</code>)</a></li>
+<li><a href="#orga31980c">Applications (<code>applications/</code>)</a></li>
+<li><a href="#org7521184">Development (<code>development/</code>)</a></li>
+<li><a href="#org64f2096">System Management (<code>system_management/</code>)</a></li>
 </ul>
 </li>
-<li><a href="#orgd001bfc">Hyprland (<code>generated/hyprland/</code>)</a></li>
-<li><a href="#org0f76bff">MangoWC (<code>generated/mangowc/</code>)</a></li>
-<li><a href="#org6fb117a">First Setup</a></li>
+<li><a href="#org1777872">Hyprland (<code>generated/hyprland/</code>)</a></li>
+<li><a href="#org8e3a30d">MangoWC (<code>generated/mangowc/</code>)</a></li>
+<li><a href="#org8c4337b">First Setup</a></li>
 </ul>
 </li>
 <li><a href="#the-assets-folder">The Assets Folder&#xa0;&#xa0;&#xa0;<span class="tag"><span class="assets">assets</span></span></a>
 <ul>
-<li><a href="#org0f07c78"><code>.assets/system/</code></a></li>
-<li><a href="#orga4c04dd"><code>.assets/hyprland/</code></a></li>
-<li><a href="#org71fac85"><code>.assets/mangowc/</code></a></li>
-<li><a href="#orgeebc567"><code>.assets/machines/</code></a></li>
+<li><a href="#orga1973d9"><code>.assets/system/</code></a></li>
+<li><a href="#orgb728790"><code>.assets/hyprland/</code></a></li>
+<li><a href="#org60b2fbb"><code>.assets/mangowc/</code></a></li>
+<li><a href="#org3b4ed03"><code>.assets/machines/</code></a></li>
 </ul>
 </li>
 <li><a href="#the-actual-code">The Actual Code&#xa0;&#xa0;&#xa0;<span class="tag"><span class="code">code</span></span></a>
 <ul>
-<li><a href="#org44d9898"><code>flake.nix</code></a></li>
+<li><a href="#org3144a87"><code>flake.nix</code></a></li>
 </ul>
 </li>
-<li><a href="#orgc29f527">First the nix-files that flake really needs and that do not fit wel in the hierarchical structure</a>
+<li><a href="#org1aaa412">First the nix-files that flake really needs and that do not fit wel in the hierarchical structure</a>
 <ul>
-<li><a href="#org0596cb2"><code>assets/flake/users/top.nix</code></a></li>
-<li><a href="#orgdba93b0"><code>assets/flake/users/user.nix</code></a></li>
-<li><a href="#org24e291f"><code>assets/flake/users/henrov.nix</code></a></li>
-<li><a href="#orgfc7b719"><code>assets/flake/terminal_shell/devshell.nix</code></a></li>
-<li><a href="#orga84e1a4"><code>assets/flake/machines/traveldroid/top.nix</code></a></li>
-<li><a href="#org8f9cda9"><code>assets/flake/machines/traveldroid/boot.nix</code></a></li>
-<li><a href="#orgb62b327"><code>assets/flake/machines/traveldroid/machine.nix</code></a></li>
-<li><a href="#org99e268e"><code>assets/flake/machines/traveldroid/dbus.nix</code></a></li>
-<li><a href="#org0221073"><code>assets/flake/machines/traveldroid/networking.nix</code></a></li>
-<li><a href="#org75f87ca"><code>assets/flake/machines/traveldroid/session.nix</code></a></li>
-<li><a href="#org19baae5"><code>assets/flake/machines/traveldroid/bluetooth.nix</code></a></li>
-<li><a href="#org2f876ff"><code>assets/flake/machines/traveldroid/audio.nix</code></a></li>
-<li><a href="#org926cb49"><code>assets/flake/machines/traveldroid/xdg.nix</code></a></li>
+<li><a href="#org8919569"><code>assets/flake/users/top.nix</code></a></li>
+<li><a href="#org8ef9ae0"><code>assets/flake/users/user.nix</code></a></li>
+<li><a href="#org89fda47"><code>assets/flake/users/henrov.nix</code></a></li>
+<li><a href="#org86f8f15"><code>assets/flake/terminal_shell/devshell.nix</code></a></li>
+<li><a href="#org22066af"><code>assets/flake/machines/traveldroid/top.nix</code></a></li>
+<li><a href="#org44eba41"><code>assets/flake/machines/traveldroid/boot.nix</code></a></li>
+<li><a href="#org3647573"><code>assets/flake/machines/traveldroid/machine.nix</code></a></li>
+<li><a href="#org5b08a8c"><code>assets/flake/machines/traveldroid/dbus.nix</code></a></li>
+<li><a href="#org03098e6"><code>assets/flake/machines/traveldroid/networking.nix</code></a></li>
+<li><a href="#org0833056"><code>assets/flake/machines/traveldroid/session.nix</code></a></li>
+<li><a href="#orgb70ac01"><code>assets/flake/machines/traveldroid/bluetooth.nix</code></a></li>
+<li><a href="#orgfefb3ba"><code>assets/flake/machines/traveldroid/audio.nix</code></a></li>
+<li><a href="#org893e849"><code>assets/flake/machines/traveldroid/xdg.nix</code></a></li>
 </ul>
 </li>
-<li><a href="#org034a89e">Now we reach the top of the hierarchy which will call all other imports</a>
+<li><a href="#org4539006">Now we reach the top of the hierarchy which will call all other imports</a>
 <ul>
-<li><a href="#orge4e85e1"><code>generated/top.nix</code></a></li>
-<li><a href="#org733b1e9"><code>generated/hyprland/hyprland.nix</code></a></li>
-<li><a href="#org5af22e9"><code>generated/mangowc/top.nix</code></a></li>
-<li><a href="#orgc881b6b"><code>generated/system/top.nix</code></a></li>
-<li><a href="#org583228c"><code>generated/system/applications/top.nix</code></a></li>
-<li><a href="#orgf95b403"><code>generated/system/applications/packages.nix</code></a></li>
-<li><a href="#org84b0b6d"><code>generated/system/applications/flatpaks.nix</code></a></li>
-<li><a href="#org2d8612e"><code>generated/system/core/top.nix</code></a></li>
-<li><a href="#org7060892"><code>generated/system/core/fonts.nix</code></a></li>
-<li><a href="#org4773176"><code>generated/system/core/eww.nix</code></a></li>
-<li><a href="#org053478f"><code>generated/system/core/waybar.nix</code></a></li>
-<li><a href="#org9b778e3"><code>generated/system/core/login-tuigreeter.nix</code></a></li>
-<li><a href="#org9ae25e6"><code>generated/system/core/wayland.nix</code></a></li>
-<li><a href="#orgfc0141d"><code>generated/system/development/top.nix</code></a></li>
-<li><a href="#org8213842"><code>generated/system/system_management/top.nix</code></a></li>
-<li><a href="#org10ff67a"><code>generated/hyprland/animations_effects/top.nix</code></a></li>
-<li><a href="#org1e8daca"><code>generated/hyprland/decorations/top.nix</code></a></li>
-<li><a href="#org7833d91"><code>generated/hyprland/keyboard_binds/top.nix</code></a></li>
-<li><a href="#org9dd0694"><code>generated/hyprland/notifications/top.nix</code></a></li>
-<li><a href="#org2243c08"><code>generated/hyprland/statusbar_tray/top.nix</code></a></li>
-<li><a href="#org17c4931"><code>generated/hyprland/task_launcher/top.nix</code></a></li>
-<li><a href="#orgd5fa14b"><code>generated/system/task_launcher/wofi.nix</code></a></li>
-<li><a href="#orga9449bd"><code>generated/hyprland/task_window_workspace_switcher/top.nix</code></a></li>
-<li><a href="#org98480e5"><code>generated/hyprland/window_rules/top.nix</code></a></li>
-<li><a href="#org1c5453a"><code>generated/mangowc/animations_effects/top.nix</code></a></li>
-<li><a href="#orgbda28e0"><code>generated/mangowc/decorations/top.nix</code></a></li>
-<li><a href="#org9f67c0a"><code>generated/mangowc/keyboard_binds/top.nix</code></a></li>
-<li><a href="#org79d7d9c"><code>generated/mangowc/notifications/top.nix</code></a></li>
-<li><a href="#orgc4c99d2"><code>generated/mangowc/statusbar_tray/top.nix</code></a></li>
-<li><a href="#orgd50eb1a"><code>generated/mangowc/task_launcher/top.nix</code></a></li>
-<li><a href="#org3221e82"><code>generated/mangowc/task_window_workspace_switcher/top.nix</code></a></li>
-<li><a href="#org2d044b2"><code>generated/mangowc/window_rules/top.nix</code></a></li>
-<li><a href="#orgb90bc64"><code>generated/system/applications/accessibility/top.nix</code></a></li>
-<li><a href="#org1f18a2a"><code>generated/system/applications/file_management/top.nix</code></a></li>
-<li><a href="#org932789d"><code>generated/system/applications/gaming/top.nix</code></a></li>
-<li><a href="#orgdac9881"><code>generated/system/applications/media_playback_editing/top.nix</code></a></li>
-<li><a href="#orgd67f608"><code>generated/system/applications/office_productivity/top.nix</code></a></li>
-<li><a href="#org3f3b194"><code>generated/system/applications/terminal_shell/top.nix</code></a></li>
-<li><a href="#org6225e70"><code>generated/system/applications/terminal_shell/kitty.nix</code></a></li>
-<li><a href="#org98aadd0"><code>generated/system/applications/terminal_shell/starship.nix</code></a></li>
-<li><a href="#org244e118"><code>generated/system/applications/terminal_shell/zsh.nix</code></a></li>
-<li><a href="#orgb96138a"><code>generated/system/development/databases/top.nix</code></a></li>
-<li><a href="#org7f0d2d7"><code>generated/system/development/devops_ci_cd/top.nix</code></a></li>
-<li><a href="#org387c4db"><code>generated/system/development/programming_languages/top.nix</code></a></li>
-<li><a href="#orgb7450eb"><code>generated/system/development/virtualization/top.nix</code></a></li>
-<li><a href="#org6c8cc75"><code>generated/system/development/web_development/top.nix</code></a></li>
-<li><a href="#org8799472"><code>generated/system/system_management/audio/top.nix</code></a></li>
-<li><a href="#orgcc98d13"><code>generated/system/system_management/backups/top.nix</code></a></li>
-<li><a href="#orgbdba160"><code>generated/system/system_management/bluetooth/top.nix</code></a></li>
-<li><a href="#orgc85b9c5"><code>generated/system/system_management/disk_management/top.nix</code></a></li>
-<li><a href="#org085e545"><code>generated/system/system_management/hardware_sensors/top.nix</code></a></li>
-<li><a href="#orgcc6e96b"><code>generated/system/system_management/logging_monitoring/top.nix</code></a></li>
-<li><a href="#orga840983"><code>generated/system/system_management/login_manager/top.nix</code></a></li>
-<li><a href="#org55e5068"><code>generated/system/system_management/monitor_setup/top.nix</code></a></li>
-<li><a href="#org526f991"><code>generated/system/system_management/networking/top.nix</code></a></li>
-<li><a href="#org20cdb9d"><code>generated/system/system_management/power_management/top.nix</code></a></li>
-<li><a href="#org89394fe"><code>generated/system/system_management/printers_scanners/top.nix</code></a></li>
-<li><a href="#orgff36bcc"><code>generated/system/system_management/security/top.nix</code></a></li>
-<li><a href="#org2f6d117"><code>generated/system/system_management/system_updates/top.nix</code></a></li>
+<li><a href="#org2b08b2a"><code>generated/top.nix</code></a></li>
+<li><a href="#org8c37959"><code>generated/hyprland/hyprland.nix</code></a></li>
+<li><a href="#org2e8cd70"><code>generated/mangowc/top.nix</code></a></li>
+<li><a href="#orgc09e8f3"><code>generated/system/top.nix</code></a></li>
+<li><a href="#org8ce08c1"><code>generated/system/applications/top.nix</code></a></li>
+<li><a href="#orge93508d"><code>generated/system/applications/packages.nix</code></a></li>
+<li><a href="#org88a57ac"><code>generated/system/applications/flatpaks.nix</code></a></li>
+<li><a href="#org6d57785"><code>generated/system/core/top.nix</code></a></li>
+<li><a href="#org427647c"><code>generated/system/core/fonts.nix</code></a></li>
+<li><a href="#org38933aa"><code>generated/system/core/eww.nix</code></a></li>
+<li><a href="#org9b28ea9"><code>generated/system/core/waybar.nix</code></a></li>
+<li><a href="#orgc9c63f6"><code>generated/system/core/login-tuigreeter.nix</code></a></li>
+<li><a href="#org8828331"><code>generated/system/core/wayland.nix</code></a></li>
+<li><a href="#orge21540a"><code>generated/system/development/top.nix</code></a></li>
+<li><a href="#org2f62b4d"><code>generated/system/system_management/top.nix</code></a></li>
+<li><a href="#orgd5037ad"><code>generated/hyprland/animations_effects/top.nix</code></a></li>
+<li><a href="#org021bea0"><code>generated/hyprland/decorations/top.nix</code></a></li>
+<li><a href="#org942a86d"><code>generated/hyprland/keyboard_binds/top.nix</code></a></li>
+<li><a href="#org6d6693e"><code>generated/hyprland/notifications/top.nix</code></a></li>
+<li><a href="#orgeafbf40"><code>generated/hyprland/statusbar_tray/top.nix</code></a></li>
+<li><a href="#org86657f3"><code>generated/hyprland/task_launcher/top.nix</code></a></li>
+<li><a href="#orgd6a4e13"><code>generated/system/task_launcher/wofi.nix</code></a></li>
+<li><a href="#org485b077"><code>generated/hyprland/task_window_workspace_switcher/top.nix</code></a></li>
+<li><a href="#orgc138dd8"><code>generated/hyprland/window_rules/top.nix</code></a></li>
+<li><a href="#org5702b9a"><code>generated/mangowc/animations_effects/top.nix</code></a></li>
+<li><a href="#org551e077"><code>generated/mangowc/decorations/top.nix</code></a></li>
+<li><a href="#org8e47fb7"><code>generated/mangowc/keyboard_binds/top.nix</code></a></li>
+<li><a href="#org9857265"><code>generated/mangowc/notifications/top.nix</code></a></li>
+<li><a href="#org38773a7"><code>generated/mangowc/statusbar_tray/top.nix</code></a></li>
+<li><a href="#org0350fc5"><code>generated/mangowc/task_launcher/top.nix</code></a></li>
+<li><a href="#orga5d7bc5"><code>generated/mangowc/task_window_workspace_switcher/top.nix</code></a></li>
+<li><a href="#org2b0a8ce"><code>generated/mangowc/window_rules/top.nix</code></a></li>
+<li><a href="#org3d6f62f"><code>generated/system/applications/accessibility/top.nix</code></a></li>
+<li><a href="#org8f6ce34"><code>generated/system/applications/file_management/top.nix</code></a></li>
+<li><a href="#orgc2a60e7"><code>generated/system/applications/gaming/top.nix</code></a></li>
+<li><a href="#orgee56f8b"><code>generated/system/applications/media_playback_editing/top.nix</code></a></li>
+<li><a href="#orgae0c967"><code>generated/system/applications/office_productivity/top.nix</code></a></li>
+<li><a href="#org31d06ac"><code>generated/system/applications/terminal_shell/top.nix</code></a></li>
+<li><a href="#org904a5ea"><code>generated/system/applications/terminal_shell/kitty.nix</code></a></li>
+<li><a href="#org79ec4e4"><code>generated/system/applications/terminal_shell/starship.nix</code></a></li>
+<li><a href="#org3951e80"><code>generated/system/applications/terminal_shell/zsh.nix</code></a></li>
+<li><a href="#org9dbdb65"><code>generated/system/development/databases/top.nix</code></a></li>
+<li><a href="#org5a5e1d9"><code>generated/system/development/devops_ci_cd/top.nix</code></a></li>
+<li><a href="#orgad908c9"><code>generated/system/development/programming_languages/top.nix</code></a></li>
+<li><a href="#org88534d9"><code>generated/system/development/virtualization/top.nix</code></a></li>
+<li><a href="#org5adddda"><code>generated/system/development/web_development/top.nix</code></a></li>
+<li><a href="#org2f720d2"><code>generated/system/system_management/audio/top.nix</code></a></li>
+<li><a href="#orgc7b0242"><code>generated/system/system_management/backups/top.nix</code></a></li>
+<li><a href="#org84766a2"><code>generated/system/system_management/bluetooth/top.nix</code></a></li>
+<li><a href="#orgbccbeac"><code>generated/system/system_management/disk_management/top.nix</code></a></li>
+<li><a href="#org38445e6"><code>generated/system/system_management/hardware_sensors/top.nix</code></a></li>
+<li><a href="#org8a2ee3f"><code>generated/system/system_management/logging_monitoring/top.nix</code></a></li>
+<li><a href="#org058a2b8"><code>generated/system/system_management/login_manager/top.nix</code></a></li>
+<li><a href="#orga486788"><code>generated/system/system_management/monitor_setup/top.nix</code></a></li>
+<li><a href="#org282d163"><code>generated/system/system_management/networking/top.nix</code></a></li>
+<li><a href="#org74102e0"><code>generated/system/system_management/power_management/top.nix</code></a></li>
+<li><a href="#orgf84c212"><code>generated/system/system_management/printers_scanners/top.nix</code></a></li>
+<li><a href="#orgb58eb8c"><code>generated/system/system_management/security/top.nix</code></a></li>
+<li><a href="#org6706704"><code>generated/system/system_management/system_updates/top.nix</code></a></li>
 </ul>
 </li>
 </ul>
 </div>
 </div>
-<div id="outline-container-orgc8ed851" class="outline-2">
-<h2 id="orgc8ed851">Shortcuts</h2>
-<div class="outline-text-2" id="text-orgc8ed851">
+<div id="outline-container-org7f32bd0" class="outline-2">
+<h2 id="org7f32bd0">Shortcuts</h2>
+<div class="outline-text-2" id="text-org7f32bd0">
 <p>
 <a href="#introduction">Introduction</a>
 <a href="#the-assets-folder">The Assets Folder</a>
@@ -344,26 +344,26 @@
 <h2 id="introduction">Introduction&#xa0;&#xa0;&#xa0;<span class="tag"><span class="intro">intro</span></span></h2>
 <div class="outline-text-2" id="text-introduction">
 </div>
-<div id="outline-container-orgd110335" class="outline-3">
-<h3 id="orgd110335">What is Droidnix</h3>
-<div class="outline-text-3" id="text-orgd110335">
+<div id="outline-container-orgac27cac" class="outline-3">
+<h3 id="orgac27cac">What is Droidnix</h3>
+<div class="outline-text-3" id="text-orgac27cac">
 <p>
 Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between <code>Hyprland</code> and <code>Mangowc</code> as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.
 </p>
 </div>
-<div id="outline-container-org28666b3" class="outline-4">
-<h4 id="org28666b3">Installed components:</h4>
-<div class="outline-text-4" id="text-org28666b3">
+<div id="outline-container-org1431f4a" class="outline-4">
+<h4 id="org1431f4a">Installed components:</h4>
+<div class="outline-text-4" id="text-org1431f4a">
 </div>
 <ul class="org-ul">
-<li><a id="orgfd9e171"></a>Core<br /></li>
-<li><a id="org29a73a5"></a>Hyprland<br /></li>
-<li><a id="org14fa6a1"></a>Mangowc<br /></li>
+<li><a id="orgf141bc5"></a>Core<br /></li>
+<li><a id="orgf7cda8a"></a>Hyprland<br /></li>
+<li><a id="org6290552"></a>Mangowc<br /></li>
 </ul>
 </div>
-<div id="outline-container-orgbc57772" class="outline-4">
-<h4 id="orgbc57772">Goals, project Structure, import hierarchy</h4>
-<div class="outline-text-4" id="text-orgbc57772">
+<div id="outline-container-org7397729" class="outline-4">
+<h4 id="org7397729">Goals, project Structure, import hierarchy</h4>
+<div class="outline-text-4" id="text-org7397729">
 <p>
 This project uses a <b><b>modular NixOS configuration</b></b> with <b><b>Hyprland</b></b> and <b><b>MangoWC</b></b> support, designed for <b><b>literate programming</b></b> and <b><b>cross-device reusability</b></b>.
 The Droidnix repository is organized into two main parts:
@@ -376,9 +376,9 @@ The Droidnix repository is organized into two main parts:
 </div>
 </div>
 </div>
-<div id="outline-container-org121200f" class="outline-2">
-<h2 id="org121200f">Root Level</h2>
-<div class="outline-text-2" id="text-org121200f">
+<div id="outline-container-org1bf662d" class="outline-2">
+<h2 id="org1bf662d">Root Level</h2>
+<div class="outline-text-2" id="text-org1bf662d">
 <ul class="org-ul">
 <li><code>flake.nix</code> is the entry point and imports:
 <ul class="org-ul">
@@ -390,23 +390,23 @@ The Droidnix repository is organized into two main parts:
 </ul>
 </div>
 </div>
-<div id="outline-container-orgef72c22" class="outline-2">
-<h2 id="orgef72c22">Generated Structure</h2>
-<div class="outline-text-2" id="text-orgef72c22">
+<div id="outline-container-org59f4bfb" class="outline-2">
+<h2 id="org59f4bfb">Generated Structure</h2>
+<div class="outline-text-2" id="text-org59f4bfb">
 <p>
 The <code>generated/</code> directory contains all generated configurations, divided into three main groups: <code>system</code>, <code>hyprland</code>, and <code>mangowc</code>.
 </p>
 </div>
-<div id="outline-container-org2a59c3d" class="outline-3">
-<h3 id="org2a59c3d">System (<code>generated/system/</code>)</h3>
-<div class="outline-text-3" id="text-org2a59c3d">
+<div id="outline-container-org1d2e458" class="outline-3">
+<h3 id="org1d2e458">System (<code>generated/system/</code>)</h3>
+<div class="outline-text-3" id="text-org1d2e458">
 <p>
 This directory contains system-wide configurations that are independent of the window manager.
 </p>
 </div>
-<div id="outline-container-org9c3ec0b" class="outline-4">
-<h4 id="org9c3ec0b">Applications (<code>applications/</code>)</h4>
-<div class="outline-text-4" id="text-org9c3ec0b">
+<div id="outline-container-orga31980c" class="outline-4">
+<h4 id="orga31980c">Applications (<code>applications/</code>)</h4>
+<div class="outline-text-4" id="text-orga31980c">
 <ul class="org-ul">
 <li><code>file_management/</code>: Configurations for file managers and storage solutions.</li>
 <li><code>gaming/</code>: Settings for gaming-related software.</li>
@@ -416,9 +416,9 @@ This directory contains system-wide configurations that are independent of the w
 </ul>
 </div>
 </div>
-<div id="outline-container-orgdc23e0f" class="outline-4">
-<h4 id="orgdc23e0f">Development (<code>development/</code>)</h4>
-<div class="outline-text-4" id="text-orgdc23e0f">
+<div id="outline-container-org7521184" class="outline-4">
+<h4 id="org7521184">Development (<code>development/</code>)</h4>
+<div class="outline-text-4" id="text-org7521184">
 <ul class="org-ul">
 <li><code>databases/</code>: Settings for local databases.</li>
 <li><code>devops_ci_cd/</code>: Configurations for DevOps tools.</li>
@@ -428,9 +428,9 @@ This directory contains system-wide configurations that are independent of the w
 </ul>
 </div>
 </div>
-<div id="outline-container-orge468077" class="outline-4">
-<h4 id="orge468077">System Management (<code>system_management/</code>)</h4>
-<div class="outline-text-4" id="text-orge468077">
+<div id="outline-container-org64f2096" class="outline-4">
+<h4 id="org64f2096">System Management (<code>system_management/</code>)</h4>
+<div class="outline-text-4" id="text-org64f2096">
 <ul class="org-ul">
 <li><code>backups/</code>: Settings for backup software.</li>
 <li><code>bluetooth/</code>: Configurations for Bluetooth devices and services.</li>
@@ -449,9 +449,9 @@ This directory contains system-wide configurations that are independent of the w
 </div>
 </div>
 </div>
-<div id="outline-container-orgd001bfc" class="outline-3">
-<h3 id="orgd001bfc">Hyprland (<code>generated/hyprland/</code>)</h3>
-<div class="outline-text-3" id="text-orgd001bfc">
+<div id="outline-container-org1777872" class="outline-3">
+<h3 id="org1777872">Hyprland (<code>generated/hyprland/</code>)</h3>
+<div class="outline-text-3" id="text-org1777872">
 <p>
 This directory contains configurations specific to Hyprland.
 </p>
@@ -468,9 +468,9 @@ This directory contains configurations specific to Hyprland.
 </ul>
 </div>
 </div>
-<div id="outline-container-org0f76bff" class="outline-3">
-<h3 id="org0f76bff">MangoWC (<code>generated/mangowc/</code>)</h3>
-<div class="outline-text-3" id="text-org0f76bff">
+<div id="outline-container-org8e3a30d" class="outline-3">
+<h3 id="org8e3a30d">MangoWC (<code>generated/mangowc/</code>)</h3>
+<div class="outline-text-3" id="text-org8e3a30d">
 <p>
 This directory contains configurations specific to MangoWC.
 </p>
@@ -504,7 +504,7 @@ This directory contains configurations specific to MangoWC.
 <li><b><b>Scalability</b></b>: Easy to add new machines or configurations.</li>
 </ul>
 
-<pre class="example" id="org116904a">
+<pre class="example" id="org1c907a8">
 .
 ├── assets
 │   ├── system
@@ -686,9 +686,9 @@ This directory contains configurations specific to MangoWC.
 </pre>
 </div>
 </div>
-<div id="outline-container-org6fb117a" class="outline-3">
-<h3 id="org6fb117a">First Setup</h3>
-<div class="outline-text-3" id="text-org6fb117a">
+<div id="outline-container-org8c4337b" class="outline-3">
+<h3 id="org8c4337b">First Setup</h3>
+<div class="outline-text-3" id="text-org8c4337b">
 <ol class="org-ol">
 <li>Clone this repository.</li>
 <li>Run the setup script: <code>./setup_droidnix.sh</code>.</li>
@@ -710,9 +710,9 @@ This directory contains configurations specific to MangoWC.
 The <code>.assets/</code> folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.
 </p>
 </div>
-<div id="outline-container-org0f07c78" class="outline-3">
-<h3 id="org0f07c78"><code>.assets/system/</code></h3>
-<div class="outline-text-3" id="text-org0f07c78">
+<div id="outline-container-orga1973d9" class="outline-3">
+<h3 id="orga1973d9"><code>.assets/system/</code></h3>
+<div class="outline-text-3" id="text-orga1973d9">
 <p>
 This folder contains files shared across both window managers, such as wallpapers, shell configs, and system scripts.
 </p>
@@ -723,9 +723,9 @@ This folder contains files shared across both window managers, such as wallpaper
 </ul>
 </div>
 </div>
-<div id="outline-container-orga4c04dd" class="outline-3">
-<h3 id="orga4c04dd"><code>.assets/hyprland/</code></h3>
-<div class="outline-text-3" id="text-orga4c04dd">
+<div id="outline-container-orgb728790" class="outline-3">
+<h3 id="orgb728790"><code>.assets/hyprland/</code></h3>
+<div class="outline-text-3" id="text-orgb728790">
 <p>
 Hyprland-specific assets, including configs, themes, and scripts.
 </p>
@@ -737,9 +737,9 @@ Hyprland-specific assets, including configs, themes, and scripts.
 </ul>
 </div>
 </div>
-<div id="outline-container-org71fac85" class="outline-3">
-<h3 id="org71fac85"><code>.assets/mangowc/</code></h3>
-<div class="outline-text-3" id="text-org71fac85">
+<div id="outline-container-org60b2fbb" class="outline-3">
+<h3 id="org60b2fbb"><code>.assets/mangowc/</code></h3>
+<div class="outline-text-3" id="text-org60b2fbb">
 <p>
 Mangowc-specific assets, including configs, themes, and scripts.
 </p>
@@ -751,9 +751,9 @@ Mangowc-specific assets, including configs, themes, and scripts.
 </ul>
 </div>
 </div>
-<div id="outline-container-orgeebc567" class="outline-3">
-<h3 id="orgeebc567"><code>.assets/machines/</code></h3>
-<div class="outline-text-3" id="text-orgeebc567">
+<div id="outline-container-org3b4ed03" class="outline-3">
+<h3 id="org3b4ed03"><code>.assets/machines/</code></h3>
+<div class="outline-text-3" id="text-org3b4ed03">
 <p>
 Machine-specific NixOS configurations (e.g., <code>configuration.nix</code> for <code>maindroid</code> and <code>traveldroid</code>).
 </p>
@@ -771,9 +771,9 @@ Machine-specific NixOS configurations (e.g., <code>configuration.nix</code> for
 This section contains the Org blocks for tangling Nix code into the generated folders.
 </p>
 </div>
-<div id="outline-container-org44d9898" class="outline-3">
-<h3 id="org44d9898"><code>flake.nix</code></h3>
-<div class="outline-text-3" id="text-org44d9898">
+<div id="outline-container-org3144a87" class="outline-3">
+<h3 id="org3144a87"><code>flake.nix</code></h3>
+<div class="outline-text-3" id="text-org3144a87">
 <p>
 The Nix flake definition for Droidnix.
 </p>
@@ -869,13 +869,13 @@ The Nix flake definition for Droidnix.
 </div>
 </div>
 </div>
-<div id="outline-container-orgc29f527" class="outline-2">
-<h2 id="orgc29f527">First the nix-files that flake really needs and that do not fit wel in the hierarchical structure</h2>
-<div class="outline-text-2" id="text-orgc29f527">
+<div id="outline-container-org1aaa412" class="outline-2">
+<h2 id="org1aaa412">First the nix-files that flake really needs and that do not fit wel in the hierarchical structure</h2>
+<div class="outline-text-2" id="text-org1aaa412">
 </div>
-<div id="outline-container-org0596cb2" class="outline-3">
-<h3 id="org0596cb2"><code>assets/flake/users/top.nix</code></h3>
-<div class="outline-text-3" id="text-org0596cb2">
+<div id="outline-container-org8919569" class="outline-3">
+<h3 id="org8919569"><code>assets/flake/users/top.nix</code></h3>
+<div class="outline-text-3" id="text-org8919569">
 <p>
 The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.
 </p>
@@ -890,9 +890,9 @@ The ./generated/top.nix file acts as an anchor or entry point for the entire cha
 </div>
 </div>
 </div>
-<div id="outline-container-orgdba93b0" class="outline-3">
-<h3 id="orgdba93b0"><code>assets/flake/users/user.nix</code></h3>
-<div class="outline-text-3" id="text-orgdba93b0">
+<div id="outline-container-org8ef9ae0" class="outline-3">
+<h3 id="org8ef9ae0"><code>assets/flake/users/user.nix</code></h3>
+<div class="outline-text-3" id="text-org8ef9ae0">
 <p>
 This is the default user, just search and replace henrov another name if you want to change
 </p>
@@ -918,14 +918,18 @@ in
       git-extras
     ];
   };
+
+  # Ensure the user is in the necessary groups
+  users.users.${config.users.users.${user.username}.username} = {
+    extraGroups = [ "networkmanager" ];
 }
 </pre>
 </div>
 </div>
 </div>
-<div id="outline-container-org24e291f" class="outline-3">
-<h3 id="org24e291f"><code>assets/flake/users/henrov.nix</code></h3>
-<div class="outline-text-3" id="text-org24e291f">
+<div id="outline-container-org89fda47" class="outline-3">
+<h3 id="org89fda47"><code>assets/flake/users/henrov.nix</code></h3>
+<div class="outline-text-3" id="text-org89fda47">
 <p>
 This is the default user, just search and replace henrov another name if you want to change
 </p>
@@ -941,9 +945,9 @@ This is the default user, just search and replace henrov another name if you wan
 </div>
 </div>
 </div>
-<div id="outline-container-orgfc7b719" class="outline-3">
-<h3 id="orgfc7b719"><code>assets/flake/terminal_shell/devshell.nix</code></h3>
-<div class="outline-text-3" id="text-orgfc7b719">
+<div id="outline-container-org86f8f15" class="outline-3">
+<h3 id="org86f8f15"><code>assets/flake/terminal_shell/devshell.nix</code></h3>
+<div class="outline-text-3" id="text-org86f8f15">
 <p>
 This code defines a Nix shell environment (also called a "devShell") that you can enter using the nix develop command. When you enter this shell, Nix will provide the tools and dependencies listed in buildInputs.
 </p>
@@ -959,9 +963,9 @@ mkShell {
 </div>
 </div>
 </div>
-<div id="outline-container-orga84e1a4" class="outline-3">
-<h3 id="orga84e1a4"><code>assets/flake/machines/traveldroid/top.nix</code></h3>
-<div class="outline-text-3" id="text-orga84e1a4">
+<div id="outline-container-org22066af" class="outline-3">
+<h3 id="org22066af"><code>assets/flake/machines/traveldroid/top.nix</code></h3>
+<div class="outline-text-3" id="text-org22066af">
 <p>
 This is the top of the machine hierarchy
 </p>
@@ -993,9 +997,9 @@ This is the top of the machine hierarchy
 </div>
 </div>
 </div>
-<div id="outline-container-org8f9cda9" class="outline-3">
-<h3 id="org8f9cda9"><code>assets/flake/machines/traveldroid/boot.nix</code></h3>
-<div class="outline-text-3" id="text-org8f9cda9">
+<div id="outline-container-org44eba41" class="outline-3">
+<h3 id="org44eba41"><code>assets/flake/machines/traveldroid/boot.nix</code></h3>
+<div class="outline-text-3" id="text-org44eba41">
 <p>
 This file has most of the settings the control how the computer boots up.
 </p>
@@ -1029,9 +1033,9 @@ This file has most of the settings the control how the computer boots up.
 </div>
 </div>
 </div>
-<div id="outline-container-orgb62b327" class="outline-3">
-<h3 id="orgb62b327"><code>assets/flake/machines/traveldroid/machine.nix</code></h3>
-<div class="outline-text-3" id="text-orgb62b327">
+<div id="outline-container-org3647573" class="outline-3">
+<h3 id="org3647573"><code>assets/flake/machines/traveldroid/machine.nix</code></h3>
+<div class="outline-text-3" id="text-org3647573">
 <p>
 This is the top if the machine hierarchy
 </p>
@@ -1078,9 +1082,9 @@ This is the top if the machine hierarchy
 </div>
 </div>
 </div>
-<div id="outline-container-org99e268e" class="outline-3">
-<h3 id="org99e268e"><code>assets/flake/machines/traveldroid/dbus.nix</code></h3>
-<div class="outline-text-3" id="text-org99e268e">
+<div id="outline-container-org5b08a8c" class="outline-3">
+<h3 id="org5b08a8c"><code>assets/flake/machines/traveldroid/dbus.nix</code></h3>
+<div class="outline-text-3" id="text-org5b08a8c">
 <p>
 This sets the dbus implementation
 </p>
@@ -1102,20 +1106,43 @@ This sets the dbus implementation
 </div>
 </div>
 </div>
-<div id="outline-container-org0221073" class="outline-3">
-<h3 id="org0221073"><code>assets/flake/machines/traveldroid/networking.nix</code></h3>
-<div class="outline-text-3" id="text-org0221073">
+<div id="outline-container-org03098e6" class="outline-3">
+<h3 id="org03098e6"><code>assets/flake/machines/traveldroid/networking.nix</code></h3>
+<div class="outline-text-3" id="text-org03098e6">
 <p>
 This sets the dbus implementation
 </p>
 <div class="org-src-container">
-<pre class="src src-nix">{ config, pkgs, ... }:
+<pre class="src src-nix">{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
-  # Enable NetworkManager
-  services.NetworkManager = {
-    enable = true;
-    dhcpcd.enable = false; # Ensure dhcpcd is disabled to avoid conflicts
+  networking = {
+    useDHCP = lib.mkDefault true;
+    networkmanager.enable = true;
+    networkmanager.wifi.backend = "iwd";
+    wireless.iwd.enable = true;
+    wireless.userControlled.enable = true;
+    firewall = {
+      enable = true;
+      # KDE Connect: discovery + encrypted connections
+      allowedTCPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+      allowedUDPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+    };
   };
 
   # Install NetworkManager and wofi
@@ -1123,21 +1150,16 @@ This sets the dbus implementation
     networkmanager
     wofi
   ];
-
-  # Ensure the user is in the necessary groups
-  users.users.${config.users.users."henrov".username} = {
-    extraGroups = [ "networkmanager" ];
-  };
 }
 </pre>
 </div>
 </div>
 </div>
-<div id="outline-container-org75f87ca" class="outline-3">
-<h3 id="org75f87ca"><code>assets/flake/machines/traveldroid/session.nix</code></h3>
-<div class="outline-text-3" id="text-org75f87ca">
+<div id="outline-container-org0833056" class="outline-3">
+<h3 id="org0833056"><code>assets/flake/machines/traveldroid/session.nix</code></h3>
+<div class="outline-text-3" id="text-org0833056">
 <p>
-This sets the dbus implementation
+This sets the session variables
 </p>
 <div class="org-src-container">
 <pre class="src src-nix">{ config, pkgs, user, ... }:
@@ -1153,9 +1175,9 @@ This sets the dbus implementation
 </div>
 </div>
 </div>
-<div id="outline-container-org19baae5" class="outline-3">
-<h3 id="org19baae5"><code>assets/flake/machines/traveldroid/bluetooth.nix</code></h3>
-<div class="outline-text-3" id="text-org19baae5">
+<div id="outline-container-orgb70ac01" class="outline-3">
+<h3 id="orgb70ac01"><code>assets/flake/machines/traveldroid/bluetooth.nix</code></h3>
+<div class="outline-text-3" id="text-orgb70ac01">
 <p>
 This sets the bluetooth implementation
 </p>
@@ -1192,9 +1214,9 @@ This sets the bluetooth implementation
 </div>
 </div>
 </div>
-<div id="outline-container-org2f876ff" class="outline-3">
-<h3 id="org2f876ff"><code>assets/flake/machines/traveldroid/audio.nix</code></h3>
-<div class="outline-text-3" id="text-org2f876ff">
+<div id="outline-container-orgfefb3ba" class="outline-3">
+<h3 id="orgfefb3ba"><code>assets/flake/machines/traveldroid/audio.nix</code></h3>
+<div class="outline-text-3" id="text-orgfefb3ba">
 <p>
 This sets audiosystem for this machine
 </p>
@@ -1215,9 +1237,9 @@ This sets audiosystem for this machine
 </div>
 </div>
 </div>
-<div id="outline-container-org926cb49" class="outline-3">
-<h3 id="org926cb49"><code>assets/flake/machines/traveldroid/xdg.nix</code></h3>
-<div class="outline-text-3" id="text-org926cb49">
+<div id="outline-container-org893e849" class="outline-3">
+<h3 id="org893e849"><code>assets/flake/machines/traveldroid/xdg.nix</code></h3>
+<div class="outline-text-3" id="text-org893e849">
 <p>
 This sets the XDG implementation
 </p>
@@ -1235,13 +1257,13 @@ This sets the XDG implementation
 </div>
 </div>
 </div>
-<div id="outline-container-org034a89e" class="outline-2">
-<h2 id="org034a89e">Now we reach the top of the hierarchy which will call all other imports</h2>
-<div class="outline-text-2" id="text-org034a89e">
+<div id="outline-container-org4539006" class="outline-2">
+<h2 id="org4539006">Now we reach the top of the hierarchy which will call all other imports</h2>
+<div class="outline-text-2" id="text-org4539006">
 </div>
-<div id="outline-container-orge4e85e1" class="outline-3">
-<h3 id="orge4e85e1"><code>generated/top.nix</code></h3>
-<div class="outline-text-3" id="text-orge4e85e1">
+<div id="outline-container-org2b08b2a" class="outline-3">
+<h3 id="org2b08b2a"><code>generated/top.nix</code></h3>
+<div class="outline-text-3" id="text-org2b08b2a">
 <p>
 The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.
 </p>
@@ -1280,9 +1302,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org733b1e9" class="outline-3">
-<h3 id="org733b1e9"><code>generated/hyprland/hyprland.nix</code></h3>
-<div class="outline-text-3" id="text-org733b1e9">
+<div id="outline-container-org8c37959" class="outline-3">
+<h3 id="org8c37959"><code>generated/hyprland/hyprland.nix</code></h3>
+<div class="outline-text-3" id="text-org8c37959">
 <p>
 The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.
 </p>
@@ -1298,7 +1320,7 @@ The ./generated/top.nix file acts as an anchor or entry point for the entire cha
 
 let
   hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
-  # Dynamically read all files in assets/hyprland/conf/
+  # Dynamically read all files in assets/hyprland/conf/hypr
   hyprlandConfs =
     lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr"))
       (name: {
@@ -1335,9 +1357,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org5af22e9" class="outline-3">
-<h3 id="org5af22e9"><code>generated/mangowc/top.nix</code></h3>
-<div class="outline-text-3" id="text-org5af22e9">
+<div id="outline-container-org2e8cd70" class="outline-3">
+<h3 id="org2e8cd70"><code>generated/mangowc/top.nix</code></h3>
+<div class="outline-text-3" id="text-org2e8cd70">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1360,9 +1382,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgc881b6b" class="outline-3">
-<h3 id="orgc881b6b"><code>generated/system/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgc881b6b">
+<div id="outline-container-orgc09e8f3" class="outline-3">
+<h3 id="orgc09e8f3"><code>generated/system/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgc09e8f3">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1381,9 +1403,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org583228c" class="outline-3">
-<h3 id="org583228c"><code>generated/system/applications/top.nix</code></h3>
-<div class="outline-text-3" id="text-org583228c">
+<div id="outline-container-org8ce08c1" class="outline-3">
+<h3 id="org8ce08c1"><code>generated/system/applications/top.nix</code></h3>
+<div class="outline-text-3" id="text-org8ce08c1">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1406,9 +1428,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgf95b403" class="outline-3">
-<h3 id="orgf95b403"><code>generated/system/applications/packages.nix</code></h3>
-<div class="outline-text-3" id="text-orgf95b403">
+<div id="outline-container-orge93508d" class="outline-3">
+<h3 id="orge93508d"><code>generated/system/applications/packages.nix</code></h3>
+<div class="outline-text-3" id="text-orge93508d">
 <p>
 This will import all packages listed in ./assets/system/apps/packlages.conf
 </p>
@@ -1461,9 +1483,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org84b0b6d" class="outline-3">
-<h3 id="org84b0b6d"><code>generated/system/applications/flatpaks.nix</code></h3>
-<div class="outline-text-3" id="text-org84b0b6d">
+<div id="outline-container-org88a57ac" class="outline-3">
+<h3 id="org88a57ac"><code>generated/system/applications/flatpaks.nix</code></h3>
+<div class="outline-text-3" id="text-org88a57ac">
 <p>
 This will import all packages listed in ./assets/system/apps/flatpaks.conf
 </p>
@@ -1584,9 +1606,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org2d8612e" class="outline-3">
-<h3 id="org2d8612e"><code>generated/system/core/top.nix</code></h3>
-<div class="outline-text-3" id="text-org2d8612e">
+<div id="outline-container-org6d57785" class="outline-3">
+<h3 id="org6d57785"><code>generated/system/core/top.nix</code></h3>
+<div class="outline-text-3" id="text-org6d57785">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1606,9 +1628,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org7060892" class="outline-3">
-<h3 id="org7060892"><code>generated/system/core/fonts.nix</code></h3>
-<div class="outline-text-3" id="text-org7060892">
+<div id="outline-container-org427647c" class="outline-3">
+<h3 id="org427647c"><code>generated/system/core/fonts.nix</code></h3>
+<div class="outline-text-3" id="text-org427647c">
 <p>
 This file installs and configures eww
 </p>
@@ -1623,9 +1645,9 @@ This file installs and configures eww
 </div>
 </div>
 </div>
-<div id="outline-container-org4773176" class="outline-3">
-<h3 id="org4773176"><code>generated/system/core/eww.nix</code></h3>
-<div class="outline-text-3" id="text-org4773176">
+<div id="outline-container-org38933aa" class="outline-3">
+<h3 id="org38933aa"><code>generated/system/core/eww.nix</code></h3>
+<div class="outline-text-3" id="text-org38933aa">
 <p>
 This file installs and configures eww
 </p>
@@ -1669,9 +1691,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org053478f" class="outline-3">
-<h3 id="org053478f"><code>generated/system/core/waybar.nix</code></h3>
-<div class="outline-text-3" id="text-org053478f">
+<div id="outline-container-org9b28ea9" class="outline-3">
+<h3 id="org9b28ea9"><code>generated/system/core/waybar.nix</code></h3>
+<div class="outline-text-3" id="text-org9b28ea9">
 <p>
 This file installs and configures waybar
 </p>
@@ -1711,9 +1733,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org9b778e3" class="outline-3">
-<h3 id="org9b778e3"><code>generated/system/core/login-tuigreeter.nix</code></h3>
-<div class="outline-text-3" id="text-org9b778e3">
+<div id="outline-container-orgc9c63f6" class="outline-3">
+<h3 id="orgc9c63f6"><code>generated/system/core/login-tuigreeter.nix</code></h3>
+<div class="outline-text-3" id="text-orgc9c63f6">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1736,9 +1758,9 @@ settings = {
 </div>
 </div>
 </div>
-<div id="outline-container-org9ae25e6" class="outline-3">
-<h3 id="org9ae25e6"><code>generated/system/core/wayland.nix</code></h3>
-<div class="outline-text-3" id="text-org9ae25e6">
+<div id="outline-container-org8828331" class="outline-3">
+<h3 id="org8828331"><code>generated/system/core/wayland.nix</code></h3>
+<div class="outline-text-3" id="text-org8828331">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1759,9 +1781,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgfc0141d" class="outline-3">
-<h3 id="orgfc0141d"><code>generated/system/development/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgfc0141d">
+<div id="outline-container-orge21540a" class="outline-3">
+<h3 id="orge21540a"><code>generated/system/development/top.nix</code></h3>
+<div class="outline-text-3" id="text-orge21540a">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1781,9 +1803,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org8213842" class="outline-3">
-<h3 id="org8213842"><code>generated/system/system_management/top.nix</code></h3>
-<div class="outline-text-3" id="text-org8213842">
+<div id="outline-container-org2f62b4d" class="outline-3">
+<h3 id="org2f62b4d"><code>generated/system/system_management/top.nix</code></h3>
+<div class="outline-text-3" id="text-org2f62b4d">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1811,9 +1833,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org10ff67a" class="outline-3">
-<h3 id="org10ff67a"><code>generated/hyprland/animations_effects/top.nix</code></h3>
-<div class="outline-text-3" id="text-org10ff67a">
+<div id="outline-container-orgd5037ad" class="outline-3">
+<h3 id="orgd5037ad"><code>generated/hyprland/animations_effects/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgd5037ad">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1829,9 +1851,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org1e8daca" class="outline-3">
-<h3 id="org1e8daca"><code>generated/hyprland/decorations/top.nix</code></h3>
-<div class="outline-text-3" id="text-org1e8daca">
+<div id="outline-container-org021bea0" class="outline-3">
+<h3 id="org021bea0"><code>generated/hyprland/decorations/top.nix</code></h3>
+<div class="outline-text-3" id="text-org021bea0">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1847,9 +1869,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org7833d91" class="outline-3">
-<h3 id="org7833d91"><code>generated/hyprland/keyboard_binds/top.nix</code></h3>
-<div class="outline-text-3" id="text-org7833d91">
+<div id="outline-container-org942a86d" class="outline-3">
+<h3 id="org942a86d"><code>generated/hyprland/keyboard_binds/top.nix</code></h3>
+<div class="outline-text-3" id="text-org942a86d">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1878,9 +1900,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org9dd0694" class="outline-3">
-<h3 id="org9dd0694"><code>generated/hyprland/notifications/top.nix</code></h3>
-<div class="outline-text-3" id="text-org9dd0694">
+<div id="outline-container-org6d6693e" class="outline-3">
+<h3 id="org6d6693e"><code>generated/hyprland/notifications/top.nix</code></h3>
+<div class="outline-text-3" id="text-org6d6693e">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1896,9 +1918,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org2243c08" class="outline-3">
-<h3 id="org2243c08"><code>generated/hyprland/statusbar_tray/top.nix</code></h3>
-<div class="outline-text-3" id="text-org2243c08">
+<div id="outline-container-orgeafbf40" class="outline-3">
+<h3 id="orgeafbf40"><code>generated/hyprland/statusbar_tray/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgeafbf40">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1914,9 +1936,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org17c4931" class="outline-3">
-<h3 id="org17c4931"><code>generated/hyprland/task_launcher/top.nix</code></h3>
-<div class="outline-text-3" id="text-org17c4931">
+<div id="outline-container-org86657f3" class="outline-3">
+<h3 id="org86657f3"><code>generated/hyprland/task_launcher/top.nix</code></h3>
+<div class="outline-text-3" id="text-org86657f3">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1932,9 +1954,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgd5fa14b" class="outline-3">
-<h3 id="orgd5fa14b"><code>generated/system/task_launcher/wofi.nix</code></h3>
-<div class="outline-text-3" id="text-orgd5fa14b">
+<div id="outline-container-orgd6a4e13" class="outline-3">
+<h3 id="orgd6a4e13"><code>generated/system/task_launcher/wofi.nix</code></h3>
+<div class="outline-text-3" id="text-orgd6a4e13">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1979,9 +2001,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-orga9449bd" class="outline-3">
-<h3 id="orga9449bd"><code>generated/hyprland/task_window_workspace_switcher/top.nix</code></h3>
-<div class="outline-text-3" id="text-orga9449bd">
+<div id="outline-container-org485b077" class="outline-3">
+<h3 id="org485b077"><code>generated/hyprland/task_window_workspace_switcher/top.nix</code></h3>
+<div class="outline-text-3" id="text-org485b077">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -1997,9 +2019,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org98480e5" class="outline-3">
-<h3 id="org98480e5"><code>generated/hyprland/window_rules/top.nix</code></h3>
-<div class="outline-text-3" id="text-org98480e5">
+<div id="outline-container-orgc138dd8" class="outline-3">
+<h3 id="orgc138dd8"><code>generated/hyprland/window_rules/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgc138dd8">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2015,9 +2037,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org1c5453a" class="outline-3">
-<h3 id="org1c5453a"><code>generated/mangowc/animations_effects/top.nix</code></h3>
-<div class="outline-text-3" id="text-org1c5453a">
+<div id="outline-container-org5702b9a" class="outline-3">
+<h3 id="org5702b9a"><code>generated/mangowc/animations_effects/top.nix</code></h3>
+<div class="outline-text-3" id="text-org5702b9a">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2033,9 +2055,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgbda28e0" class="outline-3">
-<h3 id="orgbda28e0"><code>generated/mangowc/decorations/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgbda28e0">
+<div id="outline-container-org551e077" class="outline-3">
+<h3 id="org551e077"><code>generated/mangowc/decorations/top.nix</code></h3>
+<div class="outline-text-3" id="text-org551e077">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2051,9 +2073,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org9f67c0a" class="outline-3">
-<h3 id="org9f67c0a"><code>generated/mangowc/keyboard_binds/top.nix</code></h3>
-<div class="outline-text-3" id="text-org9f67c0a">
+<div id="outline-container-org8e47fb7" class="outline-3">
+<h3 id="org8e47fb7"><code>generated/mangowc/keyboard_binds/top.nix</code></h3>
+<div class="outline-text-3" id="text-org8e47fb7">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2063,9 +2085,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org79d7d9c" class="outline-3">
-<h3 id="org79d7d9c"><code>generated/mangowc/notifications/top.nix</code></h3>
-<div class="outline-text-3" id="text-org79d7d9c">
+<div id="outline-container-org9857265" class="outline-3">
+<h3 id="org9857265"><code>generated/mangowc/notifications/top.nix</code></h3>
+<div class="outline-text-3" id="text-org9857265">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2081,9 +2103,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgc4c99d2" class="outline-3">
-<h3 id="orgc4c99d2"><code>generated/mangowc/statusbar_tray/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgc4c99d2">
+<div id="outline-container-org38773a7" class="outline-3">
+<h3 id="org38773a7"><code>generated/mangowc/statusbar_tray/top.nix</code></h3>
+<div class="outline-text-3" id="text-org38773a7">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2099,9 +2121,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgd50eb1a" class="outline-3">
-<h3 id="orgd50eb1a"><code>generated/mangowc/task_launcher/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgd50eb1a">
+<div id="outline-container-org0350fc5" class="outline-3">
+<h3 id="org0350fc5"><code>generated/mangowc/task_launcher/top.nix</code></h3>
+<div class="outline-text-3" id="text-org0350fc5">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2117,9 +2139,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org3221e82" class="outline-3">
-<h3 id="org3221e82"><code>generated/mangowc/task_window_workspace_switcher/top.nix</code></h3>
-<div class="outline-text-3" id="text-org3221e82">
+<div id="outline-container-orga5d7bc5" class="outline-3">
+<h3 id="orga5d7bc5"><code>generated/mangowc/task_window_workspace_switcher/top.nix</code></h3>
+<div class="outline-text-3" id="text-orga5d7bc5">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2135,9 +2157,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org2d044b2" class="outline-3">
-<h3 id="org2d044b2"><code>generated/mangowc/window_rules/top.nix</code></h3>
-<div class="outline-text-3" id="text-org2d044b2">
+<div id="outline-container-org2b0a8ce" class="outline-3">
+<h3 id="org2b0a8ce"><code>generated/mangowc/window_rules/top.nix</code></h3>
+<div class="outline-text-3" id="text-org2b0a8ce">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2153,9 +2175,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgb90bc64" class="outline-3">
-<h3 id="orgb90bc64"><code>generated/system/applications/accessibility/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgb90bc64">
+<div id="outline-container-org3d6f62f" class="outline-3">
+<h3 id="org3d6f62f"><code>generated/system/applications/accessibility/top.nix</code></h3>
+<div class="outline-text-3" id="text-org3d6f62f">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2171,9 +2193,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org1f18a2a" class="outline-3">
-<h3 id="org1f18a2a"><code>generated/system/applications/file_management/top.nix</code></h3>
-<div class="outline-text-3" id="text-org1f18a2a">
+<div id="outline-container-org8f6ce34" class="outline-3">
+<h3 id="org8f6ce34"><code>generated/system/applications/file_management/top.nix</code></h3>
+<div class="outline-text-3" id="text-org8f6ce34">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2189,9 +2211,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org932789d" class="outline-3">
-<h3 id="org932789d"><code>generated/system/applications/gaming/top.nix</code></h3>
-<div class="outline-text-3" id="text-org932789d">
+<div id="outline-container-orgc2a60e7" class="outline-3">
+<h3 id="orgc2a60e7"><code>generated/system/applications/gaming/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgc2a60e7">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2207,9 +2229,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgdac9881" class="outline-3">
-<h3 id="orgdac9881"><code>generated/system/applications/media_playback_editing/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgdac9881">
+<div id="outline-container-orgee56f8b" class="outline-3">
+<h3 id="orgee56f8b"><code>generated/system/applications/media_playback_editing/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgee56f8b">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2225,9 +2247,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgd67f608" class="outline-3">
-<h3 id="orgd67f608"><code>generated/system/applications/office_productivity/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgd67f608">
+<div id="outline-container-orgae0c967" class="outline-3">
+<h3 id="orgae0c967"><code>generated/system/applications/office_productivity/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgae0c967">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2243,9 +2265,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org3f3b194" class="outline-3">
-<h3 id="org3f3b194"><code>generated/system/applications/terminal_shell/top.nix</code></h3>
-<div class="outline-text-3" id="text-org3f3b194">
+<div id="outline-container-org31d06ac" class="outline-3">
+<h3 id="org31d06ac"><code>generated/system/applications/terminal_shell/top.nix</code></h3>
+<div class="outline-text-3" id="text-org31d06ac">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2263,9 +2285,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org6225e70" class="outline-3">
-<h3 id="org6225e70"><code>generated/system/applications/terminal_shell/kitty.nix</code></h3>
-<div class="outline-text-3" id="text-org6225e70">
+<div id="outline-container-org904a5ea" class="outline-3">
+<h3 id="org904a5ea"><code>generated/system/applications/terminal_shell/kitty.nix</code></h3>
+<div class="outline-text-3" id="text-org904a5ea">
 <p>
 This file sets up Kitty terminal
 </p>
@@ -2293,9 +2315,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org98aadd0" class="outline-3">
-<h3 id="org98aadd0"><code>generated/system/applications/terminal_shell/starship.nix</code></h3>
-<div class="outline-text-3" id="text-org98aadd0">
+<div id="outline-container-org79ec4e4" class="outline-3">
+<h3 id="org79ec4e4"><code>generated/system/applications/terminal_shell/starship.nix</code></h3>
+<div class="outline-text-3" id="text-org79ec4e4">
 <p>
 This file sets up starship prompt
 </p>
@@ -2320,9 +2342,9 @@ in
 </div>
 </div>
 </div>
-<div id="outline-container-org244e118" class="outline-3">
-<h3 id="org244e118"><code>generated/system/applications/terminal_shell/zsh.nix</code></h3>
-<div class="outline-text-3" id="text-org244e118">
+<div id="outline-container-org3951e80" class="outline-3">
+<h3 id="org3951e80"><code>generated/system/applications/terminal_shell/zsh.nix</code></h3>
+<div class="outline-text-3" id="text-org3951e80">
 <p>
 This sets up the zsh terminal
 </p>
@@ -2427,9 +2449,9 @@ This sets up the zsh terminal
 </div>
 </div>
 </div>
-<div id="outline-container-orgb96138a" class="outline-3">
-<h3 id="orgb96138a"><code>generated/system/development/databases/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgb96138a">
+<div id="outline-container-org9dbdb65" class="outline-3">
+<h3 id="org9dbdb65"><code>generated/system/development/databases/top.nix</code></h3>
+<div class="outline-text-3" id="text-org9dbdb65">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2445,9 +2467,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org7f0d2d7" class="outline-3">
-<h3 id="org7f0d2d7"><code>generated/system/development/devops_ci_cd/top.nix</code></h3>
-<div class="outline-text-3" id="text-org7f0d2d7">
+<div id="outline-container-org5a5e1d9" class="outline-3">
+<h3 id="org5a5e1d9"><code>generated/system/development/devops_ci_cd/top.nix</code></h3>
+<div class="outline-text-3" id="text-org5a5e1d9">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2463,9 +2485,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org387c4db" class="outline-3">
-<h3 id="org387c4db"><code>generated/system/development/programming_languages/top.nix</code></h3>
-<div class="outline-text-3" id="text-org387c4db">
+<div id="outline-container-orgad908c9" class="outline-3">
+<h3 id="orgad908c9"><code>generated/system/development/programming_languages/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgad908c9">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2481,9 +2503,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgb7450eb" class="outline-3">
-<h3 id="orgb7450eb"><code>generated/system/development/virtualization/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgb7450eb">
+<div id="outline-container-org88534d9" class="outline-3">
+<h3 id="org88534d9"><code>generated/system/development/virtualization/top.nix</code></h3>
+<div class="outline-text-3" id="text-org88534d9">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2499,9 +2521,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org6c8cc75" class="outline-3">
-<h3 id="org6c8cc75"><code>generated/system/development/web_development/top.nix</code></h3>
-<div class="outline-text-3" id="text-org6c8cc75">
+<div id="outline-container-org5adddda" class="outline-3">
+<h3 id="org5adddda"><code>generated/system/development/web_development/top.nix</code></h3>
+<div class="outline-text-3" id="text-org5adddda">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2517,9 +2539,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org8799472" class="outline-3">
-<h3 id="org8799472"><code>generated/system/system_management/audio/top.nix</code></h3>
-<div class="outline-text-3" id="text-org8799472">
+<div id="outline-container-org2f720d2" class="outline-3">
+<h3 id="org2f720d2"><code>generated/system/system_management/audio/top.nix</code></h3>
+<div class="outline-text-3" id="text-org2f720d2">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2535,9 +2557,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgcc98d13" class="outline-3">
-<h3 id="orgcc98d13"><code>generated/system/system_management/backups/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgcc98d13">
+<div id="outline-container-orgc7b0242" class="outline-3">
+<h3 id="orgc7b0242"><code>generated/system/system_management/backups/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgc7b0242">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2553,9 +2575,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgbdba160" class="outline-3">
-<h3 id="orgbdba160"><code>generated/system/system_management/bluetooth/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgbdba160">
+<div id="outline-container-org84766a2" class="outline-3">
+<h3 id="org84766a2"><code>generated/system/system_management/bluetooth/top.nix</code></h3>
+<div class="outline-text-3" id="text-org84766a2">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2571,9 +2593,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgc85b9c5" class="outline-3">
-<h3 id="orgc85b9c5"><code>generated/system/system_management/disk_management/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgc85b9c5">
+<div id="outline-container-orgbccbeac" class="outline-3">
+<h3 id="orgbccbeac"><code>generated/system/system_management/disk_management/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgbccbeac">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2589,9 +2611,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org085e545" class="outline-3">
-<h3 id="org085e545"><code>generated/system/system_management/hardware_sensors/top.nix</code></h3>
-<div class="outline-text-3" id="text-org085e545">
+<div id="outline-container-org38445e6" class="outline-3">
+<h3 id="org38445e6"><code>generated/system/system_management/hardware_sensors/top.nix</code></h3>
+<div class="outline-text-3" id="text-org38445e6">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2607,9 +2629,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgcc6e96b" class="outline-3">
-<h3 id="orgcc6e96b"><code>generated/system/system_management/logging_monitoring/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgcc6e96b">
+<div id="outline-container-org8a2ee3f" class="outline-3">
+<h3 id="org8a2ee3f"><code>generated/system/system_management/logging_monitoring/top.nix</code></h3>
+<div class="outline-text-3" id="text-org8a2ee3f">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2625,9 +2647,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orga840983" class="outline-3">
-<h3 id="orga840983"><code>generated/system/system_management/login_manager/top.nix</code></h3>
-<div class="outline-text-3" id="text-orga840983">
+<div id="outline-container-org058a2b8" class="outline-3">
+<h3 id="org058a2b8"><code>generated/system/system_management/login_manager/top.nix</code></h3>
+<div class="outline-text-3" id="text-org058a2b8">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2643,9 +2665,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org55e5068" class="outline-3">
-<h3 id="org55e5068"><code>generated/system/system_management/monitor_setup/top.nix</code></h3>
-<div class="outline-text-3" id="text-org55e5068">
+<div id="outline-container-orga486788" class="outline-3">
+<h3 id="orga486788"><code>generated/system/system_management/monitor_setup/top.nix</code></h3>
+<div class="outline-text-3" id="text-orga486788">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2661,9 +2683,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org526f991" class="outline-3">
-<h3 id="org526f991"><code>generated/system/system_management/networking/top.nix</code></h3>
-<div class="outline-text-3" id="text-org526f991">
+<div id="outline-container-org282d163" class="outline-3">
+<h3 id="org282d163"><code>generated/system/system_management/networking/top.nix</code></h3>
+<div class="outline-text-3" id="text-org282d163">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2679,9 +2701,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org20cdb9d" class="outline-3">
-<h3 id="org20cdb9d"><code>generated/system/system_management/power_management/top.nix</code></h3>
-<div class="outline-text-3" id="text-org20cdb9d">
+<div id="outline-container-org74102e0" class="outline-3">
+<h3 id="org74102e0"><code>generated/system/system_management/power_management/top.nix</code></h3>
+<div class="outline-text-3" id="text-org74102e0">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2697,9 +2719,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org89394fe" class="outline-3">
-<h3 id="org89394fe"><code>generated/system/system_management/printers_scanners/top.nix</code></h3>
-<div class="outline-text-3" id="text-org89394fe">
+<div id="outline-container-orgf84c212" class="outline-3">
+<h3 id="orgf84c212"><code>generated/system/system_management/printers_scanners/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgf84c212">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2715,9 +2737,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-orgff36bcc" class="outline-3">
-<h3 id="orgff36bcc"><code>generated/system/system_management/security/top.nix</code></h3>
-<div class="outline-text-3" id="text-orgff36bcc">
+<div id="outline-container-orgb58eb8c" class="outline-3">
+<h3 id="orgb58eb8c"><code>generated/system/system_management/security/top.nix</code></h3>
+<div class="outline-text-3" id="text-orgb58eb8c">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2733,9 +2755,9 @@ This is top file of this level which contains just an import statement for all r
 </div>
 </div>
 </div>
-<div id="outline-container-org2f6d117" class="outline-3">
-<h3 id="org2f6d117"><code>generated/system/system_management/system_updates/top.nix</code></h3>
-<div class="outline-text-3" id="text-org2f6d117">
+<div id="outline-container-org6706704" class="outline-3">
+<h3 id="org6706704"><code>generated/system/system_management/system_updates/top.nix</code></h3>
+<div class="outline-text-3" id="text-org6706704">
 <p>
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 </p>
@@ -2755,7 +2777,7 @@ This is top file of this level which contains just an import statement for all r
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Henro Veijer</p>
-<p class="date">Created: 2026-03-13 vr 23:51</p>
+<p class="date">Created: 2026-03-14 za 12:29</p>
 <p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/Droidnix/README.org b/Droidnix/README.org
index 6aafa0c11..91d8ea87f 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -465,6 +465,10 @@ in
       git-extras
     ];
   };
+
+  # Ensure the user is in the necessary groups
+  users.users.${config.users.users.${user.username}.username} = {
+    extraGroups = [ "networkmanager" ];
 }
 #+END_SRC
 
@@ -615,13 +619,36 @@ This sets the dbus implementation
 ** =assets/flake/machines/traveldroid/networking.nix=
 This sets the dbus implementation
 #+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/networking.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
-  # Enable NetworkManager
-  services.NetworkManager = {
-    enable = true;
-    dhcpcd.enable = false; # Ensure dhcpcd is disabled to avoid conflicts
+  networking = {
+    useDHCP = lib.mkDefault true;
+    networkmanager.enable = true;
+    networkmanager.wifi.backend = "iwd";
+    wireless.iwd.enable = true;
+    wireless.userControlled.enable = true;
+    firewall = {
+      enable = true;
+      # KDE Connect: discovery + encrypted connections
+      allowedTCPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+      allowedUDPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+    };
   };
 
   # Install NetworkManager and wofi
@@ -629,16 +656,11 @@ This sets the dbus implementation
     networkmanager
     wofi
   ];
-
-  # Ensure the user is in the necessary groups
-  users.users.${config.users.users."henrov".username} = {
-    extraGroups = [ "networkmanager" ];
-  };
 }
 #+END_SRC
 
 ** =assets/flake/machines/traveldroid/session.nix=
-This sets the dbus implementation
+This sets the session variables
 #+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/session.nix :noweb tangle :mkdirp yes :eval never-html
 { config, pkgs, user, ... }:
 {
@@ -762,7 +784,7 @@ The ./generated/top.nix file acts as an anchor or entry point for the entire cha
 
 let
   hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
-  # Dynamically read all files in assets/hyprland/conf/
+  # Dynamically read all files in assets/hyprland/conf/hypr
   hyprlandConfs =
     lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr"))
       (name: {
diff --git a/Droidnix/assets/flake/machines/traveldroid/networking.nix b/Droidnix/assets/flake/machines/traveldroid/networking.nix
index cdb36ae60..95d838197 100644
--- a/Droidnix/assets/flake/machines/traveldroid/networking.nix
+++ b/Droidnix/assets/flake/machines/traveldroid/networking.nix
@@ -35,11 +35,4 @@
     networkmanager
     wofi
   ];
-
-  /*
-    # Ensure the user is in the necessary groups
-    users.users.${config.users.users."henrov".username} = {
-      extraGroups = [ "networkmanager" ];
-    };
-  */
 }
diff --git a/Droidnix/generated.12/hyprland/animations_effects/top.nix b/Droidnix/generated.12/hyprland/animations_effects/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/animations_effects/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/decorations/top.nix b/Droidnix/generated.12/hyprland/decorations/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/decorations/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/hyprland.nix b/Droidnix/generated.12/hyprland/hyprland.nix
deleted file mode 100644
index a836e3c47..000000000
--- a/Droidnix/generated.12/hyprland/hyprland.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  flakeRoot,
-  ...
-}:
-let
-  hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
-  # Dynamically read all files in assets/hyprland/conf/
-  hyprlandConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf"))
-      (name: {
-        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/${name}";
-      });
-in
-{
-  # NixOS: Enable Hyprland (optional)
-  programs.hyprland = {
-    enable = true;
-  };
-
-  # Home Manager: Hyprland-specific configurations
-  home-manager.users.${user.username} = {
-    # Use config.home-manager.users.${user.username} instead of userConfig
-    home.stateVersion = config.home-manager.users.${user.username}.stateVersion or "23.11"; # Default fallback
-    home.username = user.username; # Use the 'user' argument
-    home.homeDirectory =
-      config.home-manager.users.${user.username}.homeDirectory or "/home/${user.username}";
-
-    wayland.windowManager.hyprland = {
-      enable = true;
-    };
-
-    # Merge dynamic Hyprland configs with existing xdg.configFile
-    xdg.configFile = {
-      # Your existing manual configs (if any)
-    }
-    // hyprlandConfs;
-  };
-}
diff --git a/Droidnix/generated.12/hyprland/keyboard_binds/top.nix b/Droidnix/generated.12/hyprland/keyboard_binds/top.nix
deleted file mode 100644
index ac1af118b..000000000
--- a/Droidnix/generated.12/hyprland/keyboard_binds/top.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
-in
-{
-  home-manager.users.${user.username} = {
-    wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig = bindingsContent;
-    };
-  };
-}
diff --git a/Droidnix/generated.12/hyprland/notifications/top.nix b/Droidnix/generated.12/hyprland/notifications/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/notifications/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/statusbar_tray/top.nix b/Droidnix/generated.12/hyprland/statusbar_tray/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/statusbar_tray/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/task_launcher/top.nix b/Droidnix/generated.12/hyprland/task_launcher/top.nix
deleted file mode 100644
index f60e4fb46..000000000
--- a/Droidnix/generated.12/hyprland/task_launcher/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./wofi.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/task_launcher/wofi.nix b/Droidnix/generated.12/hyprland/task_launcher/wofi.nix
deleted file mode 100644
index 3f6c36d41..000000000
--- a/Droidnix/generated.12/hyprland/task_launcher/wofi.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, pkgs, lib, user, flakeRoot, ... }:
-let
-  xdgDataHome = config.home-manager.users.${user.username}.xdg.dataHome;
-in
-{
-  # NixOS: Install Wofi system-wide (optional)
-  environment.systemPackages = with pkgs; [ wofi ];
-
-  # Home Manager: User-specific Wofi config
-  home-manager.users.${user.username} = {
-    # Install Wofi for the user
-    home.packages = with pkgs; [ wofi ];
-
-    # Wofi configuration
-    xdg.configFile."wofi/config".text = ''
-      dark
-      width=500
-      height=800
-      lines=10
-      columns=1
-      cache_dir=${xdgDataHome}/wofi
-      allow_images=true
-      allow_markup=true
-      show_drun=true
-    '';
-
-    # Catppuccin Mocha theme for Wofi
-    xdg.configFile."wofi/style.css".text = builtins.readFile "${pkgs.fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "wofi";
-      rev = "a0c34a8e9d3a1f71b1b2a8e3b5b8e3e8b1b3b8e3"; # Replace with the correct SHA256 hash
-      sha256 = "0000000000000000000000000000000000000000000000000000"; # Replace with the correct SHA256 hash
-    }}/style-mocha.css";
-  };
-}
diff --git a/Droidnix/generated.12/hyprland/task_window_workspace_switcher/top.nix b/Droidnix/generated.12/hyprland/task_window_workspace_switcher/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/task_window_workspace_switcher/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/hyprland/top.nix b/Droidnix/generated.12/hyprland/top.nix
deleted file mode 100644
index ad0d96f3f..000000000
--- a/Droidnix/generated.12/hyprland/top.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./hyprland.nix
-    ./animations_effects/top.nix
-    ./decorations/top.nix
-    ./keyboard_binds/top.nix
-    ./notifications/top.nix
-    ./statusbar_tray/top.nix
-    ./task_launcher/top.nix
-    ./task_window_workspace_switcher/top.nix
-    ./window_rules/top.nix
-  ];
-}
diff --git a/Droidnix/generated.12/hyprland/window_rules/top.nix b/Droidnix/generated.12/hyprland/window_rules/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/hyprland/window_rules/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/animations_effects/top.nix b/Droidnix/generated.12/mangowc/animations_effects/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/animations_effects/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/decorations/top.nix b/Droidnix/generated.12/mangowc/decorations/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/decorations/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/keyboard_binds/top.nix b/Droidnix/generated.12/mangowc/keyboard_binds/top.nix
deleted file mode 100644
index 4e88b2781..000000000
--- a/Droidnix/generated.12/mangowc/keyboard_binds/top.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
-  userConfig = import (flakeRoot + "/assets/flake/users/henrov.nix");
-in
-{
-  home-manager.users.${user.username} = {
-    home.stateVersion = userConfig.stateVersion;
-    home.username = userConfig.username;
-    home.homeDirectory = userConfig.homeDirectory;
-    wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig = bindingsContent;
-    };
-  };
-}
diff --git a/Droidnix/generated.12/mangowc/notifications/top.nix b/Droidnix/generated.12/mangowc/notifications/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/notifications/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/statusbar_tray/top.nix b/Droidnix/generated.12/mangowc/statusbar_tray/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/statusbar_tray/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/task_launcher/top.nix b/Droidnix/generated.12/mangowc/task_launcher/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/task_launcher/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/task_launcher/wofi.nix b/Droidnix/generated.12/mangowc/task_launcher/wofi.nix
deleted file mode 100644
index c957c7008..000000000
--- a/Droidnix/generated.12/mangowc/task_launcher/wofi.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/task_window_workspace_switcher/top.nix b/Droidnix/generated.12/mangowc/task_window_workspace_switcher/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/task_window_workspace_switcher/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/top.nix b/Droidnix/generated.12/mangowc/top.nix
deleted file mode 100644
index 13b2ff435..000000000
--- a/Droidnix/generated.12/mangowc/top.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./animations_effects/top.nix
-    ./decorations/top.nix
-    ./keyboard_binds/top.nix
-    ./notifications/top.nix
-    ./statusbar_tray/top.nix
-    ./task_launcher/top.nix
-    ./task_window_workspace_switcher/top.nix
-    ./window_rules/top.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/mangowc/window_rules/top.nix b/Droidnix/generated.12/mangowc/window_rules/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/mangowc/window_rules/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/accessibility/top.nix b/Droidnix/generated.12/system/applications/accessibility/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/applications/accessibility/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/file_management/top.nix b/Droidnix/generated.12/system/applications/file_management/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/applications/file_management/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/gaming/top.nix b/Droidnix/generated.12/system/applications/gaming/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/applications/gaming/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/media_playback_editing/top.nix b/Droidnix/generated.12/system/applications/media_playback_editing/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/applications/media_playback_editing/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/office_productivity/top.nix b/Droidnix/generated.12/system/applications/office_productivity/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/applications/office_productivity/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/terminal_shell/kitty.nix b/Droidnix/generated.12/system/applications/terminal_shell/kitty.nix
deleted file mode 100644
index 6e66131e7..000000000
--- a/Droidnix/generated.12/system/applications/terminal_shell/kitty.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ config, pkgs, lib, user, ... }:
-let
-  kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty";
-in
-{
-  home-manager.users.${user.username} = {
-    programs.kitty = {
-      enable = true;
-      settings = {
-        font_family = "JetBrainsMono Nerd Font";
-        font_size = 12.0;
-        cursor = "Beam";
-        cursor_blink_interval = -1;
-        shell = "${pkgs.zsh}/bin/zsh";
-      };
-    };
-
-    # Catppuccin Mocha theme for Kitty (embedded)
-    xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
-      "# Catppuccin Mocha theme"
-      "background #1e1e2e"
-      "foreground #cdd6f4"
-      "selection_background #f5e0dc"
-      "selection_foreground #1e1e2e"
-      "url_color #f5e0dc"
-      "cursor #f5e0dc"
-      "cursor_text_color #1e1e2e"
-
-      "color0 #45475a"
-      "color8 #585b70"
-
-      "color1 #f38ba8"
-      "color9 #f38ba8"
-
-      "color2 #a6e3a1"
-      "color10 #a6e3a1"
-
-      "color3 #f9e2af"
-      "color11 #f9e2af"
-
-      "color4 #89b4fa"
-      "color12 #89b4fa"
-
-      "color5 #f5c2e7"
-      "color13 #f5c2e7"
-
-      "color6 #94e2d5"
-      "color14 #94e2d5"
-
-      "color7 #bac2de"
-      "color15 #bac2de"
-
-      "# Window settings"
-      "background_opacity 0.9"
-      "font_size 12.0"
-      "cursor_shape Beam"
-    ];
-  };
-}
diff --git a/Droidnix/generated.12/system/applications/terminal_shell/starship.nix b/Droidnix/generated.12/system/applications/terminal_shell/starship.nix
deleted file mode 100644
index d6b4be8c3..000000000
--- a/Droidnix/generated.12/system/applications/terminal_shell/starship.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, pkgs, lib, user, ... }:
-{
-  home-manager.users.${user.username} = {
-    programs.starship = {
-      enable = true;
-    };
-
-    # Catppuccin Mocha theme for Starship
-    xdg.configFile."starship.toml".text = ''
-      format = "$all"
-
-      [character]
-      success_symbol = "[❯](bold green)"
-      error_symbol = "[❯](bold red)"
-
-      [directory]
-      style = "bold lavender"
-
-      [git_branch]
-      symbol = " "
-      style = "bold maroon"
-
-      [package]
-      disabled = true
-    '';
-  };
-}
diff --git a/Droidnix/generated.12/system/applications/terminal_shell/top.nix b/Droidnix/generated.12/system/applications/terminal_shell/top.nix
deleted file mode 100644
index d24f14948..000000000
--- a/Droidnix/generated.12/system/applications/terminal_shell/top.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./kitty.nix
-    ./starship.nix
-    ./zsh.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/applications/terminal_shell/zsh.nix b/Droidnix/generated.12/system/applications/terminal_shell/zsh.nix
deleted file mode 100644
index 968bac466..000000000
--- a/Droidnix/generated.12/system/applications/terminal_shell/zsh.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ config, pkgs, lib, user, ... }:
-let
-  zshConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/zsh";
-in
-{
-  home-manager.users.${user.username} = {
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-      oh-my-zsh = {
-        enable = true;
-        theme = "agnoster";
-        plugins = [
-          "git"
-          "zsh-autosuggestions"
-          "zsh-syntax-highlighting"
-          "docker"
-          "kubectl"
-          "history"
-          "command-not-found"
-          "extract"
-        ];
-      };
-      shellAliases = {
-        ls = "exa --icons -a --group-directories-first";
-        ll = "exa --icons -la --group-directories-first";
-      };
-    };
-
-    # Consolidated .zshrc
-    xdg.configFile."zsh/.zshrc".text = lib.concatStringsSep "\n" [
-      "# Oh-My-Zsh"
-      "export ZSH=\"${zshConfigDir}\""
-      "source \"${pkgs.zsh}/share/zsh/functions/Newuser/zsh-newuser-install\""
-      "source \"${zshConfigDir}/oh-my-zsh.sh\""
-      ""
-      "# Zsh options"
-      "setopt AUTO_CD"
-      "setopt CORRECT"
-      "setopt INTERACTIVE_COMMENTS"
-      ""
-      "# Starship"
-      "eval \"$(starship init zsh)\""
-      ""
-      "# fzf"
-      "source \"${pkgs.fzf}/shell/key-bindings.zsh\""
-      "source \"${pkgs.fzf}/shell/completion.zsh\""
-      ""
-      "# User customizations"
-      "source \"${zshConfigDir}/custom.zsh\" 2>/dev/null"
-    ];
-
-    # User customizations
-    xdg.configFile."zsh/custom.zsh".text = ''
-      export EDITOR="nvim"
-      export PATH="$HOME/.local/bin:$PATH"
-    '';
-  };
-}
diff --git a/Droidnix/generated.12/system/applications/top.nix b/Droidnix/generated.12/system/applications/top.nix
deleted file mode 100644
index eb7db4f5e..000000000
--- a/Droidnix/generated.12/system/applications/top.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./accessibility/top.nix
-    ./file_management/top.nix
-    ./gaming/top.nix
-    ./media_playback_editing/top.nix
-    ./office_productivity/top.nix
-    ./terminal_shell/top.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/core/login-tuigreeter.nix b/Droidnix/generated.12/system/core/login-tuigreeter.nix
deleted file mode 100644
index f2b8d6ff6..000000000
--- a/Droidnix/generated.12/system/core/login-tuigreeter.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, user, ... } :
-{
-environment.systemPackages = with pkgs; [
-tuigreet
-];
-services.greetd = {
-enable = true;
-settings = {
-  default_session = {
-  command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
-  };
-};
-};
-}
diff --git a/Droidnix/generated.12/system/core/top.nix b/Droidnix/generated.12/system/core/top.nix
deleted file mode 100644
index cbd37c08c..000000000
--- a/Droidnix/generated.12/system/core/top.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./wayland.nix
-    ./login-tuigreeter.nix
-    # ./login-lightdm.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/core/wayland.nix b/Droidnix/generated.12/system/core/wayland.nix
deleted file mode 100644
index f81f3aa13..000000000
--- a/Droidnix/generated.12/system/core/wayland.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, pkgs, lib, user, ... }:
-{
-  # Enable essential services for a Wayland session
-  services.dbus.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    wireplumber.enable = true;
-  };
-
-  # XDG Desktop Portal settings for better application integration
-  xdg.portal = {
-    enable = true;
-    config.common.default = [ "hyprland" "gtk" ];
-  };
-
-  # Environment variables for a Wayland session
-  environment.sessionVariables = {
-    XDG_SESSION_TYPE = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XCURSOR_SIZE = "24";
-  };
-
-  # Home Manager Wayland configurations
-  home-manager.users.${user.username} = {
-    xdg.portal = {
-      enable = true;
-      extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
-      config.hyprland = {
-        "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
-      };
-    };
-  };
-}
diff --git a/Droidnix/generated.12/system/development/databases/top.nix b/Droidnix/generated.12/system/development/databases/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/development/databases/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/development/devops_ci_cd/top.nix b/Droidnix/generated.12/system/development/devops_ci_cd/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/development/devops_ci_cd/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/development/programming_languages/top.nix b/Droidnix/generated.12/system/development/programming_languages/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/development/programming_languages/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/development/top.nix b/Droidnix/generated.12/system/development/top.nix
deleted file mode 100644
index 877d65e34..000000000
--- a/Droidnix/generated.12/system/development/top.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./databases/top.nix
-    ./devops_ci_cd/top.nix
-    ./programming_languages/top.nix
-    ./virtualization/top.nix
-    ./web_development/top.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/development/virtualization/top.nix b/Droidnix/generated.12/system/development/virtualization/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/development/virtualization/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/development/web_development/top.nix b/Droidnix/generated.12/system/development/web_development/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/development/web_development/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/audio/top.nix b/Droidnix/generated.12/system/system_management/audio/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/audio/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/backups/top.nix b/Droidnix/generated.12/system/system_management/backups/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/backups/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/bluetooth/top.nix b/Droidnix/generated.12/system/system_management/bluetooth/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/bluetooth/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/disk_management/top.nix b/Droidnix/generated.12/system/system_management/disk_management/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/disk_management/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/hardware_sensors/top.nix b/Droidnix/generated.12/system/system_management/hardware_sensors/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/hardware_sensors/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/logging_monitoring/top.nix b/Droidnix/generated.12/system/system_management/logging_monitoring/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/logging_monitoring/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/login_manager/top.nix b/Droidnix/generated.12/system/system_management/login_manager/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/login_manager/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/monitor_setup/top.nix b/Droidnix/generated.12/system/system_management/monitor_setup/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/monitor_setup/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/networking/top.nix b/Droidnix/generated.12/system/system_management/networking/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/networking/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/power_management/top.nix b/Droidnix/generated.12/system/system_management/power_management/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/power_management/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/printers_scanners/top.nix b/Droidnix/generated.12/system/system_management/printers_scanners/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/printers_scanners/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/security/top.nix b/Droidnix/generated.12/system/system_management/security/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/security/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/system_updates/top.nix b/Droidnix/generated.12/system/system_management/system_updates/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated.12/system/system_management/system_updates/top.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    # No subfolders to import
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/system_management/top.nix b/Droidnix/generated.12/system/system_management/top.nix
deleted file mode 100644
index c7602dac8..000000000
--- a/Droidnix/generated.12/system/system_management/top.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./audio/top.nix
-    ./backups/top.nix
-    ./bluetooth/top.nix
-    ./disk_management/top.nix
-    ./hardware_sensors/top.nix
-    ./logging_monitoring/top.nix
-    ./login_manager/top.nix
-    ./monitor_setup/top.nix
-    ./networking/top.nix
-    ./power_management/top.nix
-    ./printers_scanners/top.nix
-    ./security/top.nix
-    ./system_updates/top.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/system/top.nix b/Droidnix/generated.12/system/top.nix
deleted file mode 100644
index c1a1bec75..000000000
--- a/Droidnix/generated.12/system/top.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./applications/top.nix
-    ./core/top.nix
-    ./development/top.nix
-    ./system_management/top.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated.12/top.nix b/Droidnix/generated.12/top.nix
deleted file mode 100644
index e418ef7a2..000000000
--- a/Droidnix/generated.12/top.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./system/top.nix
-    ./hyprland/top.nix
-    # ./mangowc/top.nix
-  ];
-}
diff --git a/Droidnix/generated/hyprland/hyprland.nix b/Droidnix/generated/hyprland/hyprland.nix
index a836e3c47..487c5a991 100644
--- a/Droidnix/generated/hyprland/hyprland.nix
+++ b/Droidnix/generated/hyprland/hyprland.nix
@@ -6,13 +6,14 @@
   flakeRoot,
   ...
 }:
+
 let
   hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
-  # Dynamically read all files in assets/hyprland/conf/
+  # Dynamically read all files in assets/hyprland/conf/hypr
   hyprlandConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf"))
+    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr"))
       (name: {
-        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/${name}";
+        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/hypr/${name}";
       });
 in
 {
@@ -33,10 +34,11 @@ in
       enable = true;
     };
 
-    # Merge dynamic Hyprland configs with existing xdg.configFile
+    # Ensure the Hyprland config directory exists
     xdg.configFile = {
-      # Your existing manual configs (if any)
-    }
-    // hyprlandConfs;
+      "hypr/.keep" = {
+        text = "";
+      };
+    } // hyprlandConfs;
   };
 }
diff --git a/Droidnix/generated/hyprland/keyboard_binds/top.nix b/Droidnix/generated/hyprland/keyboard_binds/top.nix
index ac1af118b..96067f4db 100644
--- a/Droidnix/generated/hyprland/keyboard_binds/top.nix
+++ b/Droidnix/generated/hyprland/keyboard_binds/top.nix
@@ -8,7 +8,7 @@
   ...
 }:
 let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
+  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/hypr/bindings.conf");
 in
 {
   home-manager.users.${user.username} = {
diff --git a/Droidnix/generated/mangowc/keyboard_binds/top.nix b/Droidnix/generated/mangowc/keyboard_binds/top.nix
index 4e88b2781..3d59efd14 100644
--- a/Droidnix/generated/mangowc/keyboard_binds/top.nix
+++ b/Droidnix/generated/mangowc/keyboard_binds/top.nix
@@ -1,24 +1 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
-  userConfig = import (flakeRoot + "/assets/flake/users/henrov.nix");
-in
-{
-  home-manager.users.${user.username} = {
-    home.stateVersion = userConfig.stateVersion;
-    home.username = userConfig.username;
-    home.homeDirectory = userConfig.homeDirectory;
-    wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig = bindingsContent;
-    };
-  };
-}
+# Your code here...
diff --git a/Droidnix/generated/system/applications/terminal_shell/kitty.nix b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
index 6e66131e7..6a3731900 100644
--- a/Droidnix/generated/system/applications/terminal_shell/kitty.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, user, ... }:
+{ config, pkgs, lib, user, flakeRoot, ... }:
 let
   kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty";
 in
@@ -6,54 +6,14 @@ in
   home-manager.users.${user.username} = {
     programs.kitty = {
       enable = true;
-      settings = {
-        font_family = "JetBrainsMono Nerd Font";
-        font_size = 12.0;
-        cursor = "Beam";
-        cursor_blink_interval = -1;
-        shell = "${pkgs.zsh}/bin/zsh";
-      };
     };
 
-    # Catppuccin Mocha theme for Kitty (embedded)
+    # Copy the actual kitty.conf (not a symlink)
     xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
-      "# Catppuccin Mocha theme"
-      "background #1e1e2e"
-      "foreground #cdd6f4"
-      "selection_background #f5e0dc"
-      "selection_foreground #1e1e2e"
-      "url_color #f5e0dc"
-      "cursor #f5e0dc"
-      "cursor_text_color #1e1e2e"
-
-      "color0 #45475a"
-      "color8 #585b70"
-
-      "color1 #f38ba8"
-      "color9 #f38ba8"
-
-      "color2 #a6e3a1"
-      "color10 #a6e3a1"
-
-      "color3 #f9e2af"
-      "color11 #f9e2af"
-
-      "color4 #89b4fa"
-      "color12 #89b4fa"
-
-      "color5 #f5c2e7"
-      "color13 #f5c2e7"
-
-      "color6 #94e2d5"
-      "color14 #94e2d5"
-
-      "color7 #bac2de"
-      "color15 #bac2de"
-
-      "# Window settings"
-      "background_opacity 0.9"
-      "font_size 12.0"
-      "cursor_shape Beam"
+      (builtins.readFile "${flakeRoot}/assets/system/conf/kitty/kitty.conf")
     ];
+
+    # Copy the theme file
+    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
   };
 }
diff --git a/Droidnix/generated/system/applications/terminal_shell/starship.nix b/Droidnix/generated/system/applications/terminal_shell/starship.nix
index d6b4be8c3..06f1e5725 100644
--- a/Droidnix/generated/system/applications/terminal_shell/starship.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/starship.nix
@@ -1,27 +1,16 @@
-{ config, pkgs, lib, user, ... }:
 {
-  home-manager.users.${user.username} = {
-    programs.starship = {
-      enable = true;
-    };
-
-    # Catppuccin Mocha theme for Starship
-    xdg.configFile."starship.toml".text = ''
-      format = "$all"
-
-      [character]
-      success_symbol = "[❯](bold green)"
-      error_symbol = "[❯](bold red)"
-
-      [directory]
-      style = "bold lavender"
-
-      [git_branch]
-      symbol = " "
-      style = "bold maroon"
-
-      [package]
-      disabled = true
-    '';
+  lib,
+  config,
+  pkgs,
+  flakeRoot,
+  ...
+}:
+let
+  starshipConfig = lib.importTOML (flakeRoot + "/assets/system/conf/starship.toml");
+in
+{
+  programs.starship = {
+    enable = true;
+    settings = starshipConfig;
   };
 }
diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
index 968bac466..034bfb243 100644
--- a/Droidnix/generated/system/applications/terminal_shell/zsh.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
@@ -1,61 +1,95 @@
-{ config, pkgs, lib, user, ... }:
-let
-  zshConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/zsh";
-in
 {
-  home-manager.users.${user.username} = {
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+{
+  # --- NixOS Configuration ---
+  environment.systemPackages = with pkgs; [
+    zsh
+    git
+    docker
+  ];
+
+  # --- Home Manager Configuration ---
+  home-manager.users.henrov = {
     programs.zsh = {
       enable = true;
       enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
+
+      # Enable oh-my-zsh and use its plugins
       oh-my-zsh = {
         enable = true;
-        theme = "agnoster";
         plugins = [
           "git"
+          "docker"
+          "direnv"
           "zsh-autosuggestions"
           "zsh-syntax-highlighting"
-          "docker"
-          "kubectl"
-          "history"
-          "command-not-found"
-          "extract"
+          "zsh-completions"
+          "zsh-history-substring-search"
         ];
+        theme = "agnoster"; # Fallback, overridden below
       };
-      shellAliases = {
-        ls = "exa --icons -a --group-directories-first";
-        ll = "exa --icons -la --group-directories-first";
-      };
+
+      # Source Nixpkgs-provided plugins explicitly
+      initContent = ''
+        # Source plugins installed by Nix
+        source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+        source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+        source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+        # Catppuccin Mocha theme for oh-my-zsh
+        local mocha_base="#1E1E2E"
+        local mocha_surface0="#313244"
+        local mocha_text="#CDD6F4"
+        local mocha_lavender="#B4BEFE"
+        local mocha_blue="#89B4FA"
+        local mocha_sapphire="#74C7EC"
+        local mocha_teal="#94E2D5"
+        local mocha_green="#A6E3A1"
+        local mocha_yellow="#F9E2AF"
+        local mocha_peach="#FAB387"
+        local mocha_maroon="#EBA0AC"
+        local mocha_red="#F38BA8"
+        local mocha_mauve="#CBA6F7"
+        local mocha_pink="#F5C2E7"
+        local mocha_flamingo="#F2CDCD"
+        local mocha_rosewater="#F5E0DC"
+
+        # Prompt
+        PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+        RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+
+        # Git prompt
+        ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[$mocha_yellow]%}(%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[$mocha_yellow]%})%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[$mocha_red]%}✗%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[$mocha_green]%}✓%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[$mocha_blue]%}⇡%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[$mocha_blue]%}⇣%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[$mocha_pink]%}?%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[$mocha_sapphire]%}+%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[$mocha_red]%}!%{$reset_color%}"
+
+        # Virtualenv/pyenv
+        ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
+        ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
+
+        # Right prompt with Git status
+        RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
+
+        # Set the custom theme
+        ZSH_THEME="catppuccin-mocha"
+      '';
     };
 
-    # Consolidated .zshrc
-    xdg.configFile."zsh/.zshrc".text = lib.concatStringsSep "\n" [
-      "# Oh-My-Zsh"
-      "export ZSH=\"${zshConfigDir}\""
-      "source \"${pkgs.zsh}/share/zsh/functions/Newuser/zsh-newuser-install\""
-      "source \"${zshConfigDir}/oh-my-zsh.sh\""
-      ""
-      "# Zsh options"
-      "setopt AUTO_CD"
-      "setopt CORRECT"
-      "setopt INTERACTIVE_COMMENTS"
-      ""
-      "# Starship"
-      "eval \"$(starship init zsh)\""
-      ""
-      "# fzf"
-      "source \"${pkgs.fzf}/shell/key-bindings.zsh\""
-      "source \"${pkgs.fzf}/shell/completion.zsh\""
-      ""
-      "# User customizations"
-      "source \"${zshConfigDir}/custom.zsh\" 2>/dev/null"
+    # Home Manager packages (optional)
+    home.packages = with pkgs; [
+      direnv
+      git-extras
     ];
-
-    # User customizations
-    xdg.configFile."zsh/custom.zsh".text = ''
-      export EDITOR="nvim"
-      export PATH="$HOME/.local/bin:$PATH"
-    '';
   };
 }
diff --git a/Droidnix/generated/system/applications/top.nix b/Droidnix/generated/system/applications/top.nix
index eb7db4f5e..287cde4b2 100644
--- a/Droidnix/generated/system/applications/top.nix
+++ b/Droidnix/generated/system/applications/top.nix
@@ -1,6 +1,8 @@
 { config, pkgs, lib, user, inputs, flakeRoot,... }:
 {
   imports = [
+    ./packages.nix
+    ./flatpaks.nix
     ./accessibility/top.nix
     ./file_management/top.nix
     ./gaming/top.nix
@@ -8,5 +10,5 @@
     ./office_productivity/top.nix
     ./terminal_shell/top.nix
   ];
-  # .. put any code here
+  nixpkgs.config.allowUnfree = true;
 }
diff --git a/Droidnix/generated/system/core/top.nix b/Droidnix/generated/system/core/top.nix
index cbd37c08c..68dcdc894 100644
--- a/Droidnix/generated/system/core/top.nix
+++ b/Droidnix/generated/system/core/top.nix
@@ -2,8 +2,10 @@
 {
   imports = [
     ./wayland.nix
+    ./eww.nix
+    ./waybar.nix
     ./login-tuigreeter.nix
-    # ./login-lightdm.nix
+    #./login-lightdm.nix
   ];
   # .. put any code here
 }
diff --git a/Droidnix/generated/system/core/wayland.nix b/Droidnix/generated/system/core/wayland.nix
index f81f3aa13..9d7e5e81d 100644
--- a/Droidnix/generated/system/core/wayland.nix
+++ b/Droidnix/generated/system/core/wayland.nix
@@ -1,28 +1,5 @@
 { config, pkgs, lib, user, ... }:
 {
-  # Enable essential services for a Wayland session
-  services.dbus.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    wireplumber.enable = true;
-  };
-
-  # XDG Desktop Portal settings for better application integration
-  xdg.portal = {
-    enable = true;
-    config.common.default = [ "hyprland" "gtk" ];
-  };
-
-  # Environment variables for a Wayland session
-  environment.sessionVariables = {
-    XDG_SESSION_TYPE = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XCURSOR_SIZE = "24";
-  };
-
-  # Home Manager Wayland configurations
   home-manager.users.${user.username} = {
     xdg.portal = {
       enable = true;