From cb2300949a0fc678b363e2755079380cd9cb6b1b Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Mon, 16 Mar 2026 11:49:40 +0000
Subject: [PATCH] Still GTK looks

---
 Droidnix/README.org                           |  26 --
 .../hyprland/animations_effects/top.nix       |   7 -
 .../generated/hyprland/decorations/top.nix    |   7 -
 Droidnix/generated/hyprland/hyprland.nix      |  44 --
 .../generated/hyprland/notifications/top.nix  |   7 -
 .../generated/hyprland/statusbar_tray/top.nix |   7 -
 .../task_window_workspace_switcher/top.nix    |   7 -
 Droidnix/generated/hyprland/top.nix           |  12 -
 .../generated/hyprland/window_rules/top.nix   |   7 -
 .../machines/traveldroid/audio.nix            |  12 -
 .../machines/traveldroid/bluetooth.nix        |  28 --
 .../out_of_tree/machines/traveldroid/boot.nix |  25 --
 .../machines/traveldroid/catppuccin.nix       |  13 -
 .../out_of_tree/machines/traveldroid/dbus.nix |  13 -
 .../out_of_tree/machines/traveldroid/gtk.nix  |  21 -
 .../traveldroid/hardware-configuration.nix    |  47 --
 .../machines/traveldroid/machine.nix          |  38 --
 .../machines/traveldroid/networking.nix       |  38 --
 .../machines/traveldroid/session.nix          |  20 -
 .../out_of_tree/machines/traveldroid/top.nix  |  30 --
 .../out_of_tree/machines/traveldroid/xdg.nix  |   7 -
 .../out_of_tree/terminal_shell/devshell.nix   |   7 -
 .../out_of_tree/terminal_shell/top.nix        |  16 -
 .../generated/out_of_tree/users/henrov.nix    |   7 -
 Droidnix/generated/out_of_tree/users/top.nix  |   6 -
 Droidnix/generated/out_of_tree/users/user.nix |  26 --
 .../system/applications/accessibility/top.nix |   7 -
 .../applications/file_management/thunar.nix   |  52 ---
 .../applications/file_management/top.nix      |   6 -
 .../system/applications/flatpaks.nix          | 111 -----
 .../system/applications/gaming/top.nix        |   7 -
 .../media_playback_editing/top.nix            |   7 -
 .../applications/office_productivity/top.nix  |   7 -
 .../system/applications/packages.nix          |  43 --
 .../applications/terminal_shell/early-init.el |  92 ----
 .../applications/terminal_shell/emacs.nix     |  93 ----
 .../applications/terminal_shell/init.el       | 400 ------------------
 .../applications/terminal_shell/kitty.nix     |  19 -
 .../applications/terminal_shell/starship.nix  |  16 -
 .../applications/terminal_shell/top.nix       |  10 -
 .../applications/terminal_shell/zsh.nix       |  95 -----
 .../generated/system/applications/top.nix     |  14 -
 Droidnix/generated/system/core/eww.nix        |  30 --
 Droidnix/generated/system/core/fonts.nix      |   6 -
 .../system/core/login-tuigreeter.nix          |  14 -
 Droidnix/generated/system/core/top.nix        |  11 -
 Droidnix/generated/system/core/waybar.nix     |  31 --
 Droidnix/generated/system/core/wayland.nix    |  16 -
 .../system/development/databases/top.nix      |   7 -
 .../system/development/devops_ci_cd/top.nix   |   7 -
 .../development/programming_languages/top.nix |   7 -
 Droidnix/generated/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 -
 .../generated/system/task_launcher/top.nix    |   7 -
 .../generated/system/task_launcher/wofi.nix   |  36 --
 Droidnix/generated/system/top.nix             |  10 -
 Droidnix/generated/top.nix                    |   8 -
 72 files changed, 1782 deletions(-)
 delete mode 100644 Droidnix/generated/hyprland/animations_effects/top.nix
 delete mode 100644 Droidnix/generated/hyprland/decorations/top.nix
 delete mode 100644 Droidnix/generated/hyprland/hyprland.nix
 delete mode 100644 Droidnix/generated/hyprland/notifications/top.nix
 delete mode 100644 Droidnix/generated/hyprland/statusbar_tray/top.nix
 delete mode 100644 Droidnix/generated/hyprland/task_window_workspace_switcher/top.nix
 delete mode 100644 Droidnix/generated/hyprland/top.nix
 delete mode 100644 Droidnix/generated/hyprland/window_rules/top.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/catppuccin.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/session.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
 delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix
 delete mode 100644 Droidnix/generated/out_of_tree/terminal_shell/devshell.nix
 delete mode 100644 Droidnix/generated/out_of_tree/terminal_shell/top.nix
 delete mode 100644 Droidnix/generated/out_of_tree/users/henrov.nix
 delete mode 100644 Droidnix/generated/out_of_tree/users/top.nix
 delete mode 100644 Droidnix/generated/out_of_tree/users/user.nix
 delete mode 100644 Droidnix/generated/system/applications/accessibility/top.nix
 delete mode 100644 Droidnix/generated/system/applications/file_management/thunar.nix
 delete mode 100644 Droidnix/generated/system/applications/file_management/top.nix
 delete mode 100644 Droidnix/generated/system/applications/flatpaks.nix
 delete mode 100644 Droidnix/generated/system/applications/gaming/top.nix
 delete mode 100644 Droidnix/generated/system/applications/media_playback_editing/top.nix
 delete mode 100644 Droidnix/generated/system/applications/office_productivity/top.nix
 delete mode 100644 Droidnix/generated/system/applications/packages.nix
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/early-init.el
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/emacs.nix
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/init.el
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/kitty.nix
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/starship.nix
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/top.nix
 delete mode 100644 Droidnix/generated/system/applications/terminal_shell/zsh.nix
 delete mode 100644 Droidnix/generated/system/applications/top.nix
 delete mode 100644 Droidnix/generated/system/core/eww.nix
 delete mode 100644 Droidnix/generated/system/core/fonts.nix
 delete mode 100644 Droidnix/generated/system/core/login-tuigreeter.nix
 delete mode 100644 Droidnix/generated/system/core/top.nix
 delete mode 100644 Droidnix/generated/system/core/waybar.nix
 delete mode 100644 Droidnix/generated/system/core/wayland.nix
 delete mode 100644 Droidnix/generated/system/development/databases/top.nix
 delete mode 100644 Droidnix/generated/system/development/devops_ci_cd/top.nix
 delete mode 100644 Droidnix/generated/system/development/programming_languages/top.nix
 delete mode 100644 Droidnix/generated/system/development/top.nix
 delete mode 100644 Droidnix/generated/system/development/virtualization/top.nix
 delete mode 100644 Droidnix/generated/system/development/web_development/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/audio/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/backups/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/bluetooth/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/disk_management/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/hardware_sensors/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/logging_monitoring/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/login_manager/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/monitor_setup/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/networking/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/power_management/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/printers_scanners/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/security/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/system_updates/top.nix
 delete mode 100644 Droidnix/generated/system/system_management/top.nix
 delete mode 100644 Droidnix/generated/system/task_launcher/top.nix
 delete mode 100644 Droidnix/generated/system/task_launcher/wofi.nix
 delete mode 100644 Droidnix/generated/system/top.nix
 delete mode 100644 Droidnix/generated/top.nix

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 6a0783309..6f64a8c22 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1118,32 +1118,6 @@ This file sets up wayland
 }
 #+END_SRC
 
