From f9887620150bdf998dc846a377ae2c290f74cb21 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 27 Apr 2026 16:34:23 +0200 Subject: [PATCH] Regenerated --- Droidnix/README.html | 820 +++++++++--------- Droidnix/README.org | 58 +- Droidnix/flake.nix | 50 +- .../modules/traveldroid/desktop/waybar.nix | 8 +- 4 files changed, 450 insertions(+), 486 deletions(-) diff --git a/Droidnix/README.html b/Droidnix/README.html index b12e0a83c..562a35417 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,140 +204,140 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -353,25 +353,25 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. with 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
    • +
  • Core
    • +
  • Hyprland
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

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

-
-

Root Level

-
+
+

Root Level

+
  • = is the entry point and imports:
      @@ -397,16 +397,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. @@ -427,9 +427,9 @@ The generated/ directory contains all generated configurations, div The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.

-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -506,9 +506,9 @@ com.logseq.Logseq
-
-

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

@@ -550,71 +550,56 @@ keys=hyprctl binds This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

generated/flake.nix

-
+
+

generated/flake.nix

+

The Nix flake definition for Droidnix.

-
{
+
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
+{
   description = "Droidnix: A dendritic NixOS + Home Manager configuration";
-
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     quickshell = {
-        url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-        inputs.nixpkgs.follows = "nixpkgs";
-      };
-
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     import-tree.url = "github:vic/import-tree";
-
     stylix = {
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     flatpak = {
       url = "github:gmodena/nix-flatpak";
     };
-
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     hyprland.url = "github:hyprwm/Hyprland";
   };
-
-  outputs = { self,
-              nixpkgs,
-              home-manager,
-              import-tree,
-              stylix,
-              hyprland,
-              emacs-overlay,
-              zen-browser,
-              flatpak
-        ,... }:
+  outputs = { self, nixpkgs, home-manager, import-tree, stylix, hyprland,
+              emacs-overlay, zen-browser, flatpak, ... }:
     let
       system = "x86_64-linux";
       flakeRoot = self;
+      buildUser = "henrov";
+      repoPath = "/home/${buildUser}/Repos/nixos/Droidnix";
+      mutableConfigPath = "${repoPath}/generated/.config";
     in {
       nixosConfigurations = {
         traveldroid = nixpkgs.lib.nixosSystem {
           inherit system;
-
           modules = [
             ({ ... }: {
               nixpkgs.overlays = [ emacs-overlay.overlays.default ];
@@ -625,13 +610,16 @@ The Nix flake definition for Droidnix.
           ];
           specialArgs = {
             inherit
-            flakeRoot
-            home-manager
-           import-tree
-           stylix
-           hyprland
-           zen-browser
-           ;
+              flakeRoot
+              home-manager
+              import-tree
+              stylix
+              hyprland
+              zen-browser
+              buildUser
+              repoPath
+              mutableConfigPath
+              ;
           };
         };
       };
@@ -641,9 +629,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -719,9 +707,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
 { config, pkgs, lib, flakeRoot, ... }:
@@ -790,9 +778,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. @@ -850,9 +838,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -911,13 +899,13 @@ in
-
-

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

@@ -1025,9 +1013,9 @@ in {
-
-

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

-
+
+

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

+

This installs emacs

@@ -1123,9 +1111,9 @@ in
-
-

generated/disabled/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/disabled/modules/traveldroid/apps/flameshot.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

@@ -1185,9 +1173,9 @@ in
-
-

generated/modules/traveldroid/apps/kdeconnect.nix

-
+
+

generated/modules/traveldroid/apps/kdeconnect.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

@@ -1216,9 +1204,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1270,9 +1258,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1311,9 +1299,9 @@ in
-
-

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

@@ -1359,9 +1347,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1394,9 +1382,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1416,9 +1404,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1532,13 +1520,13 @@ in
-
-

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

@@ -1556,9 +1544,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1584,9 +1572,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1633,9 +1621,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1722,9 +1710,9 @@ in
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1823,19 +1811,19 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

-
{ lib, config, pkgs, flakeRoot, ... }:
+
{ lib, config, pkgs, flakeRoot, buildUser, repoPath, mutableConfigPath,... }:
 let
   # Use the config option defaultUser directly, fallback to "henrov"
-  username = config.defaultUser or "henrov";
-  basePath = "${flakeRoot}/generated/.config";
-  assetPath = "${flakeRoot}/generated/.config/waybar";
+  username = config.defaultUser or ${buildUser} or "henrov";
+  basePath = "${mutableConfigPath}";
+  assetPath = "${mutableConfigPath}/waybar";
 in
 {
   # Install Waybar system-wide
@@ -1886,9 +1874,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1918,9 +1906,9 @@ in
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -1991,13 +1979,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
 
@@ -2016,9 +2004,9 @@ in
-
-

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

@@ -2038,9 +2026,9 @@ Avahi helps discovering services
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+

Installing Bluetooth services and supporting aps

@@ -2067,9 +2055,9 @@ in
-
-

generated/modules/traveldroid/system/copy_scripts.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+

This copies any scripts from generated.config/scripts to ~/.config/scripts and makes any .sh files executable.

@@ -2110,9 +2098,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -2139,9 +2127,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

@@ -2222,9 +2210,9 @@ This sets the firewall.
-
-

generated/modules/traveldroid/system/hypridle.nix

-
+
+

generated/modules/traveldroid/system/hypridle.nix

+

This installs hypridle

@@ -2280,9 +2268,9 @@ in
-
-

generated/modules/traveldroid/system/hyprlock.nix

-
+
+

generated/modules/traveldroid/system/hyprlock.nix

+

This installs hyprlock

@@ -2339,9 +2327,9 @@ in
-
-

generated/modules/traveldroid/system/gnome-keyring.nix

-
+
+

generated/modules/traveldroid/system/gnome-keyring.nix

+

This sets the dbus implementation

@@ -2389,9 +2377,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 imho fits the aesthetic I am aiming for

@@ -2438,9 +2426,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -2489,9 +2477,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 {
@@ -2514,9 +2502,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2540,9 +2528,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

This sets the dbus implementation

@@ -2594,9 +2582,9 @@ in
-
-

generated/modules/traveldroid/system/swaync.nix

-
+
+

generated/modules/traveldroid/system/swaync.nix

+

This sets the dbus implementation

@@ -2645,13 +2633,13 @@ in
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/users/

-
+
+

generated/users/

+

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

@@ -2713,9 +2701,9 @@ in

These are all the prepared config files

-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -3228,9 +3216,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -3249,9 +3237,9 @@ These are config files for .config/hypr
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -3273,9 +3261,9 @@ input {
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3451,9 +3439,9 @@ bind = $mainMod, U, exec, kitty -e bash -lc "$HOME/.config/scripts/update.sh"
-
-

generated/.config/hypr/exec-once.conf

-
+
+

generated/.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -3474,9 +3462,9 @@ exec-once = waybar
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -3507,9 +3495,9 @@ listener {
-
-

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -3539,9 +3527,9 @@ input-field {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3560,9 +3548,9 @@ source = ./workspace-rules.conf
-
-

generated/.config/hypr/layer-rules.conf

-
+
+

generated/.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -3575,9 +3563,9 @@ layerrule = xray 1, match:namespace swaync-control-center
-
-

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These settings control Hyprland config

@@ -3592,9 +3580,9 @@ scrolling {
-
-

generated/.config/hypr/monitor-rules.conf

-
+
+

generated/.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -3605,9 +3593,9 @@ monitor = eDP-1, preferred, auto-left, 1.5
-
-

generated/.config/hypr/theming.conf

-
+
+

generated/.config/hypr/theming.conf

+

These are config files for .config/hypr

@@ -3673,9 +3661,9 @@ misc {
-
-

generated/.config/hypr/window-rules.conf

-
+
+

generated/.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -3758,9 +3746,9 @@ windowrule {
-
-

generated/.config/hypr/workspace-rules.conf

-
+
+

generated/.config/hypr/workspace-rules.conf

+

These setttings configure rules for workspaces

@@ -3775,9 +3763,9 @@ workspace = 6, monitor:DP-1 #, layout:dwindle
-
-

generated/.config/quickshell/media/shell.qml

-
+
+

generated/.config/quickshell/media/shell.qml

+

offers a adio widget

@@ -4171,9 +4159,9 @@ ShellRoot {
-
-

generated/.config/quickshell/powermenu/shell.qml

-
+
+

generated/.config/quickshell/powermenu/shell.qml

+

Provides a powermenu

@@ -4321,9 +4309,9 @@ ShellRoot {
-
-

generated/.config/quickshell/layoutswitcher/shell.qml

-
+
+

generated/.config/quickshell/layoutswitcher/shell.qml

+

Provides a layout menu

@@ -4470,9 +4458,9 @@ ShellRoot {
-
-

generated/.config/scripts/batterywarn.sh

-
+
+

generated/.config/scripts/batterywarn.sh

+

Providing an media

@@ -4489,9 +4477,9 @@ fi
-
-

generated/.config/scripts/media.sh

-
+
+

generated/.config/scripts/media.sh

+

Providing an media

@@ -4591,9 +4579,9 @@ jq -c -n \
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

Enables a terminal power menu

@@ -4648,9 +4636,9 @@ main
-
-

generated/.config/scripts/update.sh

-
+
+

generated/.config/scripts/update.sh

+

A file containing color variables

@@ -4675,9 +4663,9 @@ flatpak update -y
-
-

generated/.config/scripts/wofi-launcher.sh

-
+
+

generated/.config/scripts/wofi-launcher.sh

+

Providing an media

@@ -4692,9 +4680,9 @@ Providing an media
-
-

generated/.config/shared/colors.css

-
+
+

generated/.config/shared/colors.css

+

A file containing color variables

@@ -4734,9 +4722,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -5024,9 +5012,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -5063,9 +5051,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -5095,9 +5083,9 @@ These are config files for .config/stylix
-
-

generated/.config/stylix/palette.html

-
+
+

generated/.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -5174,9 +5162,9 @@ These are config files for .config/stylix
-
-

generated/.config/swaync/config.json

-
+
+

generated/.config/swaync/config.json

+

These are config files for waybar

@@ -5237,9 +5225,9 @@ These are config files for waybar
-
-

generated/.config/swaync/style.css

-
+
+

generated/.config/swaync/style.css

+

These are config files for waybar

@@ -5432,9 +5420,9 @@ These are config files for waybar
-
-

generated/.config/waybar/config.jsonc

-
+
+

generated/.config/waybar/config.jsonc

+

These are config files for waybar

@@ -5771,9 +5759,9 @@ These are config files for waybar
-
-

generated/.config/waybar/style-dark.css

-
+
+

generated/.config/waybar/style-dark.css

+

This file contains all css for waybar

@@ -6050,9 +6038,9 @@ label#custom-windows:not(.active) {
-
-

generated/.config/scripts/bluetooth-status.sh

-
+
+

generated/.config/scripts/bluetooth-status.sh

+

These are config files for waybar

@@ -6077,9 +6065,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

generated/.config/scripts/hypr-workspaces.sh

-
+
+

generated/.config/scripts/hypr-workspaces.sh

+

These are config files for waybar

@@ -6121,9 +6109,9 @@ jq -c -n \
-
-

generated/.config/scripts/hypr-workspacesmenu.sh

-
+
+

generated/.config/scripts/hypr-workspacesmenu.sh

+

These are config files for waybar

@@ -6145,9 +6133,9 @@ hyprctl dispatch focuswindow address:"$addr"
-
-

generated/.config/scripts/kdeconnect-status.sh

-
+
+

generated/.config/scripts/kdeconnect-status.sh

+

These are config files for waybar

@@ -6171,9 +6159,9 @@ fi
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -6210,9 +6198,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -6248,9 +6236,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -6277,9 +6265,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

@@ -6375,9 +6363,9 @@ This is the default layout for wofi
-
-

generated/.config/zed/settings.json

-
+
+

generated/.config/zed/settings.json

+

These are config files for Zed editor

@@ -6413,9 +6401,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -6452,7 +6440,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-04-27 ma 16:08

+

Created: 2026-04-27 ma 16:34

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 7d46282f3..bec03a5ad 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -178,64 +178,49 @@ This section contains the Org blocks for tangling Nix code into the generated fo ** =generated/flake.nix= The Nix flake definition for Droidnix. #+BEGIN_SRC nix :tangle flake.nix :noweb yes :mkdirp yes :eval never +# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- { description = "Droidnix: A dendritic NixOS + Home Manager configuration"; - inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; import-tree.url = "github:vic/import-tree"; - stylix = { url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - flatpak = { url = "github:gmodena/nix-flatpak"; }; - emacs-overlay = { url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; }; - - outputs = { self, - nixpkgs, - home-manager, - import-tree, - stylix, - hyprland, - emacs-overlay, - zen-browser, - flatpak - ,... }: + outputs = { self, nixpkgs, home-manager, import-tree, stylix, hyprland, + emacs-overlay, zen-browser, flatpak, ... }: let system = "x86_64-linux"; flakeRoot = self; + buildUser = "henrov"; + repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; + mutableConfigPath = "${repoPath}/generated/.config"; in { nixosConfigurations = { traveldroid = nixpkgs.lib.nixosSystem { inherit system; - modules = [ ({ ... }: { nixpkgs.overlays = [ emacs-overlay.overlays.default ]; @@ -246,13 +231,16 @@ The Nix flake definition for Droidnix. ]; specialArgs = { inherit - flakeRoot - home-manager - import-tree - stylix - hyprland - zen-browser - ; + flakeRoot + home-manager + import-tree + stylix + hyprland + zen-browser + buildUser + repoPath + mutableConfigPath + ; }; }; }; @@ -1336,12 +1324,12 @@ in ** =generated/modules/traveldroid/desktop/waybar.nix= This file installs and configures waybar #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb yes :mkdirp yes :eval never -{ lib, config, pkgs, flakeRoot, ... }: +{ lib, config, pkgs, flakeRoot, buildUser, repoPath, mutableConfigPath,... }: let # Use the config option defaultUser directly, fallback to "henrov" - username = config.defaultUser or "henrov"; - basePath = "${flakeRoot}/generated/.config"; - assetPath = "${flakeRoot}/generated/.config/waybar"; + username = config.defaultUser or ${buildUser} or "henrov"; + basePath = "${mutableConfigPath}"; + assetPath = "${mutableConfigPath}/waybar"; in { # Install Waybar system-wide diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 6f2c917a8..8c7009097 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -1,62 +1,47 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- +# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- { description = "Droidnix: A dendritic NixOS + Home Manager configuration"; - inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; import-tree.url = "github:vic/import-tree"; - stylix = { url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - flatpak = { url = "github:gmodena/nix-flatpak"; }; - emacs-overlay = { url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; }; - - outputs = { self, - nixpkgs, - home-manager, - import-tree, - stylix, - hyprland, - emacs-overlay, - zen-browser, - flatpak - ,... }: + outputs = { self, nixpkgs, home-manager, import-tree, stylix, hyprland, + emacs-overlay, zen-browser, flatpak, ... }: let system = "x86_64-linux"; flakeRoot = self; + buildUser = "henrov"; + repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; + mutableConfigPath = "${repoPath}/generated/.config"; in { nixosConfigurations = { traveldroid = nixpkgs.lib.nixosSystem { inherit system; - modules = [ ({ ... }: { nixpkgs.overlays = [ emacs-overlay.overlays.default ]; @@ -67,13 +52,16 @@ ]; specialArgs = { inherit - flakeRoot - home-manager - import-tree - stylix - hyprland - zen-browser - ; + flakeRoot + home-manager + import-tree + stylix + hyprland + zen-browser + buildUser + repoPath + mutableConfigPath + ; }; }; }; diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix index a444a15e2..5d0cec18f 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix @@ -1,10 +1,10 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- -{ lib, config, pkgs, flakeRoot, ... }: +{ lib, config, pkgs, flakeRoot, buildUser, repoPath, mutableConfigPath,... }: let # Use the config option defaultUser directly, fallback to "henrov" - username = config.defaultUser or "henrov"; - basePath = "${flakeRoot}/generated/.config"; - assetPath = "${flakeRoot}/generated/.config/waybar"; + username = config.defaultUser or ${buildUser} or "henrov"; + basePath = "${mutableConfigPath}"; + assetPath = "${mutableConfigPath}/waybar"; in { # Install Waybar system-wide