Regenerated

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";
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-        inputs.nixpkgs.follows = "nixpkgs";
+      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,
-  outputs = { self,
+              emacs-overlay, zen-browser, flatpak, ... }:
-              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
+              flakeRoot
-            home-manager
+              home-manager
-           import-tree
+              import-tree
-           stylix
+              stylix
-           hyprland
+              hyprland
-           zen-browser
+              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";
+  username = config.defaultUser or ${buildUser} or "henrov";
-  basePath = "${flakeRoot}/generated/.config";
+  basePath = "${mutableConfigPath}";
-  assetPath = "${flakeRoot}/generated/.config/waybar";
+  assetPath = "${mutableConfigPath}/waybar";
 in
 {
   # Install Waybar system-wide

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";
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-        inputs.nixpkgs.follows = "nixpkgs";
+      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,
-  outputs = { self,
+              emacs-overlay, zen-browser, flatpak, ... }:
-              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
+              flakeRoot
-            home-manager
+              home-manager
-           import-tree
+              import-tree
-           stylix
+              stylix
-           hyprland
+              hyprland
-           zen-browser
+              zen-browser
-           ;
+              buildUser
+              repoPath
+              mutableConfigPath
+              ;
           };
         };
       };

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";
+  username = config.defaultUser or ${buildUser} or "henrov";
-  basePath = "${flakeRoot}/generated/.config";
+  basePath = "${mutableConfigPath}";
-  assetPath = "${flakeRoot}/generated/.config/waybar";
+  assetPath = "${mutableConfigPath}/waybar";
 in
 {
   # Install Waybar system-wide