-** =generated/out_of_tree/machines/traveldroid/gtk.nix=
-This file configures gtk
-#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/gtk.nix :noweb tangle :mkdirp yes :eval never-html
-{ pkgs, ... }:
-{
-  gtk = {
-    enable = true;
-    # colorScheme = "dark";
-    theme = {
-      name = "Catppuccin-GTK-Grey-Dark-Compact";
-      package = (
-        pkgs.magnetic-catppuccin-gtk.override {
-          accent = [ "blue" ];
-          flavor = [ "mocha" ];
-          icon.accent = [ "blue" ];
-          #shade = "dark";
-          tweaks = [ "black" ];
-          size = "compact";
-        }
-      );
-    };
-    iconTheme.name = "Papirus-Dark";
-  };
-}
-#+END_SRC
-
 ** =generated/out_of_tree/machines/traveldroid/catppuccin.nix=
 I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
 You'll notice the color values in multiple places outside this as well.
diff --git a/Droidnix/generated/hyprland/animations_effects/top.nix b/Droidnix/generated/hyprland/animations_effects/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/hyprland/decorations/top.nix b/Droidnix/generated/hyprland/decorations/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/hyprland/hyprland.nix b/Droidnix/generated/hyprland/hyprland.nix
deleted file mode 100644
index c6249dc00..000000000
--- a/Droidnix/generated/hyprland/hyprland.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  flakeRoot,
-  ...
-}:
-
-let
-  hyprlandFiles = builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr");
-  # Filter out hyprland.conf from the list of files to symlink
-  otherHyprlandFiles = lib.filter (name: name != "hyprland.conf") hyprlandFiles;
-  # Generate xdg.configFile entries for all files except hyprland.conf
-  otherConfigs = lib.genAttrs otherHyprlandFiles (name: {
-    target = "hypr/${name}";
-    source = "${flakeRoot}/assets/hyprland/conf/hypr/${name}";
-  });
-in
-{
-  programs.hyprland = {
-    enable = true;
-  };
-
-  home-manager.users.${user.username} = {
-    home.stateVersion = "25.11";
-    home.username = user.username;
-    home.homeDirectory =
-      config.home-manager.users.${user.username}.homeDirectory or "/home/${user.username}";
-
-    wayland.windowManager.hyprland = {
-      enable = true;
-    };
-
-    # Merge all xdg.configFile definitions
-    xdg.configFile = otherConfigs // {
-      "hypr/hyprland.conf".text = ''
-        ${builtins.readFile "${flakeRoot}/assets/hyprland/conf/hypr/hyprland.conf"}
-        # Your manual settings will go below this line and will not be overwritten
-      '';
-      "hypr/.keep".text = "";
-    };
-  };
-}
diff --git a/Droidnix/generated/hyprland/notifications/top.nix b/Droidnix/generated/hyprland/notifications/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/hyprland/statusbar_tray/top.nix b/Droidnix/generated/hyprland/statusbar_tray/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/hyprland/task_window_workspace_switcher/top.nix b/Droidnix/generated/hyprland/task_window_workspace_switcher/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/hyprland/top.nix b/Droidnix/generated/hyprland/top.nix
deleted file mode 100644
index 8a0f7b44e..000000000
--- a/Droidnix/generated/hyprland/top.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./hyprland.nix
-    ./animations_effects/top.nix
-    ./decorations/top.nix
-    ./notifications/top.nix
-    ./statusbar_tray/top.nix
-    ./task_window_workspace_switcher/top.nix
-    ./window_rules/top.nix
-  ];
-}
diff --git a/Droidnix/generated/hyprland/window_rules/top.nix b/Droidnix/generated/hyprland/window_rules/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/out_of_tree/machines/traveldroid/audio.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix
deleted file mode 100644
index 6b3bcbc17..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;    # ALSA compatibility
-    pulse.enable = true;   # PulseAudio compatibility
-    wireplumber.enable = true; # Session manager for PipeWire
-  };
-
-  # Realtime privileges for pro audio (optional)
-  security.rtkit.enable = true;
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix
deleted file mode 100644
index b985e6742..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, ... }:
-{
-  # Enable Bluetooth hardware and daemon
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    packages = with pkgs; [ bluez ];
-  };
-
-  # Enable Bluetooth audio support in PipeWire
-  services.pipewire = {
-    config.pulse = {
-      bluez5.enable = true;
-    };
-  };
-
-  # Optional: Additional Bluetooth settings
-  hardware.bluetooth.extraConfig = ''
-    AutoEnable=true
-    DiscoverableTimeout=0
-    PairableTimeout=0
-  '';
-
-  # Install a graphical Bluetooth manager (optional)
-  environment.systemPackages = with pkgs; [
-    blueman
-  ];
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix
deleted file mode 100644
index a488f34e1..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, ... } :
-{
-  boot = {
-  initrd = {
-  verbose = false;   # its a lot of logs. dont need it, unless we do.
-  kernelModules = [ ]; # no kernel modules on boot
-  };
-
-  extraModulePackages = [ ];       # no extra packages on boot either
-  kernelPackages = pkgs.linuxPackages_latest;  # latest greatest linux kernel
-  kernelParams = [ "silent" ];       # quiet those logs
-
-  consoleLogLevel = 0;         # quiten more logs
-  plymouth.enable = true;        # graphical boot animation instead
-
-  supportedFilesystems = [ "ntfs" ];     # should see the ntfs (windows)
-
-  loader = {
-  systemd-boot.enable = true;      # systemd-boot
-  systemd-boot.configurationLimit = 10;
-  efi.canTouchEfiVariables = true;     # allow editing efi to edit the boot loader
-  timeout = 5;           # grub timeout to make a selection
-  };
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/catppuccin.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/catppuccin.nix
deleted file mode 100644
index 8cc3389a7..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/catppuccin.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    accent = "blue";
-    gtk = {
-      icon.enable = true;
-    };
-    cursors.enable = true;
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix
deleted file mode 100644
index b39025a6b..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.dbus = lib.mkForce {
-    enable = true; # Force this to be true
-  };
-
-  # Configure dbus-broker via its configuration file
-  environment.etc."dbus-broker/launch.conf".text = ''
-    [General]
-    LogLevel=warning
-    MaxConnectionsPerUser=2048
-  '';
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
deleted file mode 100644
index 8be2fa6e8..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
-  gtk = {
-    # enable = true;
-    # colorScheme = "dark";
-    theme = {
-      name = "Catppuccin-GTK-Grey-Dark-Compact";
-      package = (
-        pkgs.magnetic-catppuccin-gtk.override {
-          accent = [ "blue" ];
-          flavor = [ "mocha" ];
-          icon.accent = [ "blue" ];
-          #shade = "dark";
-          tweaks = [ "black" ];
-          size = "compact";
-        }
-      );
-    };
-    #iconTheme.name = "Papirus-Dark";
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix
deleted file mode 100644
index 802b3df31..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  hostname,
-  pkgs,
-  lib,
-  modulesPath,
-  user,
-  config,
-  ...
-}:
-{
-  imports = [
-    # (modulesPath + "/installer/scan/not-detected.nix")
-    #../../hardware/hardware.nix
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_usb_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/811D-0676";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
-  ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix
deleted file mode 100644
index 352b795b2..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-
-{
-  options = {
-    wm = lib.mkOption {
-      type = lib.types.str;
-      default = "hyprland";
-      description = "Type of window manager to use";
-    };
-  };
-
-  config = {
-    # Minimal settings that must be defined here
-    networking.hostName = "traveldroid";
-    wm.type = "hyprland";
-
-    # User configuration
-    users.users.${user.username} = {
-      isNormalUser = true;
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-      ];
-      hashedPassword = user.hashedPassword;
-      home = user.homeDirectory;
-    };
-    # Optional: Enable auto-login for testing
-    services.getty.autologinUser = user.username;
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix
deleted file mode 100644
index 95d838197..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  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
-  environment.systemPackages = with pkgs; [
-    networkmanager
-    wofi
-  ];
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix
deleted file mode 100644
index de9a335df..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  environment.sessionVariables = {
-    XDG_SESSION_TYPE = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XCURSOR_SIZE = "24";
-    GTK_ENABLE_DARK_MODE = "1";
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    # Use this instead of GTK_APPLICATION_PREFER_DARK_THEME for newer GTK apps:
-    GTK_THEME_VARIANT = "dark";
-    # For Qt apps (if any):
-    QT_STYLE_OVERRIDE = "gtk2";
-    # For Zen Browser (Firefox fork):
-    MOZ_ENABLE_WAYLAND = "1";
-    GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/glib-2.0/schemas";
-  };
-
-    # Add other session-wide variables here (e.g., QT_QPA_PLATFORM, SDL_VIDEODRIVER)
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
deleted file mode 100644
index 6dcb4dabf..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-
-{
-  imports = [
-    ./boot.nix
-    ./hardware-configuration.nix
-    ./machine.nix
-    ./dbus.nix
-    ./audio.nix
-    ./xdg.nix
-    ./session.nix
-    ./networking.nix
-    ./gtk.nix
-    ./catppuccin.nix
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-    catppuccin = {
-      enable = true;
-      flavor = "mocha";
-    };
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix
deleted file mode 100644
index ed37e204f..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-{
-  xdg.portal = {
-    enable = true;
-    config.system.default = [ "hyprland" "gtk" ];
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix b/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix
deleted file mode 100644
index c5d5b7e72..000000000
--- a/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkShell, ... }:
-mkShell {
-  buildInputs = with import <nixpkgs> {}; [
-    nil
-    nixfmt-rfc-style
-  ];
-}
diff --git a/Droidnix/generated/out_of_tree/terminal_shell/top.nix b/Droidnix/generated/out_of_tree/terminal_shell/top.nix
deleted file mode 100644
index 745cb377b..000000000
--- a/Droidnix/generated/out_of_tree/terminal_shell/top.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-
-{
-  imports = [
-    ./devshell.nix
-    inputs.home-manager.nixosModules.home-manager
-  ];
-}
diff --git a/Droidnix/generated/out_of_tree/users/henrov.nix b/Droidnix/generated/out_of_tree/users/henrov.nix
deleted file mode 100644
index e4c4c2eed..000000000
--- a/Droidnix/generated/out_of_tree/users/henrov.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  username = "henrov";
-  hashedPassword = "$6$ISAmsPLyFi7idYXr$VmZsq.zMsyh1irSkyDNqtorNXG0oEHbbMVqTii1t8bymvrQ5ZQmbdi4OiBNeNYe/huHGrojXM.3TST2fTLz0T.";
-  homeDirectory = "/home/henrov";
-  stateVersion = "25.11";
-  locale = "nl_NL.UTF-8";
-}
diff --git a/Droidnix/generated/out_of_tree/users/top.nix b/Droidnix/generated/out_of_tree/users/top.nix
deleted file mode 100644
index 1125f3e3f..000000000
--- a/Droidnix/generated/out_of_tree/users/top.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./user.nix
-  ];
-}
diff --git a/Droidnix/generated/out_of_tree/users/user.nix b/Droidnix/generated/out_of_tree/users/user.nix
deleted file mode 100644
index 81fa5f124..000000000
--- a/Droidnix/generated/out_of_tree/users/user.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-
-let
-  user = import ./henrov.nix;
-in
-{
-  home-manager.users.${user.username} = {
-    home.stateVersion = "25.11";
-    home.username = user.username;
-    home.homeDirectory = user.homeDirectory;
-    home.packages = with pkgs; [
-      direnv
-      git-extras
-    ];
-  };
-
-  # Ensure the user is in the necessary groups
-  users.users.${config.users.users.${user.username}.username} = {
-    extraGroups = [ "networkmanager" ];
-}
diff --git a/Droidnix/generated/system/applications/accessibility/top.nix b/Droidnix/generated/system/applications/accessibility/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/applications/file_management/thunar.nix b/Droidnix/generated/system/applications/file_management/thunar.nix
deleted file mode 100644
index bc5d804fe..000000000
--- a/Droidnix/generated/system/applications/file_management/thunar.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  username = "henrov"; # vervang door je echte gebruikersnaam
-in
-{
-  home-manager.users.${username} = {
-
-    # GTK icon theme: Papirus + Catppuccin Mocha
-    gtk.enable = true;
-    gtk.gtk3.iconTheme.name = "Papirus";
-    gtk.gtk4.iconTheme.name = "Papirus";
-
-    # Catppuccin Mocha dark theme
-    xdg.configFile."gtk-3.0/settings.ini".text = ''
-      [Settings]
-      gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
-      gtk-icon-theme-name=Papirus
-      gtk-application-prefer-dark-theme=1
-    '';
-    xdg.configFile."gtk-4.0/settings.ini".text = ''
-      [Settings]
-      gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
-      gtk-icon-theme-name=Papirus
-      gtk-application-prefer-dark-theme=1
-    '';
-
-    # Thunar and plugins
-    home.packages = with pkgs; [
-      thunar
-      thunar-volman
-      thunar-archive-plugin
-      thunar-media-tags-plugin
-      tumbler
-      ffmpegthumbnailer
-      gvfs
-      xdg-utils
-    ];
-
-    # Default file manager
-    xdg.mimeApps = {
-      defaultApplications = {
-        "inode/directory" = "Thunar.desktop";
-      };
-    };
-  };
-}
diff --git a/Droidnix/generated/system/applications/file_management/top.nix b/Droidnix/generated/system/applications/file_management/top.nix
deleted file mode 100644
index 25334098d..000000000
--- a/Droidnix/generated/system/applications/file_management/top.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./thunar.nix
-  ];
-}
diff --git a/Droidnix/generated/system/applications/flatpaks.nix b/Droidnix/generated/system/applications/flatpaks.nix
deleted file mode 100644
index 306909cd4..000000000
--- a/Droidnix/generated/system/applications/flatpaks.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  flakeRoot,
-  ...
-}:
-let
-  moduleName = "install-flatpaks";
-  flatpakConfPath = "${flakeRoot}/assets/system/apps/flatpaks.conf";
-  raw = builtins.readFile flatpakConfPath;
-  # Explicit "\n" so we never accidentally split into characters
-  rawLines = lib.splitString "\n" raw;
-
-  # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
-  _guard =
-    assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
-    true;
-
-  cleanLine =
-    l:
-    let
-      noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
-      noInlineComment = lib.head (lib.splitString "#" noCR);
-    in
-    lib.strings.trim noInlineComment;
-
-  entries = builtins.filter (l: l != "") (map cleanLine rawLines);
-
-  # Flatpak app IDs are reverse-DNS style like org.example.App (at least 2 dots).
-  # We'll validate and fail early with a clear message.
-  dotCount = s: builtins.length (lib.splitString "." s) - 1;
-
-  isValidId = s: (dotCount s) >= 2; # matches the error you're seeing: "at least 2 periods"
-
-  _validate = builtins.seq _guard (
-    builtins.map (
-      id:
-      if isValidId id then
-        true
-      else
-        throw ''
-          ${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
-
-          Token    : ${builtins.toJSON id}
-          flatpaks.conf : ${toString flatpakConfPath}
-
-          Fix: remove stray tokens/headers, or comment them out with '#'.
-        ''
-    ) entries
-  );
-
-  # Use validated entries
-  flatpakApps = builtins.seq _validate entries;
-
-  syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
-    set -euo pipefail
-
-    # Use the deployed config path (matches environment.etc below)
-    CONF="/etc/flatpak/flatpaks.conf"
-    if [[ -f "$CONF" ]]; then
-    echo "flatpak-sync: using $CONF"
-    else
-    echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
-    fi
-
-    if ! flatpak remotes --system --columns=name | grep -qx flathub; then
-    flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-    fi
-
-    desired_apps=(
-    ${lib.concatStringsSep "\n" (map (a: ''"${a}"'') flatpakApps)}
-    )
-
-    for app in "''${desired_apps[@]}"; do
-    if ! flatpak info --system "$app" >/dev/null 2>&1; then
-      flatpak install --system -y --noninteractive flathub "$app"
-    fi
-    done
-  '';
-in
-{
-  services.flatpak.enable = true;
-
-  xdg.portal = {
-    enable = true;
-  };
-
-  # Deploy the config file for runtime visibility/debugging
-  environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
-
-  systemd.services.flatpak-sync = {
-    description = "Install Flatpak apps listed in flatpaks.conf";
-    wantedBy = [ "multi-user.target" ];
-    wants = [ "network-online.target" ];
-    after = [ "network-online.target" ];
-
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = syncFlatpaks;
-    };
-
-    restartTriggers = [ flatpakConfPath ];
-    path = [
-      pkgs.flatpak
-      pkgs.coreutils
-      pkgs.gnugrep
-      pkgs.gnused
-    ];
-  };
-}
diff --git a/Droidnix/generated/system/applications/gaming/top.nix b/Droidnix/generated/system/applications/gaming/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/applications/media_playback_editing/top.nix b/Droidnix/generated/system/applications/media_playback_editing/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/applications/office_productivity/top.nix b/Droidnix/generated/system/applications/office_productivity/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/applications/packages.nix b/Droidnix/generated/system/applications/packages.nix
deleted file mode 100644
index 6ab52c14d..000000000
--- a/Droidnix/generated/system/applications/packages.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, pkgs, flakeRoot, inputs, ... }:
-let
-  packagesConfPath = "${flakeRoot}/assets/system/apps/packages.conf";
-  raw = builtins.readFile packagesConfPath;
-  # IMPORTANT: explicit "\n" so we never accidentally split into characters
-  rawLines = lib.splitString "\n" raw;
-  # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
-  _guard = assert !(
-  builtins.stringLength raw > 1 &&
-  builtins.length rawLines == builtins.stringLength raw
-  ); true;
-  cleanLine = l:
-  let
-  noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
-  noInlineComment = lib.head (lib.splitString "#" noCR);
-  in
-  lib.strings.trim noInlineComment;
-  entries =
-  builtins.filter (l: l != "")
-  (map cleanLine rawLines);
-  resolvePkg = name:
-  let
-  parts = lib.splitString "." name;
-  found = lib.attrByPath parts null pkgs;
-  in
-  if found == null then
-    throw ''
-    packages.nix: package not found in pkgs
-    Token    : ${builtins.toJSON name}
-    packages.conf   : ${toString packagesConfPath}
-    Hint     : check the attribute name on search.nixos.org/packages
-    ''
-  else
-    found;
-  packages = builtins.seq _guard (map resolvePkg entries);
-  zenBrowser =
-  inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in
-{
-  environment.systemPackages =
-  packages
-  ++ [ zenBrowser ];
-}
diff --git a/Droidnix/generated/system/applications/terminal_shell/early-init.el b/Droidnix/generated/system/applications/terminal_shell/early-init.el
deleted file mode 100644
index d6f8111be..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/early-init.el
+++ /dev/null
@@ -1,92 +0,0 @@
-;;; package --- early init -*- lexical-binding: t -*-
- ;;; Commentary:
- ;;; Prevents white flash and better Emacs defaults
- ;;; Code:
- (set-language-environment "UTF-8")
- (setq-default
-default-frame-alist
-'((background-color . "#1e1e2e")
-  (bottom-divider-width . 1)    ; Thin horizontal window divider
-  (foreground-color . "#bac2de")    ; Default foreground color
-  (fullscreen . maximized)      ; Maximize the window by default
-  (horizontal-scroll-bars . nil)    ; No horizontal scroll-bars
-  (left-fringe . 8)       ; Thin left fringe
-  (menu-bar-lines . 0)      ; No menu bar
-  (right-divider-width . 1)     ; Thin vertical window divider
-  (right-fringe . 8)        ; Thin right fringe
-  (tool-bar-lines . 0)      ; No tool bar
-  (undecorated . t)       ; Remove extraneous X decorations
-  (vertical-scroll-bars . nil))   ; No vertical scroll-bars
-user-full-name "Henrov henrov"      ; ME!
-;; memory configuration
-;; Higher garbage collection threshold, prevents frequent gc locks, reset later
-gc-cons-threshold most-positive-fixnum
-;; Ignore warnings for (obsolete) elisp compilations
-byte-compile-warnings '(not obsolete)
-;; And other log types completely
-warning-suppress-log-types '((comp) (bytecomp))
-;; Large files are okay in the new millenium.
-large-file-warning-threshold 100000000
-;; dont show garbage collection messages at startup, will reset later
-garbage-collection-messages nil
-;; native compilation
-package-native-compile t
-native-comp-warning-on-missing-source nil
-native-comp-async-report-warnings-errors 'silent
-;; Read more based on system pipe capacity
-read-process-output-max (max (* 10240 10240) read-process-output-max)
-;; scroll configuration
-scroll-margin 0           ; Lets scroll to the end of the margin
-scroll-conservatively 100000        ; Never recenter the window
-scroll-preserve-screen-position 1     ; Scrolling back and forth
-;; frame config
-;; Improve emacs startup time by not resizing to adjust for custom settings
-frame-inhibit-implied-resize t
-;; Dont resize based on character height / width but to exact pixels
-frame-resize-pixelwise t
-;; backups & files
-backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
-backup-by-copying t           ; Don't clobber symlinks
-create-lockfiles nil          ; Don't have temp files
-delete-old-versions t         ; Cleanup automatically
-kept-new-versions 6           ; Update every few times
-kept-old-versions 2           ; And cleanup even more
-version-control t           ; Version them backups
-delete-by-moving-to-trash t       ; Dont delete, send to trash instead
-;; startup
-inhibit-startup-screen t        ; I have already done the tutorial. Twice
-inhibit-startup-message t         ; I know I am ready
-inhibit-startup-echo-area-message t     ; Yep, still know it
-initial-scratch-message nil       ; I know it is the scratch buffer!
-initial-buffer-choice nil
-inhibit-startup-buffer-menu t
-inhibit-x-resources t
-initial-major-mode 'fundamental-mode
-pgtk-wait-for-event-timeout 0.001     ; faster child frames
-ad-redefinition-action 'accept      ; dont care about legacy things being redefined
-inhibit-compacting-font-caches t
-;; tabs
-tab-width 4             ; Always tab 4 spaces.
-indent-tabs-mode nil          ; Never use actual tabs.
-;; rendering
-cursor-in-non-selected-windows nil      ; dont render cursors other windows
-;; packages
-use-package-always-defer t
-load-prefer-newer t
-default-input-method nil
-use-dialog-box nil
-use-file-dialog nil
-use-package-expand-minimally t
-package-enable-at-startup nil
-use-package-enable-imenu-support t
-auto-mode-case-fold nil  ; No second pass of case-insensitive search over auto-mode-alist.
-package-archives '(("melpa"    . "https://melpa.org/packages/")
-        ("gnu"    . "https://elpa.gnu.org/packages/")
-        ("nongnu"   . "https://elpa.nongnu.org/nongnu/")
-        ("melpa-stable" . "https://stable.melpa.org/packages/"))
-package-archive-priorities '(("gnu"  . 99)
-            ("nongnu" . 80)
-            ("melpa"  . 70)
-            ("melpa-stable" . 50))
-)
-;;; early-init.el ends here
diff --git a/Droidnix/generated/system/applications/terminal_shell/emacs.nix b/Droidnix/generated/system/applications/terminal_shell/emacs.nix
deleted file mode 100644
index d610e9a2b..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/emacs.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # NixOS Configuration
-  environment.systemPackages = with pkgs; [
-    # Add system-wide packages here, if any
-  ];
-
-  # Home Manager Configuration for the user 'henrov'
-  home-manager.users.henrov = {
-    programs.emacs = {
-      enable = true;
-      package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
-
-      # Group related packages for clarity and easier maintenance
-      extraPackages = epkgs: with epkgs; [
-        # Tree-sitter and language support
-        manualPackages.treesit-grammars.with-all-grammars
-        rust-mode
-        rustic
-        nix-mode
-        hcl-mode
-
-        # UI/UX and navigation
-        nerd-icons
-        doom-modeline
-        diminish
-        eldoc
-        eldoc-box
-        pulsar
-        which-key
-        avy
-        consult
-        vertico
-        marginalia
-        crux
-        shell-pop
-
-        # Completion and snippets
-        nerd-icons-corfu
-        corfu
-        cape
-        orderless
-        yasnippet
-        yasnippet-snippets
-
-        # Utilities and tools
-        rg
-        exec-path-from-shell
-        eat
-        f
-        gptel
-        nixpkgs-fmt
-        envrc
-
-        # Theming
-        catppuccin-theme
-
-        # Git
-        magit
-
-        # Editing and workflow
-        expreg
-        vundo
-        puni
-
-        # Error and side panel support
-        sideline
-        sideline-flymake
-        sideline-eglot
-      ];
-    };
-
-    # Home Manager session variables
-    home.sessionVariables = {
-      EDITOR = "emacs";
-      XDG_SCREENSHOTS_DIR = "~/screenshots";
-    };
-  /*
-    # Home Manager file management
-    home.file = {
-      "emacs/early-init.el" = {
-        source = ./early-init.el;
-        target = ".emacs.d/early-init.el";
-      };
-      "emacs/init.el" = {
-        source = ./init.el;
-        target = ".emacs.d/init.el";
-      };
-    };
-  */
-  };
-}
diff --git a/Droidnix/generated/system/applications/terminal_shell/init.el b/Droidnix/generated/system/applications/terminal_shell/init.el
deleted file mode 100644
index 932195993..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/init.el
+++ /dev/null
@@ -1,400 +0,0 @@
-;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
-
-;;; Commentary:
-;;; Simple Emacs setup I carry everywhere
-
-;;; Code:
-(setq custom-file (locate-user-emacs-file "custom.el"))
-(load custom-file 'noerror)    ;; no error on missing custom file
-
-(require 'package)
-(package-initialize)
-
-(defun reset-custom-vars ()
-"Resets the custom variables that were set to crazy numbers"
-(setopt gc-cons-threshold (* 1024 1024 100))
-(setopt garbage-collection-messages t))
-
-(use-package emacs
-:custom
-(native-comp-async-query-on-exit t)
-(read-answer-short t)
-(use-short-answers t)
-(enable-recursive-minibuffers t)
-(which-func-update-delay 1.0)
-(visible-bell nil)
-(custom-buffer-done-kill t)
-(whitespace-line-column nil)
-(x-underline-at-descent-line t)
-(imenu-auto-rescan t)
-(uniquify-buffer-name-style 'forward)
-(confirm-nonexistent-file-or-buffer nil)
-(create-lockfiles nil)
-(make-backup-files nil)
-(kill-do-not-save-duplicates t)
-(sentence-end-double-space nil)
-(treesit-enabled-modes t)
-:init
-;; base visual
-(menu-bar-mode -1)       ;; no menu bar
-(toggle-scroll-bar -1)     ;; no scroll bar
-(tool-bar-mode -1)       ;; no tool bar either
-(blink-cursor-mode -1)     ;; stop blinking
-
-;; font of the century
-(set-frame-font "Aporetic Sans Mono 12" nil t)
-
-:bind
-(("C-<wheel-up>" . pixel-scroll-precision) ; dont zoom in please, just scroll
- ("C-<wheel-down>" . pixel-scroll-precision) ; dont zoom in either, just scroll
- ("C-x k"    . kill-current-buffer)) ; kill the buffer, dont ask
-:hook
-(text-mode . delete-trailing-whitespace-mode)
-(prog-mode . delete-trailing-whitespace-mode)
-(after-init . global-display-line-numbers-mode) ;; always show line numbers
-(after-init . column-number-mode)     ;; column number in the mode line
-(after-init . size-indication-mode)     ;; file size in the mode line
-(after-init . pixel-scroll-precision-mode)  ;; smooth mouse scroll
-(after-init . electric-pair-mode)     ;; i mean ... parens should auto create
-(after-init . reset-custom-vars)
-)
-
-(use-package autorevert
-:ensure nil
-:custom
-(auto-revert-interval 3)
-(auto-revert-remote-files nil)
-(auto-revert-use-notify t)
-(auto-revert-avoid-polling nil)
-(auto-revert-verbose t)
-:hook
-(after-init . global-auto-revert-mode))
-
-(use-package recentf
-:ensure nil
-:commands (recentf-mode recentf-cleanup)
-:hook
-(after-init . recentf-mode)
-:custom
-(recentf-auto-cleanup 'never)
-(recentf-exclude
- (list "\\.tar$" "\\.tbz2$" "\\.tbz$" "\\.tgz$" "\\.bz2$"
-   "\\.bz$" "\\.gz$" "\\.gzip$" "\\.xz$" "\\.zip$"
-   "\\.7z$" "\\.rar$"
-   "COMMIT_EDITMSG\\'"
-   "\\.\\(?:gz\\|gif\\|svg\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
-   "-autoloads\\.el$" "autoload\\.el$"))
-
-:config
-;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
-;; `recentf-save-list', allowing stale entries to be removed before the list
-;; is saved by `recentf-save-list', which is automatically added to
-;; `kill-emacs-hook' by `recentf-mode'.
-(add-hook 'kill-emacs-hook #'recentf-cleanup -90))
-
-(use-package savehist
-:ensure nil
-:commands (savehist-mode savehist-save)
-:hook
-(after-init . savehist-mode)
-:custom
-(savehist-autosave-interval 600)
-(savehist-additional-variables
- '(kill-ring        ; clipboard
- register-alist       ; macros
- mark-ring global-mark-ring   ; marks
- search-ring regexp-search-ring)))
-
-(use-package hl-line
-:ensure nil
-:custom
-(hl-line-sticky-flag nil)
-(global-hl-line-sticky-flag nil)
-:hook
-(after-init . global-hl-line-mode))
-
-(use-package saveplace
-:ensure nil
-:commands (save-place-mode save-place-local-mode)
-:hook
-(after-init . save-place-mode)
-:custom
-(save-place-limit 400))
-
-(use-package nerd-icons
-:custom
-;; disable bright icon colors
-(nerd-icons-color-icons nil))hells.nix
-
-(use-package doom-modeline
-:custom
-(inhibit-compacting-font-caches t)  ;; speed
-(doom-modeline-buffer-file-name-style 'relative-from-project)
-(doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
-(doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
-(doom-modeline-buffer-state-icon nil) ;; the filename already shows me
-(doom-modeline-lsp nil)     ;; lsp state is too distracting, too often
-:hook (after-init . doom-modeline-mode))
-
-(load-theme 'catppuccin :no-confirm)
-
-(use-package diminish :demand t)   ;; declutter the modeline
-(use-package eldoc
-:diminish eldoc-mode
-:custom
-(eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
-
-(use-package eldoc-box
-:defer t
-:config
-(set-face-background 'eldoc-box-border (catppuccin-color 'green))
-(set-face-background 'eldoc-box-body (catppuccin-color 'base))
-:bind
-(("M-h" . eldoc-box-help-at-point)))
-
-(use-package pulsar
-:commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
-:init
-(defface pulsar-catppuccin
-`((default :extend t)
-  (((class color) (min-colors 88) (background light))
- :background ,(catppuccin-color 'sapphire))
-  (((class color) (min-colors 88) (background dark))
- :background ,(catppuccin-color 'sapphire))
-  (t :inverse-video t))
-"Alternative nord face for `pulsar-face'."
-:group 'pulsar-faces)
-:custom
-(pulsar-face 'pulsar-catppuccin)
-:hook
-(after-init . pulsar-global-mode))
-
-(use-package which-key
-:commands which-key-mode
-:diminish which-key-mode
-:hook
-(after-init . which-key-mode))
-
-(use-package expreg
-:bind ("M-m" . expreg-expand))
-
-(use-package vundo) ;; undo tree
-
-;; better structured editing
-(use-package puni
-:commands puni-global-mode
-:hook
-(after-init . puni-global-mode))
-
-(use-package avy
-:bind
-("M-i" . avy-goto-char-2)
-:custom
-(avy-background t))
-
-(use-package consult
-:bind
-("C-x b" . consult-buffer)   ;; orig. switch-to-buffer
-("M-y"   . consult-yank-pop) ;; orig. yank-pop
-("M-g M-g" . consult-goto-line)  ;; orig. goto-line
-("M-g i" . consult-imenu)  ;; consult version is interactive
-("M-g r" . consult-ripgrep)  ;; find in project also works
-:custom
-(consult-narrow-key "<"))
-
-(use-package vertico
-:commands vertico-mode
-:custom
-(read-file-name-completion-ignore-case t)
-(read-buffer-completion-ignore-case t)
-(completion-ignore-case t)
-(enable-recursive-minibuffers t)
-(minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
-:init
-(vertico-mode)
-:hook
-(minibuffer-setup-hook . cursor-intangible-mode))
-
-(use-package marginalia
-:commands marginalia-mode
-:hook (after-init . marginalia-mode))
-
-(use-package crux
-:bind
-("C-c M-e" . crux-find-user-init-file)
-("C-c C-w" . crux-transpose-windows)
-("C-c M-d" . crux-find-current-directory-dir-locals-file)
-("C-a"   . crux-move-beginning-of-line))
-
-(use-package magit
-:bind (("C-M-g" . magit-status)))
-
-(use-package nerd-icons-corfu
-:commands nerd-icons-corfu-formatter
-:defines corfu-margin-formatters)
-
-(use-package corfu
-:commands global-corfu-mode
-:custom
-(corfu-cycle t)
-(corfu-auto t)
-(corfu-auto-delay  1)
-(corfu-auto-prefix 3)
-(corfu-separator ?_)
-:hook
-(after-init . global-corfu-mode)
-:config
-(add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
-
-(use-package cape)
-
-(use-package orderless
-:custom
-(completion-styles '(orderless partial-completion basic))
-(completion-category-defaults nil)
-(completion-category-overrides nil))
-
-(use-package yasnippet
-:commands yas-global-mode
-:diminish yas-minor-mode
-:hook
-(after-init . yas-global-mode))
-
-(use-package yasnippet-snippets :after yasnippet)
-
-(use-package exec-path-from-shell
-:commands exec-path-from-shell-initialize
-:custom
-(exec-path-from-shell-arguments nil)
-:hook
-(after-init . exec-path-from-shell-initialize))
-
-(use-package nixpkgs-fmt
-:custom
-(nixpkgs-fmt-command "nixfmt"))
-
-(use-package eat
-:bind
-(("C-c e p" . eat-project)
- ("C-c e t" . eat)))
-
-(use-package f :demand t)
-
-(use-package envrc
-:commands envrc-global-mode
-:hook
-(after-init . envrc-global-mode))
-
-(use-package gptel
-:commands gptel-make-anthropic f-read-text
-:config
-(gptel-make-anthropic "Claude"
-:stream t :key (f-read-text "/run/secrets/claude_key")))
-
-(use-package sideline-flymake)
-(use-package sideline-eglot)
-(use-package sideline
-:custom
-(sideline-backends-right '(sideline-flymake sideline-eglot))
-:hook
-(eglot-managed-mode . sideline-mode)
-(flymake-mode . sideline-mode))
-
-(use-package eglot
-:custom
-(eglot-extend-to-xref t)
-(eglot-ignored-server-capabilities '(:inlayHintProvider))
-(jsonrpc-event-hook nil)
-:hook
-(eglot-managed-mode . eldoc-box-hover-mode)
-(before-save . eldoc-format-buffer)
-:bind
-(:map eglot-mode-map
-  ("C-c l a" . eglot-code-actions)
-  ("C-c l r" . eglot-rename)
-  ("C-c l h" . eldoc)
-  ("C-c l g" . xref-find-references)
-  ("C-c l w" . eglot-reconnect)))
-
-(use-package proced
-:custom
-(proced-auto-update-flag t)
-(proced-auto-update-interval 3)
-(proced-enable-color-flag t)
-(proced-show-remote-processes t))
-
-(use-package org
-:ensure t
-:defer t
-:commands (org-mode org-capture org-agenda)
-:init
-(defvar org-journal-file "~/nextcloud/org/journal.org")
-(defvar org-archive-file "~/nextcloud/org/archive.org")
-(defvar org-notes-file "~/nextcloud/org/notes.org")
-(defvar org-inbox-file "~/nextcloud/org/inbox.org")
-(defvar org-work-file "~/nextcloud/org/work.org")
-(defun my/org-capture-project-target-heading ()
-"Determine Org target headings from the current file's project path.
-
-This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
-It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
-for an Org capture template.
-
-If the current buffer is not visi
-ting a file within such a
-project structure, it returns nil, causing capture to default to
-the top of the file."
-(when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
-  (let ((path-parts (split-string path "/" t " ")))
-  (when-let* ((projects-pos (cl-position "projects" path-parts :test #'string=))
-      (company  (nth (+ 1 projects-pos) path-parts))
-      (project  (nth (+ 2 projects-pos) path-parts)))
-  ;; Return a list of headlines for Org to find or create.
-  (list company project)))))
-:bind
-(("C-c c" . org-capture)
- ("C-c i" . org-store-link)
- ("C-c a" . org-agenda)
- :map org-mode-map
- ("C-c t" . org-toggle-inline-images)
- ("C-c l" . org-toggle-link-display))
-:custom
-(org-agenda-files (list org-inbox-file org-journal-file))
-(org-directory "~/nextcloud/org")
-(org-default-notes-file org-inbox-file)
-(org-archive-location (concat org-archive-file "::* From %s"))
-(org-log-done 'time)
-(org-log-into-drawer t)
-(org-hide-emphasis-markers t)
-(org-src-fontify-natively t)
-(org-src-tab-acts-natively t)
-(org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
-        "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n)")
-         ("j" "Journal" entry (file+olp+datetree org-journal-file)
-        "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
-         ("n" "Note" entry (file org-notes-file)
-        "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
-         ("p" "Project Task" item
-        (file+function org-work-file my/org-capture-project-target-heading)
-        "* TODO %? \n  CLOCK: %U"
-        ))
-       )
-:config
-;; Enable syntax highlighting in code blocks
-(add-hook 'org-mode-hook 'turn-on-font-lock)
-(add-hook 'org-mode-hook 'org-indent-mode))
-
-;; extras
-(use-package comp-run
-:ensure nil
-:config
-(push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
-(push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
-
-(use-package rustic
-:custom
-(rustic-lsp-client 'eglot))
-
-(provide 'init)
-
-;;; init.el ends here
diff --git a/Droidnix/generated/system/applications/terminal_shell/kitty.nix b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
deleted file mode 100644
index 6a3731900..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/kitty.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, lib, user, flakeRoot, ... }:
-let
-  kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty";
-in
-{
-  home-manager.users.${user.username} = {
-    programs.kitty = {
-      enable = true;
-    };
-
-    # Copy the actual kitty.conf (not a symlink)
-    xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
-      (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
deleted file mode 100644
index 06f1e5725..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/starship.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  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/top.nix b/Droidnix/generated/system/applications/terminal_shell/top.nix
deleted file mode 100644
index a384a8ceb..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/top.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./kitty.nix
-    ./starship.nix
-    ./zsh.nix
-    ./emacs.nix
-  ];
-  # .. put any code here
-}
diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
deleted file mode 100644
index 034bfb243..000000000
--- a/Droidnix/generated/system/applications/terminal_shell/zsh.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  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;
-
-      # Enable oh-my-zsh and use its plugins
-      oh-my-zsh = {
-        enable = true;
-        plugins = [
-          "git"
-          "docker"
-          "direnv"
-          "zsh-autosuggestions"
-          "zsh-syntax-highlighting"
-          "zsh-completions"
-          "zsh-history-substring-search"
-        ];
-        theme = "agnoster"; # Fallback, overridden below
-      };
-
-      # 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"
-      '';
-    };
-
-    # Home Manager packages (optional)
-    home.packages = with pkgs; [
-      direnv
-      git-extras
-    ];
-  };
-}
diff --git a/Droidnix/generated/system/applications/top.nix b/Droidnix/generated/system/applications/top.nix
deleted file mode 100644
index 287cde4b2..000000000
--- a/Droidnix/generated/system/applications/top.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./packages.nix
-    ./flatpaks.nix
-    ./accessibility/top.nix
-    ./file_management/top.nix
-    ./gaming/top.nix
-    ./media_playback_editing/top.nix
-    ./office_productivity/top.nix
-    ./terminal_shell/top.nix
-  ];
-  nixpkgs.config.allowUnfree = true;
-}
diff --git a/Droidnix/generated/system/core/eww.nix b/Droidnix/generated/system/core/eww.nix
deleted file mode 100644
index 2e645b262..000000000
--- a/Droidnix/generated/system/core/eww.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, config, pkgs, flakeRoot, user, ... }:
-let
-  ewwConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/eww";
-  # Dynamically read all files in assets/system/conf/eww/
-  ewwConfs = lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/system/conf/eww")) (name: {
-    text = builtins.readFile "${flakeRoot}/assets/system/conf/eww/${name}";
-  });
-in
-{
-  environment.systemPackages = with pkgs; [ eww ];
-
-  home-manager.users.${user.username} = {
-    home.file = {
-      "${ewwConfigDir}" = {
-        source = "${flakeRoot}/assets/system/conf/eww";
-        recursive = true;
-      };
-    };
-
-    home.sessionVariables = {
-      EWW_BIN = "${pkgs.eww}/bin/eww";
-    };
-
-    # Start eww with Hyprland/MangoWC
-    wayland.windowManager.hyprland.settings = lib.mkForce {
-      exec-once = [ "eww daemon" ];
-      exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; # Adjust as needed
-    };
-  };
-}
diff --git a/Droidnix/generated/system/core/fonts.nix b/Droidnix/generated/system/core/fonts.nix
deleted file mode 100644
index 916964572..000000000
--- a/Droidnix/generated/system/core/fonts.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  fonts.packages = with pkgs; [
-    pkgs.nerd-fonts.iosevka
-  ];
-}
diff --git a/Droidnix/generated/system/core/login-tuigreeter.nix b/Droidnix/generated/system/core/login-tuigreeter.nix
deleted file mode 100644
index f2b8d6ff6..000000000
--- a/Droidnix/generated/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/system/core/top.nix b/Droidnix/generated/system/core/top.nix
deleted file mode 100644
index a9c1db5a8..000000000
--- a/Droidnix/generated/system/core/top.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
-{
-  imports = [
-    ./wayland.nix
-    #./eww.nix
-    ./waybar.nix
-    ./login-tuigreeter.nix
-    #./login-lightdm.nix
-    ./fonts.nix
-  ];
-}
diff --git a/Droidnix/generated/system/core/waybar.nix b/Droidnix/generated/system/core/waybar.nix
deleted file mode 100644
index e39416653..000000000
--- a/Droidnix/generated/system/core/waybar.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, pkgs, config, flakeRoot, ... }:
-let
-  username = "henrov";  # Replace with your actual username
-  waybar-config = pkgs.writeText "waybar-config" (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/config"));
-  waybar-style = pkgs.writeText "waybar-style" (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/style.css"));
-in
-{
-  programs.waybar = {
-    enable = true;
-    package = pkgs.waybar;
-  };
-
-  systemd.user.services.waybar = {
-    description = "Waybar (status bar for Wayland)";
-    wantedBy = [ "graphical-session.target" ];
-    after = [ "graphical-session.target" ];
-    serviceConfig = {
-      ExecStart = "${config.programs.waybar.package}/bin/waybar -c ${waybar-config} -s ${waybar-style}";
-      Restart = "on-failure";
-      RestartSec = "5s";
-    };
-  };
-
-  # Create symlinks for config and style
-  system.activationScripts.waybarSetup = lib.mkAfter ''
-    mkdir -p /home/${username}/.config/waybar
-    ln -sf ${waybar-config} /home/${username}/.config/waybar/config
-    ln -sf ${waybar-style} /home/${username}/.config/waybar/style.css
-    chown -R ${username}:users /home/${username}/.config/waybar
-  '';
-}
diff --git a/Droidnix/generated/system/core/wayland.nix b/Droidnix/generated/system/core/wayland.nix
deleted file mode 100644
index ef08a62f4..000000000
--- a/Droidnix/generated/system/core/wayland.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, lib, user, ... }:
-{
-  home-manager.users.${user.username} = {
-    xdg.portal = {
-      enable = true;
-      extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
-      config.hyprland = {
-        "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
-      };
-    };
-
-  home.packages = with pkgs; [
-     uwsm
-     ];
-  };
-}
diff --git a/Droidnix/generated/system/development/databases/top.nix b/Droidnix/generated/system/development/databases/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/development/devops_ci_cd/top.nix b/Droidnix/generated/system/development/devops_ci_cd/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/development/programming_languages/top.nix b/Droidnix/generated/system/development/programming_languages/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/development/top.nix b/Droidnix/generated/system/development/top.nix
deleted file mode 100644
index 877d65e34..000000000
--- a/Droidnix/generated/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/system/development/virtualization/top.nix b/Droidnix/generated/system/development/virtualization/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/development/web_development/top.nix b/Droidnix/generated/system/development/web_development/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/audio/top.nix b/Droidnix/generated/system/system_management/audio/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/backups/top.nix b/Droidnix/generated/system/system_management/backups/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/bluetooth/top.nix b/Droidnix/generated/system/system_management/bluetooth/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/disk_management/top.nix b/Droidnix/generated/system/system_management/disk_management/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/hardware_sensors/top.nix b/Droidnix/generated/system/system_management/hardware_sensors/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/logging_monitoring/top.nix b/Droidnix/generated/system/system_management/logging_monitoring/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/login_manager/top.nix b/Droidnix/generated/system/system_management/login_manager/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/monitor_setup/top.nix b/Droidnix/generated/system/system_management/monitor_setup/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/networking/top.nix b/Droidnix/generated/system/system_management/networking/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/power_management/top.nix b/Droidnix/generated/system/system_management/power_management/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/printers_scanners/top.nix b/Droidnix/generated/system/system_management/printers_scanners/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/security/top.nix b/Droidnix/generated/system/system_management/security/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/system_updates/top.nix b/Droidnix/generated/system/system_management/system_updates/top.nix
deleted file mode 100644
index c7da173ce..000000000
--- a/Droidnix/generated/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/system/system_management/top.nix b/Droidnix/generated/system/system_management/top.nix
deleted file mode 100644
index c7602dac8..000000000
--- a/Droidnix/generated/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/system/task_launcher/top.nix b/Droidnix/generated/system/task_launcher/top.nix
deleted file mode 100644
index f60e4fb46..000000000
--- a/Droidnix/generated/system/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/system/task_launcher/wofi.nix b/Droidnix/generated/system/task_launcher/wofi.nix
deleted file mode 100644
index d151550d2..000000000
--- a/Droidnix/generated/system/task_launcher/wofi.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  flakeRoot,
-  user,
-  ...
-}:
-
-let
-  wofiConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/wofi";
-  # Dynamically read all files in assets/hyprland/conf/wofi/
-  wofiConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/system/conf/wofi"))
-      (name: {
-        text = builtins.readFile "${flakeRoot}/assets/system/conf/wofi/${name}";
-      });
-in
-{
-  environment.systemPackages = with pkgs; [
-    wofi
-  ];
-
-  home-manager.users.${user.username} = {
-    home.file = {
-      # Map the files to their target paths in ~/.config/wofi/
-      "${wofiConfigDir}/config" = wofiConfs."wofi.conf"; # Use the actual filename
-      "${wofiConfigDir}/style.css" = wofiConfs."theming.css"; # Use the actual filename
-    };
-
-    home.sessionVariables = {
-      WOFI_CONFIG = "${wofiConfigDir}/config";
-      WOFI_STYLE = "${wofiConfigDir}/style.css";
-    };
-  };
-}
diff --git a/Droidnix/generated/system/top.nix b/Droidnix/generated/system/top.nix
deleted file mode 100644
index c1a1bec75..000000000
--- a/Droidnix/generated/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/top.nix b/Droidnix/generated/top.nix
deleted file mode 100644
index e418ef7a2..000000000
--- a/Droidnix/generated/top.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./system/top.nix
-    ./hyprland/top.nix
-    # ./mangowc/top.nix
-  ];
-}