diff --git a/Droidnix/README.html b/Droidnix/README.html index 030c35fcb..34a01d533 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,114 +204,114 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

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

-
-

Root Level

-
+
+

Root Level

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

@@ -478,9 +478,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, ... }:
 
@@ -536,9 +536,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. @@ -596,9 +596,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -650,17 +650,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

@@ -724,9 +724,9 @@ in {
-
-

generated/assets/packages.conf

-
+
+

generated/assets/packages.conf

+

This is a list of additional apps to install

@@ -787,9 +787,9 @@ vlc
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -851,9 +851,9 @@ in
-
-

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

@@ -944,9 +944,9 @@ color15 #a6adc8
-
-

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -968,9 +968,9 @@ font_size 10.0
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1010,9 +1010,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

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

@@ -1343,9 +1343,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1378,9 +1378,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1427,9 +1427,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

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

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1540,9 +1540,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1598,9 +1598,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1635,9 +1635,9 @@ fi
-
-

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

-
+
+

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

+

This installs emacs

@@ -1733,9 +1733,9 @@ in
-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

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

@@ -2273,9 +2273,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2301,9 +2301,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2350,9 +2350,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2373,9 +2373,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2417,9 +2417,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

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

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

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

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2625,9 +2625,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2674,9 +2674,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2717,9 +2717,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

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

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

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

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

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2855,9 +2855,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

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

@@ -2931,9 +2931,9 @@ workspace {
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -2941,47 +2941,57 @@ Setting up wallpaper engine + wallpaper gui
{ config, pkgs, lib, flakeRoot, ... }:
 
 let
-  username     = config.defaultUser or "henrov";
+  username     = config.users.users.defaultUser or "henrov";
   homeDir      = "/home/${username}";
   wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
   wallpaperDst = "${homeDir}/Wallpapers";
   scriptFile   = "${homeDir}/copy-wallpapers.sh";
 in
 {
+  ############################
   # Ensure bash exists
+  ############################
   environment.systemPackages = [ pkgs.bash ];
 
-  # Drop the script into home
+  ############################
+  # Create the script in the user's home
+  ############################
   home-manager.users = {
-      ${username} = {
-          home.file."copy-wallpapers.sh".text = ''
-            #!/usr/bin/env bash
-            set -e
-            echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
-            if [ ! -d "${wallpaperSrc}" ]; then
-              echo "ERROR: ${wallpaperSrc} does not exist"
-              exit 1
-            fi
-            mkdir -p "${wallpaperDst}"
-            chown -R ${username}:${username} "${wallpaperDst}"
-            # Copy everything
-            cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
-            # Fix permissions
-            chown -R ${username}:${username} "${wallpaperDst}"
-            chmod -R u+rwx "${wallpaperDst}"
-            echo "Done copying wallpapers."
-          '';
-      };
-    };
+    ${username} = {
+      home.file."copy-wallpapers.sh".text = ''
+        #!/usr/bin/env bash
+        set -e
+        echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
 
-  # User service that runs the script
+        if [ ! -d "${wallpaperSrc}" ]; then
+          echo "ERROR: ${wallpaperSrc} does not exist"
+          exit 1
+        fi
+
+        mkdir -p "${wallpaperDst}"
+
+        # Copy everything
+        cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
+
+        # Fix permissions
+        chmod -R u+rwx "${wallpaperDst}"
+
+        echo "Done copying wallpapers."
+      '';
+      home.file."copy-wallpapers.sh".executable = true;
+    };
+  };
+
+  ############################
+  # User systemd service that runs the script
+  ############################
   systemd.user.services.copyWallpapers = {
     description = "Copy wallpapers from repo to ~/Wallpapers";
     wants       = [ "graphical-session.target" ];
     after       = [ "graphical-session.target" ];
 
     serviceConfig.Type      = "oneshot";
-    serviceConfig.ExecStart = "${scriptFile}";
+    serviceConfig.ExecStart = scriptFile;
     serviceConfig.Restart   = "no";
   };
 }
@@ -2989,9 +2999,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3083,9 +3093,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3122,9 +3132,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3154,9 +3164,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3234,9 +3244,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

@@ -3287,9 +3297,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3412,9 +3422,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3649,9 +3659,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3688,9 +3698,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3775,13 +3785,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, ... }:
 
@@ -3822,9 +3832,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3851,9 +3861,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

@@ -3907,9 +3917,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -3973,9 +3983,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

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

@@ -4049,9 +4059,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

@@ -4106,9 +4116,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4342,9 +4352,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4381,9 +4391,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4423,7 +4433,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-29 Sun 14:54

