diff --git a/Droidnix/generated/hosts/traveldroid/bluetooth.nix b/Droidnix/generated/hosts/traveldroid/bluetooth.nix
new file mode 100644
index 000000000..b985e6742
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/bluetooth.nix
@@ -0,0 +1,28 @@
+{ 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/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix
new file mode 100644
index 000000000..5feadb525
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/boot.nix
@@ -0,0 +1,16 @@
+{ 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/dbus.nix b/Droidnix/generated/hosts/traveldroid/dbus.nix
new file mode 100644
index 000000000..b39025a6b
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/dbus.nix
@@ -0,0 +1,13 @@
+{ 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/hosts/traveldroid/gtk.nix b/Droidnix/generated/hosts/traveldroid/gtk.nix
new file mode 100644
index 000000000..fe8171681
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/gtk.nix
@@ -0,0 +1,30 @@
+{ 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/hosts/traveldroid/hardware-configuration.nix b/Droidnix/generated/hosts/traveldroid/hardware-configuration.nix
new file mode 100644
index 000000000..802b3df31
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/hardware-configuration.nix
@@ -0,0 +1,47 @@
+{
+  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/homebase.nix b/Droidnix/generated/hosts/traveldroid/homebase.nix
new file mode 100644
index 000000000..4c5ac5a86
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/homebase.nix
@@ -0,0 +1,28 @@
+{ 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/hosts/traveldroid/login-tuigreeter.nix b/Droidnix/generated/hosts/traveldroid/login-tuigreeter.nix
new file mode 100644
index 000000000..f2b8d6ff6
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/login-tuigreeter.nix
@@ -0,0 +1,14 @@
+{ 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/hosts/traveldroid/networking.nix b/Droidnix/generated/hosts/traveldroid/networking.nix
new file mode 100644
index 000000000..3ed8c4511
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/networking.nix
@@ -0,0 +1,41 @@
+{ 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/hosts/traveldroid/nix.nix b/Droidnix/generated/hosts/traveldroid/nix.nix
new file mode 100644
index 000000000..e26960407
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/nix.nix
@@ -0,0 +1,27 @@
+{ 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/hosts/traveldroid/services.nix b/Droidnix/generated/hosts/traveldroid/services.nix
new file mode 100644
index 000000000..79688f4fc
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/services.nix
@@ -0,0 +1,23 @@
+{ 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;
+    };
+  };
+}
diff --git a/Droidnix/generated/hosts/traveldroid/terminal.nix b/Droidnix/generated/hosts/traveldroid/terminal.nix
new file mode 100644
index 000000000..3c37aa911
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/terminal.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  # (NVF = Neovim/terminal flavor)
+  stylix.targets.nvf.enable = true;
+  # feh wallpaper integration
+  stylix.targets.feh.enable = true;
+}
diff --git a/Droidnix/generated/hosts/traveldroid/traveldroid.nix b/Droidnix/generated/hosts/traveldroid/traveldroid.nix
new file mode 100644
index 000000000..dfff4a535
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/traveldroid.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+
+{
+  # Host-specific system configuration
+  networking.hostName = "traveldroid";
+  system.stateVersion = "26.05";
+  # User-defined features
+  mySystem.system.core.enable = true;
+  # Hardware overrides
+  hardware.nvidia.enabled = false;
+}
diff --git a/Droidnix/generated/hosts/traveldroid/users/henrov.nix b/Droidnix/generated/hosts/traveldroid/users/henrov.nix
new file mode 100644
index 000000000..b5a9fa1e8
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/users/henrov.nix
@@ -0,0 +1,7 @@
+{
+  username = "henrov";
+  hashedPassword = "$6$ISAmsPLyFi7idYXr$VmZsq.zMsyh1irSkyDNqtorNXG0oEHbbMVqTii1t8bymvrQ5ZQmbdi4OiBNeNYe/huHGrojXM.3TST2fTLz0T.";
+  homeDirectory = "/home/henrov";
+  stateVersion = "26.05";
+  locale = "nl_NL.UTF-8";
+}
diff --git a/Droidnix/generated/hosts/traveldroid/users/user.nix b/Droidnix/generated/hosts/traveldroid/users/user.nix
new file mode 100644
index 000000000..90442a142
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/users/user.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+
+let
+  user = import ./henrov.nix;
+in
+{
+  home-manager.users.${user.username} = {
+    home.stateVersion = "26.05";
+    home.username = user.username;
+    home.homeDirectory = user.homeDirectory;
+  };
+
+  # Ensure the user is in the necessary groups
+  users.users.${config.users.users.${user.username}.username} = {
+    extraGroups = [ "wheel" "networkmanager" ];
+  };
+}
diff --git a/Droidnix/generated/hosts/traveldroid/xdg.nix b/Droidnix/generated/hosts/traveldroid/xdg.nix
new file mode 100644
index 000000000..ed37e204f
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/xdg.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  xdg.portal = {
+    enable = true;
+    config.system.default = [ "hyprland" "gtk" ];
+  };
+}
diff --git a/Droidnix/generated/modules/apps/emacs/early-init.el b/Droidnix/generated/modules/apps/emacs/early-init.el
new file mode 100644
index 000000000..d6f8111be
--- /dev/null
+++ b/Droidnix/generated/modules/apps/emacs/early-init.el
@@ -0,0 +1,92 @@
+;;; 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/modules/apps/emacs/init.el b/Droidnix/generated/modules/apps/emacs/init.el
new file mode 100644
index 000000000..932195993
--- /dev/null
+++ b/Droidnix/generated/modules/apps/emacs/init.el
@@ -0,0 +1,400 @@
+;;; 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/modules/apps/flatpaks.nix b/Droidnix/generated/modules/apps/flatpaks.nix
new file mode 100644
index 000000000..196e9f358
--- /dev/null
+++ b/Droidnix/generated/modules/apps/flatpaks.nix
@@ -0,0 +1,78 @@
+{ lib, pkgs, config, ... }:
+
+let
+  moduleName = "flatpaks";
+
+  # Toggle for this module
+  enableProgram = config.enableFlatpaks or false;
+
+  # Default username
+  username = config.defaultUser or "henrov";
+
+  # Path to the flatpaks.conf (no reading at eval time!)
+  flatpakConfPath = ../../../assets/system/apps/flatpaks.conf;
+
+in {
+  # Top-level toggle option
+  options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
+
+  config = lib.mkIf enableProgram {
+
+    # Place Flatpaks under mySystem (do not declare nested options)
+    mySystem = {
+      flatpaks = {
+        enable    = true;
+        user      = username;
+        assetsDir = flatpakConfPath;
+        files     = []; # handled at runtime
+      };
+    };
+
+    # Deploy the conf file to /etc
+    environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
+
+    # Enable flatpak service
+    services.flatpak.enable = true;
+    xdg.portal.enable = true;
+
+    # Systemd service for installing listed Flatpaks
+    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 = ''
+          set -euo pipefail
+          CONF="${flatpakConfPath}"
+
+          # Add flathub if missing
+          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
+
+          # Read apps safely (ignore empty lines and comments)
+          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 = [ flatpakConfPath ];
+
+      path = [
+        pkgs.flatpak
+        pkgs.coreutils
+        pkgs.gnugrep
+        pkgs.gnused
+      ];
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/apps/thunar.nix b/Droidnix/generated/modules/apps/thunar.nix
new file mode 100644
index 000000000..872208ea5
--- /dev/null
+++ b/Droidnix/generated/modules/apps/thunar.nix
@@ -0,0 +1,56 @@
+{ lib, pkgs, config, ... }:
+
+let
+  programName = "thunar";
+
+  # Default user fallback
+  defaultUser = "henrov";
+
+  # Toggle variable pointing to the option
+  enableProgram = config.mySystem.${programName}.enable or false;
+
+  # Package list for Thunar and plugins
+  thunarPkgs = with pkgs; [
+    thunar
+    thunar-volman
+    thunar-archive-plugin
+    thunar-media-tags-plugin
+    tumbler
+    ffmpegthumbnailer
+    gvfs
+    xdg-utils
+  ];
+
+in {
+  # Top-level toggle option
+  options.mySystem.${programName}.enable =
+    lib.mkEnableOption "Enable Thunar file manager";
+
+  # Wrap everything in mkIf(enable)
+  config = lib.mkIf enableProgram {
+
+    # mySystem container
+    mySystem = {
+      ${programName} = {
+        enable = true;
+        packages = thunarPkgs;
+        user = config.defaultUser or defaultUser;
+      };
+    };
+
+    # Home Manager user configuration
+    home-manager.users.${config.defaultUser or defaultUser} = {
+      home.stateVersion = "26.05";
+      home.username = config.defaultUser or defaultUser;
+      home.homeDirectory = "/home/${config.defaultUser or defaultUser}";
+      home.packages = thunarPkgs;
+
+      # Default file manager
+      xdg.mimeApps = {
+        defaultApplications = {
+          "inode/directory" = "Thunar.desktop";
+        };
+      };
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/apps/wofi.nix b/Droidnix/generated/modules/apps/wofi.nix
new file mode 100644
index 000000000..5c178fb56
--- /dev/null
+++ b/Droidnix/generated/modules/apps/wofi.nix
@@ -0,0 +1,36 @@
+{ lib, config, ... }:
+
+let
+  # Path to your  configuration assets
+  wofiAssets = ../../../assets/system/conf/wofi;
+
+  # Read the files in that directory
+  wofiFiles = builtins.readDir wofiAssets;
+
+  # Build an attribute set mapping filenames to their full paths
+  wofiConfs = lib.genAttrs (builtins.attrNames wofiFiles) (name: {
+    src = "${wofiAssets}/${name}";
+  });
+
+  # Toggle for enabling Wofi
+  enableWofi = true;
+in
+{
+  # Module option to enable/disable Wofi
+  options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
+
+  # Everything in config is wrapped safely with mkIf
+  config = lib.mkIf enableWofi {
+    # Use mySystem as a container for all your programs
+    mySystem = {
+      wofi = {
+        enable = true;
+        assetsDir = wofiAssets;
+        files = wofiConfs;
+
+        # Example: you could reference a top-level user option
+        user = config.defaultUser or "henrov";
+      };
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix
new file mode 100644
index 000000000..f57874ba2
--- /dev/null
+++ b/Droidnix/generated/modules/apps/zenbrowser.nix
@@ -0,0 +1,35 @@
+{ lib, pkgs, config, ... }:
+
+let
+  programName = "zenbrowser";
+
+  # Optional: path to any assets (empty here since you don't need config)
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles = builtins.readDir programAssets;
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Toggle variable referring to the module option
+  enableProgram = config.enableZenBrowser or false;
+
+in {
+  # Top-level toggle option for the module
+  options.enableZenBrowser = lib.mkEnableOption "Install Zen Browser";
+
+  # Wrap all configuration in mkIf(enable)
+  config = lib.mkIf enableProgram {
+    # mySystem container
+    mySystem = {
+      ${programName} = {
+        enable = true;
+        assetsDir = programAssets;
+        files = files;
+        user = config.defaultUser or "henrov";
+      };
+    };
+
+    # Install the package system-wide
+    environment.systemPackages = [ pkgs.zen-browser ];
+  };
+}
diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix
new file mode 100644
index 000000000..e8b70eee9
--- /dev/null
+++ b/Droidnix/generated/modules/desktop/fonts.nix
@@ -0,0 +1,12 @@
+{ 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/modules/desktop/hyprland.nix b/Droidnix/generated/modules/desktop/hyprland.nix
new file mode 100644
index 000000000..d55750f52
--- /dev/null
+++ b/Droidnix/generated/modules/desktop/hyprland.nix
@@ -0,0 +1,85 @@
+{ lib, config, flakeRoot, ... }:
+
+let
+  # --- Program definition ---
+  programName = "hyprland";
+
+  # --- Assets ---
+  programAssets = "${flakeRoot}/assets/hyprland/conf/hypr";
+
+  programFiles =
+    if builtins.pathExists programAssets
+    then builtins.readDir programAssets
+    else {};
+
+  fileNames = builtins.attrNames programFiles;
+
+  # Exclude main config (handled separately)
+  otherFiles = lib.filter (name: name != "hyprland.conf") fileNames;
+
+  # Generate file mappings
+  files = lib.genAttrs otherFiles (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Main config (inline)
+  mainConfigPath = "${programAssets}/hyprland.conf";
+
+  # Enable toggle (must match option)
+  enableProgram = config.enableHyprland or true;
+
+  # Resolve user safely
+  user = config.defaultUser or "henrov";
+in
+{
+  # --- Option ---
+  options.enableHyprland =
+    lib.mkEnableOption "Enable Hyprland desktop";
+
+  # --- Config ---
+  config = lib.mkIf enableProgram {
+
+    # --- Dendritic app definition ---
+    mySystem.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
+
+      compositor = "hyprland";
+    };
+
+    # --- System-level enable ---
+    programs.hyprland.enable = true;
+
+    # --- Home Manager wiring ---
+    home-manager.users.${user} = {
+
+      home.stateVersion = "26.05";
+      home.username = user;
+      home.homeDirectory = "/home/${user}";
+
+      wayland.windowManager.hyprland = {
+        enable = true;
+
+        settings.general."col.active_border" =
+          lib.mkForce "0xff97cbcd 0xff89b4fa";
+      };
+
+      # --- Config files ---
+      xdg.configFile =
+        (lib.mapAttrs' (name: value: {
+          name = "hypr/${name}";
+          value.source = value.src;
+        }) files)
+        // {
+          "hypr/hyprland.conf".text =
+            if builtins.pathExists mainConfigPath
+            then builtins.readFile mainConfigPath
+            else "";
+
+          "hypr/.keep".text = "";
+        };
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/desktop/stylix.nix b/Droidnix/generated/modules/desktop/stylix.nix
new file mode 100644
index 000000000..35a9cedc8
--- /dev/null
+++ b/Droidnix/generated/modules/desktop/stylix.nix
@@ -0,0 +1,96 @@
+{ lib, config, pkgs, flakeRoot, ... }:
+
+let
+  # --- Program definition ---
+  programName = "stylix";
+
+  # Assets (theme + wallpaper)
+  programAssets = "${flakeRoot}/assets/system/theming/${programName}";
+  programFiles =
+    if builtins.pathExists programAssets
+    then builtins.readDir programAssets
+    else {};
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Enable toggle (must match option)
+  enableProgram = config.enableStylix or true;
+
+  # Resolve user safely (outside mkIf)
+  user = config.defaultUser or "henrov";
+
+  # --- Stylix configuration (self-contained) ---
+  stylixCfg = {
+    enable = true;
+
+    base16Scheme =
+      "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
+
+    image =
+      "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
+
+    polarity = "dark";
+
+    cursor = {
+      package = pkgs.phinger-cursors;
+      name = "phinger-cursors-light";
+      size = 24;
+    };
+
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.fira-code;
+        name = "Fira Code Nerd Font";
+      };
+      sansSerif = {
+        package = pkgs.lato;
+        name = "Lato";
+      };
+    };
+
+    icons = {
+      enable = true;
+      package = pkgs.papirus-icon-theme;
+      dark = "Papirus-Dark";
+      light = "Papirus-Light";
+    };
+  };
+in
+{
+  # --- Option ---
+  options.enableStylix =
+    lib.mkEnableOption "Enable Stylix system theming";
+
+  # --- Config ---
+  config = lib.mkIf enableProgram {
+
+    # --- Dendritic app definition ---
+    mySystem.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
+
+      theme = "catppuccin-mocha";
+      polarity = "dark";
+    };
+
+    # --- Stylix theming ---
+    stylix = stylixCfg;
+
+    # --- Optional: wallpaper helper (kept dendritic) ---
+    mySystem.wallpaper = {
+      enable = true;
+      packages = [ "feh" "st" ];
+    };
+
+    # --- Cursor environment variables ---
+    home-manager.users.${user}.home.sessionVariables = {
+      XCURSOR_THEME    = stylixCfg.cursor.name;
+      XCURSOR_SIZE     = toString stylixCfg.cursor.size;
+      HYPRCURSOR_THEME = stylixCfg.cursor.name;
+      HYPRCURSOR_SIZE  = toString stylixCfg.cursor.size;
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/desktop/waybar.nix b/Droidnix/generated/modules/desktop/waybar.nix
new file mode 100644
index 000000000..0ef9c7f87
--- /dev/null
+++ b/Droidnix/generated/modules/desktop/waybar.nix
@@ -0,0 +1,35 @@
+{ lib, pkgs, config, ... }:
+
+let
+  programName = "waybar";
+
+  # Path to configuration assets
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles  = builtins.readDir programAssets;
+  files         = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Toggle variable referring to the top-level option
+  enableProgram = config.enableWaybar or false;
+
+  # Default user fallback
+  defaultUser = "henrov";
+
+in {
+  # Top-level toggle for the module
+  options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
+
+  # Wrap all actual configuration in mkIf(enableProgram)
+  config = lib.mkIf enableProgram {
+    # mySystem container for dendritic structure
+    mySystem = {
+      ${programName} = {
+        enable    = true;
+        user      = config.defaultUser or defaultUser;
+        assetsDir = programAssets;
+        files     = files;
+      };
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/desktop/wayland.nix b/Droidnix/generated/modules/desktop/wayland.nix
new file mode 100644
index 000000000..2d90dd3ff
--- /dev/null
+++ b/Droidnix/generated/modules/desktop/wayland.nix
@@ -0,0 +1,63 @@
+{ lib, config, ... }:
+
+let
+  # --- Program definition ---
+  programName = "wayland";
+
+  # Assets (optional, kept for consistency with template)
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles =
+    if builtins.pathExists programAssets
+    then builtins.readDir programAssets
+    else {};
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Enable toggle (must match option name)
+  enableProgram = config.enableWayland or true;
+
+  # Resolve user safely (outside mkIf)
+  user = config.defaultUser or "henrov";
+in
+{
+  # --- Option ---
+  options.enableWayland =
+    lib.mkEnableOption "Enable Wayland + portals";
+
+  # --- Config ---
+  config = lib.mkIf enableProgram {
+
+    # --- Dendritic app definition ---
+    mySystem.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
+
+      # Wayland-specific metadata
+      portals = [ "hyprland" ];
+    };
+
+    # --- Actual system wiring ---
+    home-manager.users.${user} = {
+
+      xdg.portal = {
+        enable = true;
+
+        # pkgs is unavoidable here (real package dependency)
+        extraPortals = [
+          config.pkgs.xdg-desktop-portal-hyprland
+        ];
+
+        config.hyprland = {
+          "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
+        };
+      };
+
+      home.packages = [
+        config.pkgs.uwsm
+      ];
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/terminals/kitty.nix b/Droidnix/generated/modules/terminals/kitty.nix
new file mode 100644
index 000000000..92a34a44c
--- /dev/null
+++ b/Droidnix/generated/modules/terminals/kitty.nix
@@ -0,0 +1,55 @@
+{ lib, config, ... }:
+
+let
+  # --- Program definition ---
+  programName = "kitty";
+
+  # Assets directory (relative, self-contained)
+  programAssets = ../../../assets/system/conf/${programName};
+
+  # Read all files in assets dir
+  programFiles = builtins.readDir programAssets;
+
+  # Map files → attrset
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Enable toggle (safe: defined before config)
+  enableProgram = config.enableKitty or true;
+
+  # Resolve user safely (top-level, not inside mkIf)
+  user = config.defaultUser or "henrov";
+in
+{
+  # --- Option ---
+  options.enableKitty =
+    lib.mkEnableOption "Enable kitty terminal";
+
+  # --- Config ---
+  config = lib.mkIf enableProgram {
+
+    mySystem.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
+
+      # Program-specific metadata
+      theme = "catppuccin-mocha";
+    };
+
+    # Actual system wiring (kept minimal + scoped)
+    home-manager.users.${user} = {
+
+      programs.kitty.enable = true;
+
+      xdg.configFile =
+        lib.mapAttrs' (name: value: {
+          name = "kitty/${name}";
+          value.source = value.src;
+        }) files;
+
+    };
+  };
+}
diff --git a/Droidnix/generated/modules/terminals/starship.nix b/Droidnix/generated/modules/terminals/starship.nix
new file mode 100644
index 000000000..dd98919f7
--- /dev/null
+++ b/Droidnix/generated/modules/terminals/starship.nix
@@ -0,0 +1,32 @@
+{ 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/system/mysystem.nix b/Droidnix/generated/system/mysystem.nix
new file mode 100644
index 000000000..dce5137f6
--- /dev/null
+++ b/Droidnix/generated/system/mysystem.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options.mySystem = lib.mkOption {
+    type = lib.types.attrsOf lib.types.any;   # works in all versions
+    default = {};
+    description = "Root container for all my custom system options";
+  };
+}