diff --git a/Droidnix/README.html b/Droidnix/README.html index 99d579b10..5524f0e99 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- +generated/modules/traveldroid/apps/packages.nixgenerated/assets/packages.confgenerated/modules/traveldroid/apps/kitty.nix.config/kitty/Catppuccin-Mocha.conf.config/kitty/kitty.confgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/packages.nixgenerated/assets/packages.confgenerated/modules/traveldroid/apps/kitty.nix.config/kitty/Catppuccin-Mocha.conf.config/kitty/kitty.confgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.conf.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.cssgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.conf.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.cssgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixIntroduction The Assets Folder @@ -339,26 +339,26 @@
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.
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:
flake.nix is the entry point and imports:
The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.
./setup_droid..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.nixflake.nixThe Nix flake definition for Droidnix.
@@ -490,9 +490,9 @@ The Nix flake definition for Droidnix.generated/hosts/traveldroid/host.nixgenerated/hosts/traveldroid/host.nix{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
@@ -507,38 +507,12 @@ let
allModules = hostModules.imports ++ globalUsers.imports;
- #########################################################
- # Merge all _module.args.hmUsers safely
- #########################################################
- mergedHmUsers = lib.mkMerge (
- builtins.concatLists (
- map (m:
- if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
- then [ m.args.hmUsers ] # wrap in singleton list
- else []
- ) allModules
- )
- );
-
- #########################################################
- # Add activation to ensure all parent directories 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;
+ networking.hostName = hostname; # <-- set hostname here
system.stateVersion = "26.05";
#################################
@@ -558,8 +532,8 @@ in
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
- # Apply merged users with automatic directory creation
- home-manager.users = mergedHmUsersWithDirs;
+ # Each module sets its own home-manager.users; no manual merging needed
+ # NixOS module system will merge them automatically
#################################
# System packages & programs
@@ -574,9 +548,9 @@ in
generated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/boot.nix{ config, pkgs, lib, flakeRoot, ... }:
@@ -688,17 +662,17 @@ in
generated/modules/traveldroid/apps/packages.nixgenerated/modules/traveldroid/apps/packages.nixThis installs a list of apps
@@ -762,9 +736,9 @@ in {generated/assets/packages.confgenerated/assets/packages.confThis is a list of additional apps to install
@@ -825,9 +799,9 @@ vlcgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/kitty.nixThis file sets up Kitty terminal
@@ -889,9 +863,9 @@ in.config/kitty/Catppuccin-Mocha.conf.config/kitty/Catppuccin-Mocha.confThese are config files for .config/kitty
@@ -982,9 +956,9 @@ color15 #a6adc8.config/kitty/kitty.conf.config/kitty/kitty.confThese are config files for .config/kitty
@@ -1006,9 +980,9 @@ font_size 10.0generated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/starship.nixThis file sets up starship prompt
@@ -1048,9 +1022,9 @@ in.config/starship.toml.config/starship.tomlThese are config files for .config
@@ -1339,9 +1313,9 @@ crust = "#181926"generated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/thunar.nixThis is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
@@ -1381,55 +1355,42 @@ ingenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/wofi.nixThis is the install for Wofi, the launcher
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
let
- programName = "wofi";
username = config.defaultUser or "henrov";
assetPath = "${flakeRoot}/generated/.config/wofi";
in
{
- # Install Wofi via system packages
- environment.systemPackages = [
- pkgs.wofi
- ];
-
- _module.args.hmUsers = {
- ${username} = {
-
- home.file = {
- ".config/wofi/config" = {
- source = "${assetPath}/config";
- force = true; # overwrite existing
- };
- ".config/wofi/style.css" = {
- source = "${assetPath}/style.css";
- force = true; # overwrite existing
- };
+ home-manager.users = {
+ ${username} = {
+ home.file = {
+ ".config/wofi/config" = {
+ source = "${assetPath}/config";
+ force = true;
+ };
+ ".config/wofi/style.css" = {
+ source = "${assetPath}/style.css";
+ force = true;
};
-
- # Ensure ~/.config/wofi exists before writing files
- home.activation.fixWofiDir = lib.hm.dag.entryAfter ["writeBoundary"] ''
- mkdir -p $HOME/.config/wofi
- chmod -R u+rwx $HOME/.config/wofi
- '';
};
};
+ };
}
.config/wofi/config.config/wofi/configThese are config files for .config/wofi
@@ -1476,9 +1437,9 @@ prompt = >.config/wofi/style.css.config/wofi/style.cssThese are config files for .config/wofi #+BEGINSRC css :tangle generated/.config/wofi/style.css :noweb yes :mkdirp yes :eval never @@ -1508,9 +1469,9 @@ These are config files for .config/wofi
background-color: transparent; color: @text; @@ -1587,9 +1548,9 @@ These are config files for .config/wofi #+ENDSRC
generated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zenbrowser.nixThis installs zen browser
@@ -1609,9 +1570,9 @@ ingenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/zsh.nixThis sets up the zsh in the terminal
@@ -1667,9 +1628,9 @@ inThis sets up the zsh in the terminal
@@ -1704,9 +1665,9 @@ figenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixThis installs emacs
@@ -1802,9 +1763,9 @@ ingenerated/.config/emacs/early-init.elgenerated/.config/emacs/early-init.elThis contaions emacs
@@ -1905,9 +1866,9 @@ package-archive-priorities '(("gnu" . 99)generated/.config/emacs/init.elgenerated/.config/emacs/init.elThis contaions emacs
@@ -2318,13 +2279,13 @@ the top of the file."generated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/fonts.nixThis file installs and configures fonts
@@ -2342,9 +2303,9 @@ This file installs and configures fontsgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/gtk.nixSetting up GTK
@@ -2370,9 +2331,9 @@ ingenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/hyprland.nixSetting up Hyprland
@@ -2419,9 +2380,9 @@ in.config/hypr/animations.conf.config/hypr/animations.confThese are config files for .config/hypr
@@ -2442,9 +2403,9 @@ animations {.config/hypr/behaviour.conf.config/hypr/behaviour.confThese are config files for .config/hypr
@@ -2486,9 +2447,9 @@ misc {.config/hypr/bindings.conf.config/hypr/bindings.confThese are config files for .config/hypr
@@ -2651,9 +2612,9 @@ bind = $mainMod, W, exec, zen.config/hypr/exec-once.conf.config/hypr/exec-once.confThese are config files for .config/hypr
@@ -2667,9 +2628,9 @@ exec-once = bash -c "sleep 5 && waybar".config/hypr/hypridle.conf.config/hypr/hypridle.confThese are config files for .config/hypr
@@ -2694,9 +2655,9 @@ listener {.config/hypr/hyprland.conf.config/hypr/hyprland.confThese are config files for .config/hypr
@@ -2743,9 +2704,9 @@ misc {.config/hypr/hyprlock.conf.config/hypr/hyprlock.confThese are config files for .config/hypr
@@ -2786,9 +2747,9 @@ label {.config/hypr/layer-rules.conf.config/hypr/layer-rules.confThese are config files for .config/hypr
@@ -2803,9 +2764,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window.config/hypr/layout.conf.config/hypr/layout.confThese are config files for .config/hypr
@@ -2815,9 +2776,9 @@ These are config files for .config/hypr.config/hypr/monitor-rules.conf.config/hypr/monitor-rules.confThese are config files for .config/hypr
@@ -2828,9 +2789,9 @@ monitor=DP-1,3840x1080@144,1920x0,1.config/hypr/scripts/layout-selector.sh.config/hypr/scripts/layout-selector.shThese are config files for .config/hypr/scripts
@@ -2873,9 +2834,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000.config/hypr/theming.conf.config/hypr/theming.confThese are config files for .config/hypr
@@ -2924,9 +2885,9 @@ decoration {.config/hypr/window-rules.conf.config/hypr/window-rules.confThese are config files for .config/hypr
@@ -2950,9 +2911,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15.config/hypr/workspace-rules.conf.config/hypr/workspace-rules.confThese are config files for .config/hypr
@@ -2991,9 +2952,9 @@ workspace {generated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/wallpaper.nixSetting up wallpaper engine + wallpaper gui
@@ -3048,9 +3009,9 @@ ingenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/stylix.nix{ lib, config, pkgs, flakeRoot, stylix, ... }:
@@ -3142,9 +3103,9 @@ in
.config/stylix/stylix.conf.config/stylix/stylix.confThese are config files for .config/stylix
@@ -3181,9 +3142,9 @@ icons = {.config/stylix/palette.json.config/stylix/palette.jsonThese are config files for .config/stylix
@@ -3213,9 +3174,9 @@ These are config files for .config/stylix.config/stylix/palette.html.config/stylix/palette.htmlThese are config files for .config/stylix
@@ -3293,9 +3254,9 @@ These are config files for .config/stylixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/waybar.nixThis file installs and configures waybar
@@ -3348,9 +3309,9 @@ in.config/waybar/config.config/waybar/configThese are config files for waybar
@@ -3473,9 +3434,9 @@ These are config files for waybar.config/waybar/style.css.config/waybar/style.cssThese are config files for waybar #+BEGINSRC css :tangle generated/.config/waybar/config :noweb yes :mkdirp yes :eval never @@ -3498,9 +3459,9 @@ These are config files for waybar
font-family: Aporetic Sans Mono, @@ -3782,9 +3743,9 @@ window#waybar { #+ENDSRC
.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for waypaper
@@ -3821,9 +3782,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/wayland.nix{ lib, config, pkgs, ... }:
@@ -3853,9 +3814,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
generated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/xdg.nixThis sets the XDG implementation
@@ -3908,13 +3869,13 @@ ingenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/bluetooth.nix{ lib, config, pkgs, flakeRoot, home-manager, ... }:
@@ -3955,9 +3916,9 @@ in
generated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/dbus.nixThis sets the dbus implementation
@@ -3984,9 +3945,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/login-tuigreet.nixThis sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
@@ -4040,9 +4001,9 @@ ingenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/networking.nixThis sets the networking.
@@ -4106,9 +4067,9 @@ This sets the networking.generated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/nix.nix{ lib, config, ... }:
@@ -4125,13 +4086,13 @@ This sets the networking.
generated/parked/users/copy_config_2_config.nixgenerated/parked/users/copy_config_2_config.nixThis copies stuff to the user home-folder
@@ -4182,9 +4143,9 @@ ingenerated/users/henrov.nixgenerated/users/henrov.nixThis is the default user, just search and replace henrov another name if you want to change
@@ -4239,9 +4200,9 @@ in.config/waybar/style.css.config/waybar/style.cssThese are config files for .config/waybar #+BEGINSRC css :tangle generated/.config/waybar/style.css :noweb yes :mkdirp yes :eval never @@ -4264,9 +4225,9 @@ These are config files for .config/waybar
font-family: Aporetic Sans Mono, @@ -4545,9 +4506,9 @@ window#waybar { #+ENDSRC
.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for .config/waypaper
@@ -4584,9 +4545,9 @@ keybindings = ~/.config/waypaper/keybindings.ini.config/zed/settings.json.config/zed/settings.jsonThese are config files for .config/zed
@@ -4626,7 +4587,7 @@ These are config files for .config/zed