diff --git a/Droidnix/README.org b/Droidnix/README.org
index 12ef07b6e..0139547a3 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -327,41 +327,44 @@ in
 * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure
 ** =generated/hosts/traveldroid/traveldroid.nix=
 #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/traveldroid.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, lib, inputs, ... }:
+{ lib, config, ... }:
 
+# Standaard username
 let
+  username = config.defaultUser or "henrov";
+
+  # Modules directory en switches
   modulesPath = ./generated/parked;
-
-  # Laad alle modules
-  importedModules = inputs.import-tree modulesPath;
-
-  # Laad module switches
+  importedModules = import-tree modulesPath;
   moduleSwitches = import ./assets/system/modules.conf;
 
-  # Filter ingeschakelde modules en zorg dat het een attrset blijft
+  # Alleen de ingeschakelde modules
   enabledModules =
-    lib.filterAttrs (name: _: (moduleSwitches.${name} or false)) importedModules.imports;
+    lib.filterAttrs (name: _: moduleSwitches.${name} or false)
+      importedModules.imports;
 
-  # Converteer naar lijst (voor foldl'), maar check dat elk fragment een attrset is
+  # Zet modules om naar lijst
   moduleList = builtins.attrValues enabledModules;
 
-  # Haal Home Manager fragments veilig op
+  # Haal home-manager fragmenten op en zorg dat het altijd attrsets zijn
   getFragment = module:
     if builtins.hasAttr "homeManagerExtraUserFragment" module
-    then let frag = module.homeManagerExtraUserFragment; in
-         if builtins.isAttrs frag then frag else {}
+    then module.homeManagerExtraUserFragment
     else {};
 
-  homeManagerExtraUserFragments =
-    lib.foldl' lib.mkMerge {} (map getFragment moduleList);
+  safeFragments = map (frag:
+    if builtins.isAttrs frag then frag else {}
+  ) (map getFragment moduleList);
 
