diff --git a/Droidnix/README.html b/Droidnix/README.html index 443c350d1..a8b9d2b77 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,126 +204,126 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -339,26 +339,26 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between Hyprland and Mangowc as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
  • -
  • Hyprland
  • -
  • Mangowc
  • +
  • Core
  • +
  • Hyprland
  • +
  • Mangowc
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland and MangoWC support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -371,9 +371,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -384,16 +384,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
  3. @@ -423,9 +423,9 @@ The .assets/ folder contains all static files, such as configs, scr This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

flake.nix

-
+
+

flake.nix

+

The Nix flake definition for Droidnix.

@@ -490,9 +490,9 @@ The Nix flake definition for Droidnix.
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -507,19 +507,35 @@ let
 
   allModules = hostModules.imports ++ globalUsers.imports;
 
+  #########################################################
+  # Merge all _module.args.hmUsers from your modules
+  #########################################################
+  mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules);
+
+  #########################################################
+  # Add single activation to ensure all parent dirs exist
+  #########################################################
+  mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
+    home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
+      ensureDirs = files: lib.mapAttrs (_: path: ''
+        mkdir -p $(dirname $HOME/${path})
+      '') files;
+    in
+      ensureDirs (builtins.attrNames (userCfg.home.file or {}))
+    );
+  }) mergedHmUsers;
+
 in
 {
   #################################
   # Core system config
   #################################
-
   networking.hostName = hostname;
   system.stateVersion = "26.05";
 
   #################################
   # Imports
   #################################
-
   imports =
     [ ../../../generated/users/henrov.nix
       ./boot.nix
@@ -531,26 +547,28 @@ in
   #################################
   # Home Manager integration
   #################################
-
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
 
-# Install dconf for the system/user
- environment.systemPackages = [
-   pkgs.dconf
- ];
+  # Pass the merged user definitions with automatic dir creation
+  home-manager.users = mergedHmUsersWithDirs;
 
-# Ensure Home Manager writes dconf safely
-    programs.dconf.enable = true;
+  #################################
+  # System packages & programs
+  #################################
+  environment.systemPackages = [
+    pkgs.dconf
+  ];
+
+  programs.dconf.enable = true;
 }
-
 
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
  3. @@ -608,9 +626,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -662,17 +680,17 @@ in
 
-
-

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/packages.nix

-
+
+

generated/modules/traveldroid/apps/packages.nix

+

This installs a list of apps

@@ -736,9 +754,9 @@ in {
-
-

generated/assets/packages.conf

-
+
+

generated/assets/packages.conf

+

This is a list of additional apps to install

@@ -799,9 +817,9 @@ vlc
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -863,9 +881,9 @@ in
-
-

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

@@ -956,9 +974,9 @@ color15 #a6adc8
-
-

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -980,9 +998,9 @@ font_size 10.0
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1022,9 +1040,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1313,9 +1331,9 @@ crust = "#181926"
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1355,9 +1373,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1401,9 +1419,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1450,9 +1468,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi #+BEGINSRC css :tangle generated/.config/wofi/style.css :noweb yes :mkdirp yes :eval never @@ -1482,9 +1500,9 @@ These are config files for .config/wofi

-
-

{

-
+
+

{

+

background-color: transparent; color: @text; @@ -1561,9 +1579,9 @@ These are config files for .config/wofi #+ENDSRC

-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1583,9 +1601,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1641,9 +1659,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1678,9 +1696,9 @@ fi
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1776,9 +1794,9 @@ in
-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -1879,9 +1897,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2292,13 +2310,13 @@ the top of the file."
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -2316,9 +2334,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2344,9 +2362,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2393,9 +2411,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2416,9 +2434,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2460,9 +2478,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2625,9 +2643,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2641,9 +2659,9 @@ exec-once = bash -c "sleep 5 && waybar"
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2668,9 +2686,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2717,9 +2735,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2760,9 +2778,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2777,9 +2795,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

.config/hypr/layout.conf

-
+
+

.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -2789,9 +2807,9 @@ These are config files for .config/hypr
-
-

.config/hypr/monitor-rules.conf

-
+
+

.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -2802,9 +2820,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

.config/hypr/scripts/layout-selector.sh

-
+
+

.config/hypr/scripts/layout-selector.sh

+

These are config files for .config/hypr/scripts

@@ -2847,9 +2865,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.conf

-
+
+

.config/hypr/theming.conf

+

These are config files for .config/hypr

@@ -2898,9 +2916,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2924,9 +2942,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15
-
-

.config/hypr/workspace-rules.conf

-
+
+

.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -2965,9 +2983,9 @@ workspace {
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -3022,9 +3040,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3116,9 +3134,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3155,9 +3173,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3187,9 +3205,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3267,9 +3285,9 @@ These are config files for .config/stylix
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -3322,9 +3340,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3447,9 +3465,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar #+BEGINSRC css :tangle generated/.config/waybar/config :noweb yes :mkdirp yes :eval never @@ -3472,9 +3490,9 @@ These are config files for waybar

-
-

{

-
+
+

{

+

font-family: Aporetic Sans Mono, @@ -3756,9 +3774,9 @@ window#waybar { #+ENDSRC

-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3795,9 +3813,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -3827,9 +3845,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3882,13 +3900,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
@@ -3929,9 +3947,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3958,9 +3976,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -4014,9 +4032,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4080,9 +4098,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -4099,13 +4117,13 @@ This sets the networking.
 
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/parked/users/copy_config_2_config.nix

-
+
+

generated/parked/users/copy_config_2_config.nix

+

This copies stuff to the user home-folder

@@ -4156,9 +4174,9 @@ in
-
-

generated/users/henrov.nix

-
+
+

generated/users/henrov.nix

+

This is the default user, just search and replace henrov another name if you want to change

@@ -4213,9 +4231,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar #+BEGINSRC css :tangle generated/.config/waybar/style.css :noweb yes :mkdirp yes :eval never @@ -4238,9 +4256,9 @@ These are config files for .config/waybar

-
-

{

-
+
+

{

+

font-family: Aporetic Sans Mono, @@ -4519,9 +4537,9 @@ window#waybar { #+ENDSRC

-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4558,9 +4576,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4600,7 +4618,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-27 Fri 14:41

+

Created: 2026-03-27 Fri 14:45

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 27bd52542..c647a5f85 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -141,19 +141,35 @@ let allModules = hostModules.imports ++ globalUsers.imports; + ######################################################### + # Merge all _module.args.hmUsers from your modules + ######################################################### + mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules); + + ######################################################### + # Add single activation to ensure all parent dirs exist + ######################################################### + mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // { + home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let + ensureDirs = files: lib.mapAttrs (_: path: '' + mkdir -p $(dirname $HOME/${path}) + '') files; + in + ensureDirs (builtins.attrNames (userCfg.home.file or {})) + ); + }) mergedHmUsers; + in { ################################# # Core system config ################################# - networking.hostName = hostname; system.stateVersion = "26.05"; ################################# # Imports ################################# - imports = [ ../../../generated/users/henrov.nix ./boot.nix @@ -165,19 +181,21 @@ in ################################# # Home Manager integration ################################# - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; -# Install dconf for the system/user - environment.systemPackages = [ - pkgs.dconf - ]; + # Pass the merged user definitions with automatic dir creation + home-manager.users = mergedHmUsersWithDirs; -# Ensure Home Manager writes dconf safely - programs.dconf.enable = true; + ################################# + # System packages & programs + ################################# + environment.systemPackages = [ + pkgs.dconf + ]; + + programs.dconf.enable = true; } - #+END_SRC ** =generated/hosts/traveldroid/hardware-configuration.nix= diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index b83bbabc6..809bc5237 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -11,19 +11,35 @@ let allModules = hostModules.imports ++ globalUsers.imports; + ######################################################### + # Merge all _module.args.hmUsers from your modules + ######################################################### + mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules); + + ######################################################### + # Add single activation to ensure all parent dirs exist + ######################################################### + mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // { + home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let + ensureDirs = files: lib.mapAttrs (_: path: '' + mkdir -p $(dirname $HOME/${path}) + '') files; + in + ensureDirs (builtins.attrNames (userCfg.home.file or {})) + ); + }) mergedHmUsers; + in { ################################# # Core system config ################################# - networking.hostName = hostname; system.stateVersion = "26.05"; ################################# # Imports ################################# - imports = [ ../../../generated/users/henrov.nix ./boot.nix @@ -35,15 +51,18 @@ in ################################# # Home Manager integration ################################# - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; -# Install dconf for the system/user - environment.systemPackages = [ - pkgs.dconf - ]; + # Pass the merged user definitions with automatic dir creation + home-manager.users = mergedHmUsersWithDirs; -# Ensure Home Manager writes dconf safely - programs.dconf.enable = true; + ################################# + # System packages & programs + ################################# + environment.systemPackages = [ + pkgs.dconf + ]; + + programs.dconf.enable = true; }