From 8d46e2ded66b72897eb7b616da3ffbd13008a6a6 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 29 Apr 2026 07:41:57 +0200 Subject: [PATCH] Regenerated --- Droidnix/README.html | 791 +++++++++--------- Droidnix/README.org | 23 +- Droidnix/flake.nix | 6 +- Droidnix/generated/hosts/traveldroid/host.nix | 2 +- .../modules/traveldroid/desktop/waybar.nix | 15 +- 5 files changed, 405 insertions(+), 432 deletions(-) diff --git a/Droidnix/README.html b/Droidnix/README.html index 66990d842..0e19a5ea7 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,141 +204,141 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

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

-
-

Root Level

-
+
+

Root Level

+
  • = is the entry point and imports:
      @@ -398,16 +398,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. @@ -428,9 +428,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

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

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

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

@@ -597,7 +597,7 @@ The Nix flake definition for Droidnix. flakeRoot = self; buildUser = "henrov"; repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; - mutableConfigPath = "${repoPath}/generated/.config"; + flakeRoot = "${repoPath}/generated/.config"; in { nixosConfigurations = { traveldroid = nixpkgs.lib.nixosSystem { @@ -620,7 +620,7 @@ The Nix flake definition for Droidnix. zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; } @@ -637,7 +637,7 @@ The Nix flake definition for Droidnix. zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; }; @@ -648,9 +648,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -727,9 +727,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, repoPath, ... }:
@@ -798,9 +798,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. @@ -858,9 +858,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, repoPath, import-tree, home-manager, ... }:
 
@@ -899,7 +899,7 @@ in
       ./hardware-configuration.nix
     ]
     ++ allModules
-    # ++ [ home-manager.nixosModules.home-manager ]
+    ++ [ home-manager.nixosModules.home-manager ]
     ;
 
   #################################
@@ -920,13 +920,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

@@ -1034,9 +1034,9 @@ in {
-
-

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

-
+
+

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

+

This installs emacs

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

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

@@ -1225,9 +1225,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1279,9 +1279,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

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

@@ -1368,9 +1368,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1403,9 +1403,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1425,9 +1425,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

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

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

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1593,9 +1593,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1642,9 +1642,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, repoPath, stylix, ... }:
 
@@ -1731,9 +1731,9 @@ in
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1832,18 +1832,16 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

-
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, ... }:
+
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, flakeRoot, ... }:
 let
   username = config.defaultUser or "henrov";
-  waybarPath = "${mutableConfigPath}/waybar";
-  scriptsPath = "${mutableConfigPath}/scripts";
 in
 {
   environment.systemPackages = [ pkgs.waybar ];
@@ -1852,16 +1850,9 @@ in
   {
     home.file = {
       ".config/waybar/config.jsonc".source =
-        config.lib.file.mkOutOfStoreSymlink "${waybarPath}/config.jsonc";
+        "${flakeRoot}/generated/.config/waybar/config.jsonc";
       ".config/waybar/style-dark.css".source =
-        config.lib.file.mkOutOfStoreSymlink "${waybarPath}/style-dark.css";
-
-      # ".config/scripts/bluetooth-status.sh".source =
-      #   config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/bluetooth-status.sh";
-      # ".config/scripts/hypr-workspaces.sh".source =
-      #   config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspaces.sh";
-      # ".config/scripts/hypr-workspacesmenu.sh".source =
-      #   config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspacesmenu.sh";
+        "${flakeRoot}/generated/.config/waybar/style-dark.css";
     };
   };
 
@@ -1883,9 +1874,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -1988,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, ... }:
 
@@ -2013,9 +2004,9 @@ in
-
-

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

@@ -2035,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

@@ -2064,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.

@@ -2107,9 +2098,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

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

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

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

generated/modules/traveldroid/system/hypridle.nix

-
+
+

generated/modules/traveldroid/system/hypridle.nix

+

This installs hypridle

@@ -2277,9 +2268,9 @@ in
-
-

generated/modules/traveldroid/system/hyprlock.nix

-
+
+

generated/modules/traveldroid/system/hyprlock.nix

+

This installs hyprlock

@@ -2336,9 +2327,9 @@ in
-
-

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

-
+
+

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

+

This sets the dbus implementation

@@ -2386,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

@@ -2435,9 +2426,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

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

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

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

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2537,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

@@ -2591,9 +2582,9 @@ in
-
-

generated/modules/traveldroid/system/swaync.nix

-
+
+

generated/modules/traveldroid/system/swaync.nix

+

This sets the dbus implementation

@@ -2642,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

@@ -2710,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

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -3225,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

@@ -3246,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

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

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3448,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

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

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

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

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

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

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3557,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

@@ -3572,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

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

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3602,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

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

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

-
+
+

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

+

These are config files for .config/hypr

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

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

-
+
+

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

+

These setttings configure rules for workspaces

@@ -3772,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

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

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

-
+
+

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

+

Provides a powermenu

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

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

-
+
+

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

+

Provides a layout menu

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

generated/.config/scripts/batterywarn.sh

-
+
+

generated/.config/scripts/batterywarn.sh

+

Providing an media

@@ -4486,9 +4477,9 @@ fi
-
-

generated/.config/scripts/media.sh

-
+
+

generated/.config/scripts/media.sh

+

Providing an media

@@ -4587,9 +4578,9 @@ jq -c -n \
-
-

generated/.config/scripts/numlock-check.sh

-
+
+

generated/.config/scripts/numlock-check.sh

+

Count keyboards and enable numlock if more then 1, else disable

@@ -4611,9 +4602,9 @@ fi
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

Enables a terminal power menu

@@ -4668,9 +4659,9 @@ main
-
-