-in {
+  # Merge alle fragments
+  homeManagerExtraUserFragments = lib.foldl' lib.mkMerge {} safeFragments;
+
+in
+{
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  home-manager.users = lib.mkMerge [
-    homeManagerExtraUserFragments
-  ];
+  home-manager.users = homeManagerExtraUserFragments;
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix
deleted file mode 100644
index 5feadb525..000000000
--- a/Droidnix/generated/hosts/traveldroid/boot.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ inputs, config, lib, pkgs, ... }:
-{
-
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    device = "nodev";
-    useOSProber = true;
-  };
-  #boot.efi.canTouchEfiVariables = true;
-
-  boot.kernelParams = [
-    "systemd.mask=dev-tpm0.device"
-    "systemd.mask=dev-tpmrm0.device"
-  ];
-}
diff --git a/Droidnix/generated/hosts/traveldroid/hardware-configuration.nix b/Droidnix/generated/hosts/traveldroid/hardware-configuration.nix
deleted file mode 100644
index 802b3df31..000000000
--- a/Droidnix/generated/hosts/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/hosts/traveldroid/traveldroid.nix b/Droidnix/generated/hosts/traveldroid/traveldroid.nix
deleted file mode 100644
index 37a16e703..000000000
--- a/Droidnix/generated/hosts/traveldroid/traveldroid.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, inputs, ... }:
-
-let
-  modulesPath = ./generated/parked;
-
-  # Laad alle modules
-  importedModules = inputs.import-tree modulesPath;
-
-  # Laad module switches
-  moduleSwitches = import ./assets/system/modules.conf;
-
-  # Filter ingeschakelde modules en zorg dat het een attrset blijft
-  enabledModules =
-    lib.filterAttrs (name: _: (moduleSwitches.${name} or false)) importedModules.imports;
-
-  # Converteer naar lijst (voor foldl'), maar check dat elk fragment een attrset is
-  moduleList = builtins.attrValues enabledModules;
-
-  # Haal Home Manager fragments veilig op
-  getFragment = module:
-    if builtins.hasAttr "homeManagerExtraUserFragment" module
-    then let frag = module.homeManagerExtraUserFragment; in
-         if builtins.isAttrs frag then frag else {}
-    else {};
-
-  homeManagerExtraUserFragments =
-    lib.foldl' lib.mkMerge {} (map getFragment moduleList);
-
-in {
-  networking.hostName = "traveldroid";
-  system.stateVersion = "26.05";
-
-  home-manager.users = lib.mkMerge [
-    homeManagerExtraUserFragments
-  ];
-}
diff --git a/Droidnix/generated/modules/desktop/hyprland.nix b/Droidnix/generated/modules/desktop/hyprland.nix
deleted file mode 100644
index 01727b1a6..000000000
--- a/Droidnix/generated/modules/desktop/hyprland.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, config, ... }:
-
-let
-  username = config.defaultUser or "henrov";
-  assetPath = ../../../assets/hyprland/conf/hypr;
-  mainConfigPath = "${assetPath}/hyprland.conf";
-in
-{
-  homeManagerExtraUserFragment = {
-    "${username}" = {
-
-      settings.general."col.active_border" =
-          lib.mkForce "0xff97cbcd 0xff89b4fa";
-      };
-
-      xdg.configFile."hypr/hyprland.conf".text =
-        builtins.readFile mainConfigPath;
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/apps/emacs/early-init.el b/Droidnix/generated/parked/apps/emacs/early-init.el
deleted file mode 100644
index d6f8111be..000000000
--- a/Droidnix/generated/parked/apps/emacs/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/parked/apps/emacs/emacs.nix b/Droidnix/generated/parked/apps/emacs/emacs.nix
deleted file mode 100644
index c7d23f09c..000000000
--- a/Droidnix/generated/parked/apps/emacs/emacs.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-let
-  moduleName   = "emacs";
-  username     = config.defaultUser or "henrov";
-
-  # Paths to your init files (relative to this module)
-  emacsAssets  = ../../../assets/system/conf/emacs;
-  initFile     = "${emacsAssets}/init.el";
-  earlyInitFile = "${emacsAssets}/early-init.el";
-
-  # Toggle for this module
-  enableProgram = config.enableEmacs or false;
-in
-{
-  # Top-level toggle option
-  options.enableEmacs = lib.mkEnableOption "Enable Emacs configuration";
-
-  config = lib.mkIf enableProgram {
-
-    # Minimal system-wide Emacs package
-    environment.systemPackages = [
-      pkgs.emacs-pgtk.override { withTreeSitter = true; }
-    ];
-
-    # Home Manager Emacs config
-    home-manager.users.${username} = {
-      programs.emacs = {
-        enable = true;
-        package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
-
-        extraPackages = epkgs: with epkgs; [
-          # Core dev and language support
-          manualPackages.treesit-grammars.with-all-grammars
-          rust-mode
-          rustic
-          nix-mode
-          hcl-mode
-
-          # UI & workflow
-          nerd-icons
-          doom-modeline
-          diminish
-          eldoc
-          eldoc-box
-          pulsar
-          which-key
-          avy
-          consult
-          vertico
-          marginalia
-          crux
-          shell-pop
-
-          # Completion/snippets
-          nerd-icons-corfu
-          corfu
-          cape
-          orderless
-          yasnippet
-          yasnippet-snippets
-
-          # Utilities
-          rg
-          exec-path-from-shell
-          eat
-          f
-          gptel
-          nixpkgs-fmt
-          envrc
-
-          # Theming
-          catppuccin-theme
-
-          # Git
-          magit
-
-          # Editing/workflow
-          expreg
-          vundo
-          puni
-
-          # Error/side panels
-          sideline
-          sideline-flymake
-          sideline-eglot
-        ];
-
-        # Load your init files from assets
-        initFile       = initFile;
-        earlyInitFile  = earlyInitFile;
-      };
-
-      # Useful session variables
-      home.sessionVariables = {
-        EDITOR = "emacs";
-        XDG_SCREENSHOTS_DIR = "~/screenshots";
-      };
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/apps/emacs/init.el b/Droidnix/generated/parked/apps/emacs/init.el
deleted file mode 100644
index 199d8c228..000000000
--- a/Droidnix/generated/parked/apps/emacs/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/parked/apps/flatpaks.nix b/Droidnix/generated/parked/apps/flatpaks.nix
deleted file mode 100644
index f13115e72..000000000
--- a/Droidnix/generated/parked/apps/flatpaks.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-let
-  # Module name
-  moduleName = "flatpaks";
-
-  # Top-level toggle for this module
-  enableProgram = config.enableFlatpaks or false;
-
-  # Path to your Flatpak list
-  assetPath = ../../../assets/system/apps/flatpaks.conf;
-
-  # Resolve user safely
-  username = config.defaultUser or "henrov";
-in
-{
-  # --- Top-level toggle option ---
-  options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
-
-  # --- Config only applied if enabled ---
-  config = lib.mkIf enableProgram {
-
-    # Deploy the Flatpak conf file
-    environment.etc."flatpak/flatpaks.conf".source = assetPath;
-
-    # Enable system Flatpak service
-    services.flatpak.enable = true;
-    xdg.portal.enable = true;
-
-    # Systemd service to install Flatpaks from the list
-    systemd.services."${moduleName}-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 = ''
-          set -euo pipefail
-          CONF="${assetPath}"
-
-          # Add Flathub if not present
-          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
-
-          # Install every Flatpak listed in the conf file
-          while IFS= read -r app || [ -n "$app" ]; do
-            app=$(echo "$app" | sed 's/#.*//;s/^[[:space:]]*//;s/[[:space:]]*$//')
-            if [ -n "$app" ]; then
-              if ! flatpak info --system "$app" >/dev/null 2>&1; then
-                flatpak install --system -y --noninteractive flathub "$app"
-              fi
-            fi
-          done < "$CONF"
-        '';
-      };
-
-      restartTriggers = [ assetPath ];
-
-      # Include only the packages needed for this service
-      path = [ pkgs.flatpak pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/apps/thunar.nix b/Droidnix/generated/parked/apps/thunar.nix
deleted file mode 100644
index 9d135a314..000000000
--- a/Droidnix/generated/parked/apps/thunar.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-let
-  enableProgram = config.enableThunar or false;
-  username = config.defaultUser or "henrov";
-in
-{
-  # Top-level toggle
-  options.enableThunar = lib.mkEnableOption "Enable Thunar file manager";
-
-  # Only apply config if enabled
-  config = lib.mkIf enableProgram {
-    # Install Thunar and related packages system-wide
-    environment.systemPackages = [
-      pkgs.thunar
-      pkgs.thunar-plugins
-      pkgs.xarchiver
-    ];
-
-    # Remove invalid top-level 'home' reference
-    # If you want sessionVariables, define them in Home Manager instead
-    # Example for Home Manager:
-    # home-manager.users.${username}.sessionVariables = {
-    #   FILE_MANAGER = "thunar";
-    #   USERNAME = username;
-    # };
-  };
-}
diff --git a/Droidnix/generated/parked/apps/wofi.nix b/Droidnix/generated/parked/apps/wofi.nix
deleted file mode 100644
index 169e5b55e..000000000
--- a/Droidnix/generated/parked/apps/wofi.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, config, ... }:
-
-let
-  # --- Program definition ---
-  programName = "wofi";
-
-  # Path to assets
-  assetPath = ../../../assets/system/conf/${programName};
-
-  # Generate file mappings
-  programFiles =
-    if builtins.pathExists assetPath then builtins.readDir assetPath else {};
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${assetPath}/${name}";
-  });
-
-  # Top-level toggle for this module
-  enableProgram = config.enableWofi or false;
-
-  # Default user
-  username = config.defaultUser or "henrov";
-in
-{
-  # --- Module option ---
-  options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
-
-  # --- Config ---
-  config = lib.mkIf enableProgram {
-
-    # --- Deploy assets to ~/.config/wofi ---
-    environment.etc."${programName}".source = assetPath;
-
-    # --- Optional systemd service to sync config ---
-    systemd.services."${programName}-sync" = {
-      description = "Sync ${programName} configuration files";
-      wantedBy    = [ "multi-user.target" ];
-      wants       = [ "network-online.target" ];
-      after       = [ "network-online.target" ];
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = ''
-          set -euo pipefail
-          if [ -d "${assetPath}" ]; then
-            for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do
-              mkdir -p "/home/${username}/.config/${programName}"
-              cp -u "${assetPath}/$f" "/home/${username}/.config/${programName}/$f"
-            done
-          fi
-        '';
-      };
-
-      restartTriggers = [ assetPath ];
-      path = [];
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/apps/zenbrowser.nix b/Droidnix/generated/parked/apps/zenbrowser.nix
deleted file mode 100644
index 93eeb51cd..000000000
--- a/Droidnix/generated/parked/apps/zenbrowser.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-let
-  # --- Program definition ---
-  programName = "zenbrowser";
-
-  # Assets (optional, empty if no config)
-  assetPath =
-    if builtins.pathExists ../../../assets/system/conf/${programName}
-    then ../../../assets/system/conf/${programName}
-    else null;
-
-  programFiles =
-    if assetPath != null then builtins.readDir assetPath else {};
-
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${assetPath}/${name}";
-  });
-
-  # Top-level toggle for this module
-  enableProgram = config.enableZenBrowser or false;
-
-  # Default user fallback
-  username = config.defaultUser or "henrov";
-in
-{
-  # --- Option ---
-  options.enableZenBrowser = lib.mkEnableOption "Install Zen Browser";
-
-  # --- Config ---
-  config = lib.mkIf enableProgram {
-
-    # --- Deploy assets (if any) ---
-    environment.etc."${programName}".source = assetPath;
-
-    # --- System packages ---
-    environment.systemPackages = [ pkgs.zen-browser ];
-
-    # --- Example systemd service to sync assets ---
-    systemd.services."${programName}-sync" = {
-      description = "Sync ${programName} configuration files";
-      wantedBy    = [ "multi-user.target" ];
-      wants       = [ "network-online.target" ];
-      after       = [ "network-online.target" ];
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = ''
-          set -euo pipefail
-          if [ -d "${assetPath}" ]; then
-            for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do
-              cp -u "${assetPath}/$f" "/home/${username}/.config/${programName}/$f"
-            done
-          fi
-        '';
-      };
-
-      restartTriggers = [ assetPath ];
-      path = [];
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/desktop/fonts.nix b/Droidnix/generated/parked/desktop/fonts.nix
deleted file mode 100644
index e8b70eee9..000000000
--- a/Droidnix/generated/parked/desktop/fonts.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-{
-  options.enableFonts = lib.mkEnableOption "Enable nerd fonts";
-
-  config = lib.mkIf (config.enableFonts or false) {
-    fonts.packages = with pkgs; [
-      nerd-fonts.iosevka
-      nerd-fonts.fira-code
-    ];
-  };
-}
diff --git a/Droidnix/generated/parked/desktop/stylix.nix b/Droidnix/generated/parked/desktop/stylix.nix
deleted file mode 100644
index b12e96d4e..000000000
--- a/Droidnix/generated/parked/desktop/stylix.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ lib, config, ... }:
-
-let
-  # --- Module variables ---
-  moduleName = "stylix";
-  username   = config.defaultUser or "henrov";
-
-  # Assets directory for Stylix config
-  assetPath = ../../../assets/system/conf/${moduleName};
-
-  # Read all config files
-  programFiles = builtins.readDir assetPath;
-
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${assetPath}/${name}";
-  });
-
-  # Top-level toggle for this module
-  enableProgram = config.enableStylix or false;
-
-  # Read the main stylix.conf
-  stylixConfFile = "${assetPath}/stylix.conf";
-  stylixConf     = if builtins.pathExists stylixConfFile
-                    then builtins.readFile stylixConfFile
-                    else "";
-
-  # Default cursor values
-  cursorName = "phinger-cursors-light";
-  cursorSize = 24;
-
-in
-{
-  # --- Top-level toggle ---
-  options.enableStylix = lib.mkEnableOption "Enable Stylix system theming";
-
-  # --- Only apply configuration if enabled ---
-  config = lib.mkIf enableProgram {
-
-    # Deploy Stylix configuration files to user's XDG config
-    home-manager.users.${username}.xdg.configFile =
-      lib.mapAttrs' (name: value: {
-        name  = "${moduleName}/${name}";
-        value.source = value.src;
-      }) files;
-
-    # Merge all session variables into a single map
-    home-manager.users.${username}.home.sessionVariables = lib.mkMerge [
-      {
-        STYLIX_CONF = stylixConf;
-      }
-      {
-        XCURSOR_THEME    = cursorName;
-        XCURSOR_SIZE     = toString cursorSize;
-        HYPRCURSOR_THEME = cursorName;
-        HYPRCURSOR_SIZE  = toString cursorSize;
-      }
-    ];
-
-    # Optional wallpaper helper packages (symbolic, install manually or via packages)
-    environment.systemPackages = [
-      "feh"
-      "st"
-    ];
-  };
-}
diff --git a/Droidnix/generated/parked/desktop/waybar.nix b/Droidnix/generated/parked/desktop/waybar.nix
deleted file mode 100644
index 42cfb1c3b..000000000
--- a/Droidnix/generated/parked/desktop/waybar.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, config, ... }:
-
-let
-  # --- Module variables ---
-  moduleName = "waybar";
-  username   = config.defaultUser or "henrov";
-
-  # Assets directory (self-contained)
-  assetPath = ../../../assets/system/conf/${moduleName};
-
-  # Read required config files
-  waybarConfig = "${assetPath}/waybar.conf";
-  waybarStyle  = "${assetPath}/style.css";
-
-  # Top-level toggle
-  enableProgram = config.enableWaybar or false;
-in
-{
-  # --- Option ---
-  options.enableWaybar =
-    lib.mkEnableOption "Enable Waybar status bar";
-
-  # --- Config ---
-  config = lib.mkIf enableProgram {
-
-    # Install Waybar (symbolic reference expected to be resolved elsewhere)
-    environment.systemPackages = [
-      "waybar"
-    ];
-
-    # Deploy only required files to ~/.config/waybar
-    home-manager.users.${username}.xdg.configFile = {
-
-      "waybar/config".source =
-        if builtins.pathExists waybarConfig
-        then waybarConfig
-        else null;
-
-      "waybar/style.css".source =
-        if builtins.pathExists waybarStyle
-        then waybarStyle
-        else null;
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/desktop/wayland.nix b/Droidnix/generated/parked/desktop/wayland.nix
deleted file mode 100644
index 5207bbf06..000000000
--- a/Droidnix/generated/parked/desktop/wayland.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, config, ... }:
-
-let
-  # --- Module variables ---
-  moduleName = "wayland";
-  username   = config.defaultUser or "henrov";
-
-  # Top-level toggle
-  enableProgram = config.enableWayland or false;
-in
-{
-  # --- Option ---
-  options.enableWayland =
-    lib.mkEnableOption "Enable Wayland support";
-
-  # --- Config ---
-  config = lib.mkIf enableProgram {
-
-    # Enable Hyprland in Wayland
-    wayland.windowManager.hyprland = {
-      enable = true;
-
-    # Enable XDG portals (required for Wayland apps)
-    xdg.portal.enable = true;
-
-    # Home Manager configuration
-    home-manager.users.${username} = {
-
-      xdg.portal = {
-        enable = true;
-
-        # Only unavoidable pkgs reference
-        extraPortals = [
-          config.pkgs.xdg-desktop-portal-hyprland
-        ];
-
-        config.hyprland = {
-          "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
-        };
-      };
-
-      # Wayland-related user package
-      home.packages = [
-        config.pkgs.uwsm
-      ];
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/system/dbus.nix b/Droidnix/generated/parked/system/dbus.nix
deleted file mode 100644
index b39025a6b..000000000
--- a/Droidnix/generated/parked/system/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/parked/system/networking.nix b/Droidnix/generated/parked/system/networking.nix
deleted file mode 100644
index 3ed8c4511..000000000
--- a/Droidnix/generated/parked/system/networking.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, config, pkgs,... }:
-
-let
-  coreEnabled = config.mySystem.system.core.enable or false;
-in
-{
-  options.mySystem.system.locale.enable =
-    lib.mkEnableOption "Network settings";
-
-  config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) {
-
-  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
-  environment.systemPackages = with pkgs; [
-    networkmanager
-  ];
-};
-}
diff --git a/Droidnix/generated/parked/system/terminal.nix b/Droidnix/generated/parked/system/terminal.nix
deleted file mode 100644
index 3c37aa911..000000000
--- a/Droidnix/generated/parked/system/terminal.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # (NVF = Neovim/terminal flavor)
-  stylix.targets.nvf.enable = true;
-  # feh wallpaper integration
-  stylix.targets.feh.enable = true;
-}
diff --git a/Droidnix/generated/parked/terminals/kitty.nix b/Droidnix/generated/parked/terminals/kitty.nix
deleted file mode 100644
index 836c70d6d..000000000
--- a/Droidnix/generated/parked/terminals/kitty.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-let
-  moduleName   = "kitty";
-  username     = config.defaultUser or "henrov";
-
-  assetPath    = ../../../assets/system/conf/${moduleName};
-  programFiles = builtins.readDir assetPath;
-  files        = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${assetPath}/${name}";
-  });
-
-  enableProgram = config.enableKitty or true;
-in
-{
-  options.enableKitty = lib.mkEnableOption "Enable Kitty terminal integration";
-
-  config = lib.mkIf enableProgram {
-
-    # Install kitty system-wide
-    environment.systemPackages = [ pkgs.kitty ];
-
-    # Home Manager user-specific configuration
-    home-manager.users.${username} = {
-      programs.kitty.enable = true;
-
-      programs.kitty.extraConfig = ''
-        # Include the Catppuccin-Mocha theme
-        include themes/Catppuccin-Mocha.conf
-      '';
-
-      xdg.configFile =
-        lib.mapAttrs' (name: value: {
-          name  = "${moduleName}/${name}";
-          value.source = value.src;
-        }) files;
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/terminals/starship.nix b/Droidnix/generated/parked/terminals/starship.nix
deleted file mode 100644
index dd98919f7..000000000
--- a/Droidnix/generated/parked/terminals/starship.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, ... }:
-
-let
-  # Path to your Starship config inside the flake
-  starshipAssets = ../../../assets/system/conf/starship.toml;
-
-  # Read and parse the TOML file as a symbolic value
-  starshipConfig = lib.importTOML starshipAssets;
-
-  # Toggle on/off
-  enableStarship = true;
-in
-{
-  # Declare a top-level module option
-  options.starship = {
-    enable = lib.mkEnableOption "Enable Starship prompt";
-    configFiles = lib.mkOption {
-      type = lib.types.attrsOf lib.types.any;
-      default = {};
-      description = "Symbolic Starship configuration files";
-    };
-  };
-
-  # Populate the option safely
-  config = lib.mkIf enableStarship {
-    starship.enable = true;
-    starship.configFiles = {
-      "starship.toml" = starshipConfig;
-      assetsDir = ../../../assets/system/conf;
-    };
-  };
-}
diff --git a/Droidnix/generated/parked/terminals/zsh.nix b/Droidnix/generated/parked/terminals/zsh.nix
deleted file mode 100644
index 5610e5fc5..000000000
--- a/Droidnix/generated/parked/terminals/zsh.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-let
-  programName   = "zsh";
-  programAssets = ../../../assets/system/conf/${programName};
-
-  # Read the config file that will be injected into Zsh
-  zshInitFile  = "${programAssets}/zsh.conf";
-
-  # Toggle for this module
-  enableProgram = config.enableZsh or false;
-
-  # User reference
-  username = config.defaultUser or "henrov";
-in
-{
-  # Top-level toggle
-  options.enableZsh = lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
-
-  # Only apply configuration if enabled
-  config = lib.mkIf enableProgram {
-
-    # Install Zsh system-wide
-    environment.systemPackages = [ pkgs.zsh ];
-
-    # Enable Zsh + Oh-My-Zsh
-    programs.zsh.enable = true;
-    programs.zsh.ohMyZsh.enable = true;
-    programs.zsh.ohMyZsh.theme = "catppuccin-mocha";
-    programs.zsh.ohMyZsh.plugins = [
-      "git"
-      "docker"
-      "direnv"
-      "zsh-autosuggestions"
-      "zsh-completions"
-      "zsh-history-substring-search"
-    ];
-
-    # Use the contents of zsh.conf as shellInit
-    programs.zsh.shellInit = builtins.readFile zshInitFile;
-  };
-}
diff --git a/Droidnix/generated/parked/users/henrov.nix b/Droidnix/generated/parked/users/henrov.nix
deleted file mode 100644
index b18a1ee1f..000000000
--- a/Droidnix/generated/parked/users/henrov.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# Single user definition, no imports
-let
-  user = {
-    username = "henrov";
-    hashedPassword = "$6$S7iShgBxB.77CwmP$i0njK.2r3OL5UEvgZbmwZ0rnpZ4QyJcv8p9uCmJ4AiVPSMXkQkIwMLzyAOnJ0q8.tPLIp/7EquEIZeK8qbmgw/";
-    homeDirectory = "/home/henrov";
-  };
-in
-{
-  # Define the system user properly
-  users.users.${user.username} = {
-    isNormalUser = true;
-    home = user.homeDirectory;
-    hashedPassword = user.hashedPassword;
-    extraGroups = [ "wheel" "networkmanager" ];
-  };
-
-  # Home Manager config
-  home-manager.users.${user.username} = {
-    home.stateVersion = "26.05";
-    home.username = user.username;
-    home.homeDirectory = user.homeDirectory;
-  };
-}
diff --git a/Droidnix/generated/todo/desktop/gtk.nix b/Droidnix/generated/todo/desktop/gtk.nix
deleted file mode 100644
index fe8171681..000000000
--- a/Droidnix/generated/todo/desktop/gtk.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs, user, ... }:
-{
-  environment.systemPackages = with pkgs; [
-      gtk3     # GTK target
-      gtk4     # GTK target
-    ];
-  # Stylix GTK target
-  stylix.targets.gtk.enable = true;
-
-  home-manager.users.${user.username} = {
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Catppuccin-Mocha-Standard-Blue-Dark";
-        package = pkgs.magnetic-catppuccin-gtk;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-      gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-      gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-    };
-
-  };
-}
diff --git a/Droidnix/generated/todo/desktop/xdg.nix b/Droidnix/generated/todo/desktop/xdg.nix
deleted file mode 100644
index ed37e204f..000000000
--- a/Droidnix/generated/todo/desktop/xdg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-{
-  xdg.portal = {
-    enable = true;
-    config.system.default = [ "hyprland" "gtk" ];
-  };
-}
diff --git a/Droidnix/generated/todo/system/bluetooth.nix b/Droidnix/generated/todo/system/bluetooth.nix
deleted file mode 100644
index b985e6742..000000000
--- a/Droidnix/generated/todo/system/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/todo/system/homebase.nix b/Droidnix/generated/todo/system/homebase.nix
deleted file mode 100644
index 4c5ac5a86..000000000
--- a/Droidnix/generated/todo/system/homebase.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, config, ... }:
-
-let
-  coreEnabled = config.mySystem.system.core.enable or false;
-in
-{
-  options.mySystem.system.locale.enable =
-    lib.mkEnableOption "Home-Manager settings";
-
-  config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) {
-
-    # --- Home Manager Base ---
-    home-manager = {
-      backupFileExtension = "backup";
-
-      users.henrov = {
-	  home.sessionVariables = {
-	    TERMINAL = "kitty";
-	    EDITOR = "emacs";
-	    BROWSER = "zen";
-	  };
-
-        home.stateVersion = "26.05";
-      };
-    };
-
-  };
-}
diff --git a/Droidnix/generated/todo/system/homebax.nix b/Droidnix/generated/todo/system/homebax.nix
deleted file mode 100644
index e26960407..000000000
--- a/Droidnix/generated/todo/system/homebax.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, config, ... }:
-
-let
-  coreEnabled = config.mySystem.system.core.enable or false;
-in
-{
-  # Top-level option for this module
-  options.mySystem.system.locale.enable =
-    lib.mkEnableOption "Enable Nix & Flake specific settings";
-
-  # Top-level container for all custom program configs (your myPrograms idea)
-  options.myPrograms = lib.mkOption {
-    type = lib.types.attrsOf lib.types.any;
-    default = {};
-    description = "Container for all custom program configurations";
-  };
-
-  # Apply the configuration only if core or locale is enabled
-  config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) {
-    nix.settings = {
-      experimental-features = [ "nix-command" "flakes" ];
-      download-buffer-size = 536870912; # 512 MB
-      cores = 2;
-      max-jobs = 1;
-    };
-  };
-}
diff --git a/Droidnix/generated/todo/system/login-tuigreeter.nix b/Droidnix/generated/todo/system/login-tuigreeter.nix
deleted file mode 100644
index f2b8d6ff6..000000000
--- a/Droidnix/generated/todo/system/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/todo/system/services.nix b/Droidnix/generated/todo/system/services.nix
deleted file mode 100644
index 79688f4fc..000000000
--- a/Droidnix/generated/todo/system/services.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, config, ... }:
-
-let
-  coreEnabled = config.mySystem.system.core.enable or false;
-in
-{
-  options.mySystem.system.locale.enable =
-    lib.mkEnableOption "Services settings (printing / audio)";
-
-  config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) {
-
-    # --- Services (Printing & Audio) ---
-    services.printing.enable = true;
-    services.pulseaudio.enable = false;
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-  };
-}