Regenerated

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";
     };
   };