+

Created: 2026-03-29 Sun 14:58

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 7239bc63f..3d031cd68 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2361,47 +2361,57 @@ Setting up wallpaper engine + wallpaper gui { config, pkgs, lib, flakeRoot, ... }: let - username = config.defaultUser or "henrov"; + username = config.users.users.defaultUser or "henrov"; homeDir = "/home/${username}"; wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; wallpaperDst = "${homeDir}/Wallpapers"; scriptFile = "${homeDir}/copy-wallpapers.sh"; in { + ############################ # Ensure bash exists + ############################ environment.systemPackages = [ pkgs.bash ]; - # Drop the script into home + ############################ + # Create the script in the user's home + ############################ home-manager.users = { - ${username} = { - home.file."copy-wallpapers.sh".text = '' - #!/usr/bin/env bash - set -e - echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..." - if [ ! -d "${wallpaperSrc}" ]; then - echo "ERROR: ${wallpaperSrc} does not exist" - exit 1 - fi - mkdir -p "${wallpaperDst}" - chown -R ${username}:${username} "${wallpaperDst}" - # Copy everything - cp -r "${wallpaperSrc}/." "${wallpaperDst}/" - # Fix permissions - chown -R ${username}:${username} "${wallpaperDst}" - chmod -R u+rwx "${wallpaperDst}" - echo "Done copying wallpapers." - ''; - }; - }; + ${username} = { + home.file."copy-wallpapers.sh".text = '' + #!/usr/bin/env bash + set -e + echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..." - # User service that runs the script + if [ ! -d "${wallpaperSrc}" ]; then + echo "ERROR: ${wallpaperSrc} does not exist" + exit 1 + fi + + mkdir -p "${wallpaperDst}" + + # Copy everything + cp -r "${wallpaperSrc}/." "${wallpaperDst}/" + + # Fix permissions + chmod -R u+rwx "${wallpaperDst}" + + echo "Done copying wallpapers." + ''; + home.file."copy-wallpapers.sh".executable = true; + }; + }; + + ############################ + # User systemd service that runs the script + ############################ systemd.user.services.copyWallpapers = { description = "Copy wallpapers from repo to ~/Wallpapers"; wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptFile}"; + serviceConfig.ExecStart = scriptFile; serviceConfig.Restart = "no"; }; } diff --git a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix index 8b2107107..dab3b6760 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix @@ -1,47 +1,57 @@ { config, pkgs, lib, flakeRoot, ... }: let - username = config.defaultUser or "henrov"; + username = config.users.users.defaultUser or "henrov"; homeDir = "/home/${username}"; wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; wallpaperDst = "${homeDir}/Wallpapers"; scriptFile = "${homeDir}/copy-wallpapers.sh"; in { + ############################ # Ensure bash exists + ############################ environment.systemPackages = [ pkgs.bash ]; - # Drop the script into home + ############################ + # Create the script in the user's home + ############################ home-manager.users = { - ${username} = { - home.file."copy-wallpapers.sh".text = '' - #!/usr/bin/env bash - set -e - echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..." - if [ ! -d "${wallpaperSrc}" ]; then - echo "ERROR: ${wallpaperSrc} does not exist" - exit 1 - fi - mkdir -p "${wallpaperDst}" - chown -R ${username}:${username} "${wallpaperDst}" - # Copy everything - cp -r "${wallpaperSrc}/." "${wallpaperDst}/" - # Fix permissions - chown -R ${username}:${username} "${wallpaperDst}" - chmod -R u+rwx "${wallpaperDst}" - echo "Done copying wallpapers." - ''; - }; - }; + ${username} = { + home.file."copy-wallpapers.sh".text = '' + #!/usr/bin/env bash + set -e + echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..." - # User service that runs the script + if [ ! -d "${wallpaperSrc}" ]; then + echo "ERROR: ${wallpaperSrc} does not exist" + exit 1 + fi + + mkdir -p "${wallpaperDst}" + + # Copy everything + cp -r "${wallpaperSrc}/." "${wallpaperDst}/" + + # Fix permissions + chmod -R u+rwx "${wallpaperDst}" + + echo "Done copying wallpapers." + ''; + home.file."copy-wallpapers.sh".executable = true; + }; + }; + + ############################ + # User systemd service that runs the script + ############################ systemd.user.services.copyWallpapers = { description = "Copy wallpapers from repo to ~/Wallpapers"; wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptFile}"; + serviceConfig.ExecStart = scriptFile; serviceConfig.Restart = "no"; }; }