Regenerated

Droidnix/README.org

@@ -232,8 +232,8 @@ in
       efiSupport = true;
       devices = [ "nodev" ]; # pas aan naar je echte EFI-device indien nodig
       useOSProber = true;
-      timeout = 5;
     };
+    timeout = 5;
   };
 
   ############################
@@ -290,7 +290,7 @@ let
   #################################
   # Read package list from config file
   #################################
-  packagesConfPath = "${flakeRoot}/assets/system/apps/packages.conf";
+  packagesConfPath = "${flakeRoot}assets/traveldroid/conf/packages.conf";
   raw = builtins.readFile packagesConfPath;
 
   rawLines = lib.splitString "\n" raw;
@@ -356,7 +356,7 @@ let
   #################################
   # Paths to assets
   #################################
-  assetPath    = ../../../assets/system/conf/${moduleName};
+  assetPath    = ../../../assets/traveldroid/conf/${moduleName};
   programFiles = builtins.readDir assetPath;
 
   # Convert asset files into a nix attribute set
@@ -401,41 +401,35 @@ in
 ** =generated/modules/traveldroid/apps/starship.nix=
 This file sets up starship prompt
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/starship.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, lib, flakeRoot, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
-{
-  programs.starship = {
-    enable = true;      # enable Starship integration
-  };
-}
-#+END_SRC
+let
+  # Default username fallback
+  username = config.defaultUser or "henrov";
 
-** =generated/modules/traveldroid/apps/zsh.nix=
-This sets up the zsh in the terminal
-#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, lib, ... }:
+  # Path to the starship config in assets
+  starshipConfSrc = "${flakeRoot}/assets/traveldroid/conf/starship.toml";
+in
 {
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    #autocd = true;
-    #dotDir = "${config.xdg.configHome}/zsh";
-    ohMyZsh = {
-      enable = true;
-      theme = "";
-      plugins = [
-        "git"
-        "sudo"
-        "extract"
-        "colored-man-pages"
-        "command-not-found"
-        "history"
-        "docker"
-        "kubectl"
-      ];
+  #################################
+  # Enable Starship system-wide
+  #################################
+  environment.systemPackages = [ pkgs.starship ];
+
+  #################################
+  # Home Manager user configuration
+  #################################
+  _module.args.hmUsers = {
+    ${username} = {
+      programs.starship = {
+        enable = true;
+      };
+
+      # Copy the starship.toml from assets to ~/.config/starship.toml
+      home.file = {
+        ".config/starship.toml" = { source = starshipConfSrc; };
+      };
     };
-    #autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
   };
 }
 #+END_SRC
@@ -449,7 +443,7 @@ Setting up Hyprland
 
 let
   username = config.defaultUser or "henrov";
-  assetPath = "${flakeRoot}/assets/hyprland/conf";
+  assetPath = "${flakeRoot}/assets/traveldroid/conf/hypr/";
 
   # Read all files in the asset directory
   assetFiles = builtins.attrNames (builtins.readDir assetPath);
@@ -494,7 +488,7 @@ let
   username = config.defaultUser or "henrov";
 
   moduleName = "stylix";
-  assetPath  = "${flakeRoot}/assets/system/conf/${moduleName}";
+  assetPath  = "${flakeRoot}/assets/traveldroid/conf/";
 
   # Read all files in the asset directory
   programFiles = builtins.readDir assetPath;
@@ -566,7 +560,7 @@ in
   #################################
   # Optional: enable graphics stack
   #################################
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   #################################
   # Optional session variables for Wayland

Droidnix/assets/system/conf/base.conf

@@ -1,3 +0,0 @@
-# Droidnix Base Configuration
-# Choose your window manager: hyprland or mangowc
-wm = "hyprland"

Droidnix/assets/system/conf/modules.conf

@@ -1,5 +0,0 @@
-{
-  hyprland = true;
-  gtk = false;
-  henrov = true;
-}