diff --git a/Droidnix/README.html b/Droidnix/README.html index 55b31016e..17ac00911 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/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/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/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.css.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.css.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/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.css.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.css.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.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.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 @@ -327,26 +327,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: @@ -359,9 +359,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.
@@ -478,9 +478,9 @@ The Nix flake definition for Droidnix.generated/hosts/traveldroid/host.nixgenerated/hosts/traveldroid/host.nix{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
@@ -536,9 +536,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, ... }:
@@ -650,17 +650,17 @@ in
generated/modules/traveldroid/apps/packages.nixgenerated/modules/traveldroid/apps/packages.nixThis installs a list of apps
@@ -724,9 +724,9 @@ in {generated/assets/packages.confgenerated/assets/packages.confThis is a list of additional apps to install
@@ -787,9 +787,9 @@ vlcgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/kitty.nixThis file sets up Kitty terminal
@@ -851,9 +851,9 @@ in.config/kitty/Catppuccin-Mocha.conf.config/kitty/Catppuccin-Mocha.confThese are config files for .config/kitty
@@ -944,9 +944,9 @@ color15 #a6adc8.config/kitty/kitty.conf.config/kitty/kitty.confThese are config files for .config/kitty
@@ -968,9 +968,9 @@ font_size 10.0generated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/starship.nixThis file sets up starship prompt
@@ -1010,9 +1010,9 @@ in.config/starship.toml.config/starship.tomlThese are config files for .config
@@ -1301,9 +1301,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
@@ -1343,9 +1343,9 @@ ingenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/wofi.nixThis is the install for Wofi, the launcher
@@ -1378,9 +1378,9 @@ in.config/wofi/config.config/wofi/configThese are config files for .config/wofi
@@ -1427,9 +1427,9 @@ prompt = >.config/wofi/style.css.config/wofi/style.cssThese are config files for .config/wofi
@@ -1518,9 +1518,9 @@ These are config files for .config/wofigenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zenbrowser.nixThis installs zen browser
@@ -1540,9 +1540,9 @@ ingenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/zsh.nixThis sets up the zsh in the terminal
@@ -1598,9 +1598,9 @@ inThis sets up the zsh in the terminal
@@ -1635,9 +1635,9 @@ figenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixThis installs emacs
@@ -1733,9 +1733,9 @@ ingenerated/.config/emacs/early-init.elgenerated/.config/emacs/early-init.elThis contaions emacs
@@ -1836,9 +1836,9 @@ package-archive-priorities '(("gnu" . 99)generated/.config/emacs/init.elgenerated/.config/emacs/init.elThis contaions emacs
@@ -2249,13 +2249,13 @@ the top of the file."generated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/fonts.nixThis file installs and configures fonts
@@ -2273,9 +2273,9 @@ This file installs and configures fontsgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/gtk.nixSetting up GTK
@@ -2301,9 +2301,9 @@ ingenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/hyprland.nixSetting up Hyprland
@@ -2314,6 +2314,12 @@ let username = config.defaultUser or "henrov"; assetPath = "${flakeRoot}/generated/.config/hypr"; + # Determine Hyprland package (systemwide installation is enough) + hyprlandPkg = + pkgs.hyprland or + pkgs.hyprland-git or + inputs.hyprland.packages.${pkgs.system}.default; + # Recursively read directory and generate Home Manager file entries rec readDirRecursive = dir: let @@ -2326,26 +2332,28 @@ let then readDirRecursive path else [{ # Destination path relative to home directory - name = builtins.replaceStrings [ "${flakeRoot}/generated/" ] [ "" ] path; + name = ".config/hypr/${builtins.substring (builtins.stringLength assetPath + 1) (builtins.stringLength path - (builtins.stringLength assetPath + 1)) path}"; value = { source = path; }; }] ) entries; in files; - hyprFiles = readDirRecursive assetPath; + # Convert list to attribute set (no mkMerge needed) + hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath); in { + # Systemwide installation environment.systemPackages = [ hyprlandPkg ]; # Home Manager users declaration home-manager.users = { ${username} = { - # Merge all files (including subdirectories) into ~/.config/hypr/ - home.file = lib.mkMerge hyprFiles; + # Directly define all config files in ~/.config/hypr/ + home.file = hyprFilesAttrs; - # Optional: Hyprland settings + # Optional Hyprland settings settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa"; }; }; @@ -2354,9 +2362,9 @@ in.config/hypr/animations.conf.config/hypr/animations.confThese are config files for .config/hypr
@@ -2377,9 +2385,9 @@ animations {.config/hypr/behaviour.conf.config/hypr/behaviour.confThese are config files for .config/hypr
@@ -2421,9 +2429,9 @@ misc {.config/hypr/bindings.conf.config/hypr/bindings.confThese are config files for .config/hypr
@@ -2586,9 +2594,9 @@ bind = $mainMod, W, exec, zen.config/hypr/exec-once.conf.config/hypr/exec-once.confThese are config files for .config/hypr
@@ -2604,9 +2612,9 @@ exec-once = sh ~/Wallpapers/scripts/wallpaper.sh &.config/hypr/hypridle.conf.config/hypr/hypridle.confThese are config files for .config/hypr
@@ -2631,9 +2639,9 @@ listener {.config/hypr/hyprland.conf.config/hypr/hyprland.confThese are config files for .config/hypr
@@ -2680,9 +2688,9 @@ misc {.config/hypr/hyprlock.conf.config/hypr/hyprlock.confThese are config files for .config/hypr
@@ -2723,9 +2731,9 @@ label {.config/hypr/layer-rules.conf.config/hypr/layer-rules.confThese are config files for .config/hypr
@@ -2740,9 +2748,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
@@ -2752,9 +2760,9 @@ These are config files for .config/hypr.config/hypr/monitor-rules.conf.config/hypr/monitor-rules.confThese are config files for .config/hypr
@@ -2765,9 +2773,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
@@ -2810,9 +2818,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000.config/hypr/theming.css.config/hypr/theming.cssThese are config files for .config/hypr
@@ -2861,9 +2869,9 @@ decoration {.config/hypr/window-rules.conf.config/hypr/window-rules.confThese are config files for .config/hypr
@@ -2887,9 +2895,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
@@ -2937,9 +2945,9 @@ workspace {generated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/wallpaper.nixSetting up wallpaper engine + wallpaper gui
@@ -3033,9 +3041,9 @@ ingenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/stylix.nix{ lib, config, pkgs, flakeRoot, stylix, ... }:
@@ -3126,9 +3134,9 @@ in
.config/stylix/stylix.conf.config/stylix/stylix.confThese are config files for .config/stylix
@@ -3165,9 +3173,9 @@ icons = {.config/stylix/palette.json.config/stylix/palette.jsonThese are config files for .config/stylix
@@ -3197,9 +3205,9 @@ These are config files for .config/stylix.config/stylix/palette.html.config/stylix/palette.htmlThese are config files for .config/stylix
@@ -3277,9 +3285,9 @@ These are config files for .config/stylixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/waybar.nixThis file installs and configures waybar
@@ -3330,9 +3338,9 @@ in.config/waybar/config.config/waybar/configThese are config files for waybar
@@ -3455,9 +3463,9 @@ These are config files for waybar.config/waybar/style.css.config/waybar/style.cssThese are config files for waybar
@@ -3692,9 +3700,9 @@ window#waybar {.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for waypaper
@@ -3731,9 +3739,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/wayland.nix{ lib, config, pkgs, ... }:
@@ -3763,9 +3771,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
generated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/xdg.nixThis sets the XDG implementation
@@ -3818,13 +3826,13 @@ ingenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/bluetooth.nix{ lib, config, pkgs, flakeRoot, home-manager, ... }:
@@ -3865,9 +3873,9 @@ in
generated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/dbus.nixThis sets the dbus implementation
@@ -3894,9 +3902,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
@@ -3950,9 +3958,9 @@ ingenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/networking.nixThis sets the networking.
@@ -4016,9 +4024,9 @@ This sets the networking.generated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/nix.nix{ lib, config, ... }:
@@ -4035,13 +4043,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
@@ -4092,9 +4100,9 @@ ingenerated/users/henrov.nixgenerated/users/henrov.nixThis is the default user, just search and replace henrov another name if you want to change
@@ -4149,9 +4157,9 @@ in.config/waybar/style.css.config/waybar/style.cssThese are config files for .config/waybar
@@ -4385,9 +4393,9 @@ window#waybar {.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for .config/waypaper
@@ -4424,9 +4432,9 @@ keybindings = ~/.config/waypaper/keybindings.ini.config/zed/settings.json.config/zed/settings.jsonThese are config files for .config/zed
@@ -4466,7 +4474,7 @@ These are config files for .config/zed