diff --git a/Droidnix/README.html b/Droidnix/README.html index ae285cafb..f45a86fe2 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,112 +204,112 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -325,26 +325,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: @@ -357,9 +357,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -370,16 +370,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. @@ -409,9 +409,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.

@@ -483,9 +483,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, ... }:
 
@@ -541,9 +541,9 @@ in
 
-
-

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. @@ -601,9 +601,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

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

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/2_b_installed.nix

-
+
+

generated/modules/traveldroid/apps/2_b_installed.nix

+

This installs a list of apps

@@ -773,9 +773,9 @@ in {
-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -825,9 +825,9 @@ com.todoist.Todoist
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -835,58 +835,74 @@ This file sets up Kitty terminal
{ lib, pkgs, config, flakeRoot, ... }:
 
 let
-  #################################
-  # Determine default username
-  #################################
   username   = config.defaultUser or "henrov";
-  moduleName = "kitty";
 
   #################################
-  # Paths to assets
+  # Optional extra config snippet
   #################################
-  assetPath  = "${flakeRoot}/generated/.config/${moduleName}";
-  assetFiles = builtins.attrNames (builtins.readDir assetPath);
+  extraConfigFile = "${flakeRoot}/generated/.config/kitty/extra.conf";
+
+  extraConfig =
+    if builtins.pathExists extraConfigFile
+    then builtins.readFile extraConfigFile
+    else "";
 in
 {
   #################################
-  # System-wide packages
+  # System-wide install
   #################################
   environment.systemPackages = [
     pkgs.kitty
   ];
 
   #################################
-  # Home Manager user configuration
+  # Stylix (system-level)
+  #################################
+  stylix.targets.kitty.enable = true;
+
+  #################################
+  # Home Manager
   #################################
   home-manager.users = {
-    ${username} = {
+    "${username}" = {
 
       #################################
-      # Enable Kitty
+      # Kitty config (single source of truth)
       #################################
       programs.kitty = {
         enable = true;
+
         settings = {
-            confirm_os_window_close = 0;
-            dynamic_background_opacity = true;
-            enable_audio_bell = false;
-            mouse_hide_wait = "-1.0";
-            window_padding_width = 10;
-            background_opacity = "0.5";
-            background_blur = 5;
+          confirm_os_window_close    = 0;
+          dynamic_background_opacity = true;
+          enable_audio_bell          = false;
+          mouse_hide_wait            = "-1.0";
+          window_padding_width       = 10;
+          background_opacity         = "0.5";
+          background_blur            = 5;
+        };
+
+        #################################
+        # Add your repo config safely
+        #################################
+        extraConfig = ''
+          # Your additional config
+          ${extraConfig}
+
+          # Theme include (Stylix usually handles this, but safe fallback)
+          include themes/Catppuccin-Mocha.conf
+        '';
       };
     };
   };
-  };
-  stylix.targets.kitty.enable = true;
 }
 
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -925,9 +941,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1216,9 +1232,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

@@ -1258,9 +1274,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1293,9 +1309,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1342,9 +1358,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

@@ -1433,9 +1449,9 @@ These are config files for .config/wofi
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1455,9 +1471,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1520,9 +1536,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1543,9 +1559,9 @@ fi
-
-

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

-
+
+

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

+

This installs emacs

@@ -1641,9 +1657,9 @@ in
-
-

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

-
+
+

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

+

This contaions emacs

@@ -1744,9 +1760,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2157,13 +2173,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

@@ -2181,9 +2197,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2209,9 +2225,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2258,9 +2274,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2281,9 +2297,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2325,9 +2341,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2490,9 +2506,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2508,9 +2524,9 @@ exec-once = sh ~/Wallpapers/scripts/wallpaper.sh &
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2535,9 +2551,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2584,9 +2600,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2627,9 +2643,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2644,9 +2660,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

@@ -2656,9 +2672,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

@@ -2669,9 +2685,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

@@ -2714,9 +2730,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2765,9 +2781,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2796,9 +2812,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

@@ -2824,9 +2840,9 @@ workspace = 10
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -2920,9 +2936,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3019,9 +3035,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3058,9 +3074,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3090,9 +3106,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3170,9 +3186,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

@@ -3223,9 +3239,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3348,9 +3364,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3585,9 +3601,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3624,9 +3640,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3712,13 +3728,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, ... }:
 
@@ -3759,9 +3775,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3788,9 +3804,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

