Regenerated

This commit is contained in:
2026-04-29 07:41:57 +02:00
parent 704784ef74
commit 8d46e2ded6
5 changed files with 405 additions and 432 deletions
+391 -400
View File
File diff suppressed because it is too large Load Diff
+7 -16
View File
@@ -217,7 +217,7 @@ The Nix flake definition for Droidnix.
flakeRoot = self; flakeRoot = self;
buildUser = "henrov"; buildUser = "henrov";
repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; repoPath = "/home/${buildUser}/Repos/nixos/Droidnix";
mutableConfigPath = "${repoPath}/generated/.config"; flakeRoot = "${repoPath}/generated/.config";
in { in {
nixosConfigurations = { nixosConfigurations = {
traveldroid = nixpkgs.lib.nixosSystem { traveldroid = nixpkgs.lib.nixosSystem {
@@ -240,7 +240,7 @@ The Nix flake definition for Droidnix.
zen-browser zen-browser
buildUser buildUser
repoPath repoPath
mutableConfigPath flakeRoot
; ;
}; };
} }
@@ -257,7 +257,7 @@ The Nix flake definition for Droidnix.
zen-browser zen-browser
buildUser buildUser
repoPath repoPath
mutableConfigPath flakeRoot
; ;
}; };
}; };
@@ -499,7 +499,7 @@ in
./hardware-configuration.nix ./hardware-configuration.nix
] ]
++ allModules ++ allModules
# ++ [ home-manager.nixosModules.home-manager ] ++ [ home-manager.nixosModules.home-manager ]
; ;
################################# #################################
@@ -1344,11 +1344,9 @@ in
** =generated/modules/traveldroid/desktop/waybar.nix= ** =generated/modules/traveldroid/desktop/waybar.nix=
This file installs and configures waybar This file installs and configures waybar
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb yes :mkdirp yes :eval never #+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 let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
waybarPath = "${mutableConfigPath}/waybar";
scriptsPath = "${mutableConfigPath}/scripts";
in in
{ {
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
@@ -1357,16 +1355,9 @@ in
{ {
home.file = { home.file = {
".config/waybar/config.jsonc".source = ".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/waybar/style-dark.css".source =
config.lib.file.mkOutOfStoreSymlink "${waybarPath}/style-dark.css"; "${flakeRoot}/generated/.config/waybar/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";
}; };
}; };
+3 -3
View File
@@ -37,7 +37,7 @@
flakeRoot = self; flakeRoot = self;
buildUser = "henrov"; buildUser = "henrov";
repoPath = "/home/${buildUser}/Repos/nixos/Droidnix"; repoPath = "/home/${buildUser}/Repos/nixos/Droidnix";
mutableConfigPath = "${repoPath}/generated/.config"; flakeRoot = "${repoPath}/generated/.config";
in { in {
nixosConfigurations = { nixosConfigurations = {
traveldroid = nixpkgs.lib.nixosSystem { traveldroid = nixpkgs.lib.nixosSystem {
@@ -60,7 +60,7 @@
zen-browser zen-browser
buildUser buildUser
repoPath repoPath
mutableConfigPath flakeRoot
; ;
}; };
} }
@@ -77,7 +77,7 @@
zen-browser zen-browser
buildUser buildUser
repoPath repoPath
mutableConfigPath flakeRoot
; ;
}; };
}; };
@@ -36,7 +36,7 @@ in
./hardware-configuration.nix ./hardware-configuration.nix
] ]
++ allModules ++ allModules
# ++ [ home-manager.nixosModules.home-manager ] ++ [ home-manager.nixosModules.home-manager ]
; ;
################################# #################################
@@ -1,9 +1,7 @@
# --- 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. ---
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, ... }: { lib, config, pkgs, repoPath, buildUser, mutableConfigPath, flakeRoot, ... }:
let let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
waybarPath = "${mutableConfigPath}/waybar";
scriptsPath = "${mutableConfigPath}/scripts";
in in
{ {
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
@@ -12,16 +10,9 @@ in
{ {
home.file = { home.file = {
".config/waybar/config.jsonc".source = ".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/waybar/style-dark.css".source =
config.lib.file.mkOutOfStoreSymlink "${waybarPath}/style-dark.css"; "${flakeRoot}/generated/.config/waybar/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";
}; };
}; };