generated/.config/scripts/update.sh

-
+
+

generated/.config/scripts/update.sh

+

A file containing color variables

@@ -4695,9 +4686,9 @@ flatpak update -y
-
-

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

-
+
+

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

+

Providing an media

@@ -4712,9 +4703,9 @@ Providing an media
-
-

generated/.config/shared/colors.css

-
+
+

generated/.config/shared/colors.css

+

A file containing color variables

@@ -4755,9 +4746,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -5045,9 +5036,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -5084,9 +5075,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

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

@@ -5195,9 +5186,9 @@ These are config files for .config/stylix
-
-

generated/.config/swaync/config.json

-
+
+

generated/.config/swaync/config.json

+

These are config files for waybar

@@ -5258,9 +5249,9 @@ These are config files for waybar
-
-

generated/.config/swaync/style.css

-
+
+

generated/.config/swaync/style.css

+

These are config files for waybar

@@ -5453,9 +5444,9 @@ These are config files for waybar
-
-

generated/.config/waybar/config.jsonc

-
+
+

generated/.config/waybar/config.jsonc

+

These are config files for waybar

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

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

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

-
+
+

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

+

These are config files for waybar

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

@@ -6125,9 +6116,9 @@ jq -c -n \
-
-

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

-
+
+

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

+

These are config files for waybar

@@ -6149,9 +6140,9 @@ hyprctl dispatch focuswindow address:"$addr"
-
-

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

-
+
+

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

+

These are config files for waybar

@@ -6175,9 +6166,9 @@ fi
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -6214,9 +6205,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -6252,9 +6243,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -6281,9 +6272,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

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

@@ -6417,9 +6408,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -6456,7 +6447,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-04-29 wo 07:33

+

Created: 2026-04-29 wo 07:41

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 8589b54bc..f957be541 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -217,7 +217,7 @@ The Nix flake definition for Droidnix. flakeRoot = self; buildUser = "henrov"; repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; - mutableConfigPath = "${repoPath}/generated/.config"; + flakeRoot = "${repoPath}/generated/.config"; in { nixosConfigurations = { traveldroid = nixpkgs.lib.nixosSystem { @@ -240,7 +240,7 @@ The Nix flake definition for Droidnix. zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; } @@ -257,7 +257,7 @@ The Nix flake definition for Droidnix. zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; }; @@ -499,7 +499,7 @@ in ./hardware-configuration.nix ] ++ allModules - # ++ [ home-manager.nixosModules.home-manager ] + ++ [ home-manager.nixosModules.home-manager ] ; ################################# @@ -1344,11 +1344,9 @@ 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, repoPath, buildUser, mutableConfigPath, ... }: +{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, flakeRoot, ... }: let username = config.defaultUser or "henrov"; - waybarPath = "${mutableConfigPath}/waybar"; - scriptsPath = "${mutableConfigPath}/scripts"; in { environment.systemPackages = [ pkgs.waybar ]; @@ -1357,16 +1355,9 @@ in { home.file = { ".config/waybar/config.jsonc".source = - config.lib.file.mkOutOfStoreSymlink "${waybarPath}/config.jsonc"; + "${flakeRoot}/generated/.config/waybar/config.jsonc"; ".config/waybar/style-dark.css".source = - config.lib.file.mkOutOfStoreSymlink "${waybarPath}/style-dark.css"; - - # ".config/scripts/bluetooth-status.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/bluetooth-status.sh"; - # ".config/scripts/hypr-workspaces.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspaces.sh"; - # ".config/scripts/hypr-workspacesmenu.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspacesmenu.sh"; + "${flakeRoot}/generated/.config/waybar/style-dark.css"; }; }; diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 85438beaa..478f5f467 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -37,7 +37,7 @@ flakeRoot = self; buildUser = "henrov"; repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; - mutableConfigPath = "${repoPath}/generated/.config"; + flakeRoot = "${repoPath}/generated/.config"; in { nixosConfigurations = { traveldroid = nixpkgs.lib.nixosSystem { @@ -60,7 +60,7 @@ zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; } @@ -77,7 +77,7 @@ zen-browser buildUser repoPath - mutableConfigPath + flakeRoot ; }; }; diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index dbf2ffece..c5170026e 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -36,7 +36,7 @@ in ./hardware-configuration.nix ] ++ allModules - # ++ [ home-manager.nixosModules.home-manager ] + ++ [ home-manager.nixosModules.home-manager ] ; ################################# diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix index e9c5351b7..4d62916eb 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix @@ -1,9 +1,7 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- -{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, ... }: +{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, flakeRoot, ... }: let username = config.defaultUser or "henrov"; - waybarPath = "${mutableConfigPath}/waybar"; - scriptsPath = "${mutableConfigPath}/scripts"; in { environment.systemPackages = [ pkgs.waybar ]; @@ -12,16 +10,9 @@ in { home.file = { ".config/waybar/config.jsonc".source = - config.lib.file.mkOutOfStoreSymlink "${waybarPath}/config.jsonc"; + "${flakeRoot}/generated/.config/waybar/config.jsonc"; ".config/waybar/style-dark.css".source = - config.lib.file.mkOutOfStoreSymlink "${waybarPath}/style-dark.css"; - - # ".config/scripts/bluetooth-status.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/bluetooth-status.sh"; - # ".config/scripts/hypr-workspaces.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspaces.sh"; - # ".config/scripts/hypr-workspacesmenu.sh".source = - # config.lib.file.mkOutOfStoreSymlink "${scriptsPath}/hypr-workspacesmenu.sh"; + "${flakeRoot}/generated/.config/waybar/style-dark.css"; }; };