@@ -3844,9 +3860,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -3910,9 +3926,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -3929,13 +3945,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

@@ -3986,9 +4002,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

@@ -4044,9 +4060,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4280,9 +4296,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4319,9 +4335,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4361,7 +4377,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-31 Tue 15:31

+

Created: 2026-03-31 Tue 15:32

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 79f257081..baa533213 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -451,50 +451,66 @@ This file sets up Kitty terminal { lib, pkgs, config, flakeRoot, ... }: let - ################################# - # Determine default username - ################################# username = config.defaultUser or "henrov"; - moduleName = "kitty"; ################################# - # Paths to assets + # Optional extra config snippet ################################# - assetPath = "${flakeRoot}/generated/.config/${moduleName}"; - assetFiles = builtins.attrNames (builtins.readDir assetPath); + extraConfigFile = "${flakeRoot}/generated/.config/kitty/extra.conf"; + + extraConfig = + if builtins.pathExists extraConfigFile + then builtins.readFile extraConfigFile + else ""; in { ################################# - # System-wide packages + # System-wide install ################################# environment.systemPackages = [ pkgs.kitty ]; ################################# - # Home Manager user configuration + # Stylix (system-level) + ################################# + stylix.targets.kitty.enable = true; + + ################################# + # Home Manager ################################# home-manager.users = { - ${username} = { + "${username}" = { ################################# - # Enable Kitty + # Kitty config (single source of truth) ################################# programs.kitty = { enable = true; + settings = { - confirm_os_window_close = 0; - dynamic_background_opacity = true; - enable_audio_bell = false; - mouse_hide_wait = "-1.0"; - window_padding_width = 10; - background_opacity = "0.5"; - background_blur = 5; + confirm_os_window_close = 0; + dynamic_background_opacity = true; + enable_audio_bell = false; + mouse_hide_wait = "-1.0"; + window_padding_width = 10; + background_opacity = "0.5"; + background_blur = 5; + }; + + ################################# + # Add your repo config safely + ################################# + extraConfig = '' + # Your additional config + ${extraConfig} + + # Theme include (Stylix usually handles this, but safe fallback) + include themes/Catppuccin-Mocha.conf + ''; }; }; }; - }; - stylix.targets.kitty.enable = true; } #+END_SRC diff --git a/Droidnix/generated/modules/traveldroid/apps/kitty.nix b/Droidnix/generated/modules/traveldroid/apps/kitty.nix index e405ffdcb..5a83ed04a 100644 --- a/Droidnix/generated/modules/traveldroid/apps/kitty.nix +++ b/Droidnix/generated/modules/traveldroid/apps/kitty.nix @@ -1,48 +1,64 @@ { lib, pkgs, config, flakeRoot, ... }: let - ################################# - # Determine default username - ################################# username = config.defaultUser or "henrov"; - moduleName = "kitty"; ################################# - # Paths to assets + # Optional extra config snippet ################################# - assetPath = "${flakeRoot}/generated/.config/${moduleName}"; - assetFiles = builtins.attrNames (builtins.readDir assetPath); + extraConfigFile = "${flakeRoot}/generated/.config/kitty/extra.conf"; + + extraConfig = + if builtins.pathExists extraConfigFile + then builtins.readFile extraConfigFile + else ""; in { ################################# - # System-wide packages + # System-wide install ################################# environment.systemPackages = [ pkgs.kitty ]; ################################# - # Home Manager user configuration + # Stylix (system-level) + ################################# + stylix.targets.kitty.enable = true; + + ################################# + # Home Manager ################################# home-manager.users = { - ${username} = { + "${username}" = { ################################# - # Enable Kitty + # Kitty config (single source of truth) ################################# programs.kitty = { enable = true; + settings = { - confirm_os_window_close = 0; - dynamic_background_opacity = true; - enable_audio_bell = false; - mouse_hide_wait = "-1.0"; - window_padding_width = 10; - background_opacity = "0.5"; - background_blur = 5; + confirm_os_window_close = 0; + dynamic_background_opacity = true; + enable_audio_bell = false; + mouse_hide_wait = "-1.0"; + window_padding_width = 10; + background_opacity = "0.5"; + background_blur = 5; + }; + + ################################# + # Add your repo config safely + ################################# + extraConfig = '' + # Your additional config + ${extraConfig} + + # Theme include (Stylix usually handles this, but safe fallback) + include themes/Catppuccin-Mocha.conf + ''; }; }; }; - }; - stylix.targets.kitty.enable = true; }