Regenerated
This commit is contained in:
+301
-293
File diff suppressed because it is too large
Load Diff
+13
-5
@@ -1824,6 +1824,12 @@ let
|
|||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
assetPath = "${flakeRoot}/generated/.config/hypr";
|
assetPath = "${flakeRoot}/generated/.config/hypr";
|
||||||
|
|
||||||
|
# Determine Hyprland package (systemwide installation is enough)
|
||||||
|
hyprlandPkg =
|
||||||
|
pkgs.hyprland or
|
||||||
|
pkgs.hyprland-git or
|
||||||
|
inputs.hyprland.packages.${pkgs.system}.default;
|
||||||
|
|
||||||
# Recursively read directory and generate Home Manager file entries
|
# Recursively read directory and generate Home Manager file entries
|
||||||
rec readDirRecursive = dir:
|
rec readDirRecursive = dir:
|
||||||
let
|
let
|
||||||
@@ -1836,26 +1842,28 @@ let
|
|||||||
then readDirRecursive path
|
then readDirRecursive path
|
||||||
else [{
|
else [{
|
||||||
# Destination path relative to home directory
|
# Destination path relative to home directory
|
||||||
name = builtins.replaceStrings [ "${flakeRoot}/generated/" ] [ "" ] path;
|
name = ".config/hypr/${builtins.substring (builtins.stringLength assetPath + 1) (builtins.stringLength path - (builtins.stringLength assetPath + 1)) path}";
|
||||||
value = { source = path; };
|
value = { source = path; };
|
||||||
}]
|
}]
|
||||||
) entries;
|
) entries;
|
||||||
in files;
|
in files;
|
||||||
|
|
||||||
hyprFiles = readDirRecursive assetPath;
|
# Convert list to attribute set (no mkMerge needed)
|
||||||
|
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# Systemwide installation
|
||||||
environment.systemPackages = [ hyprlandPkg ];
|
environment.systemPackages = [ hyprlandPkg ];
|
||||||
|
|
||||||
# Home Manager users declaration
|
# Home Manager users declaration
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
# Merge all files (including subdirectories) into ~/.config/hypr/
|
# Directly define all config files in ~/.config/hypr/
|
||||||
home.file = lib.mkMerge hyprFiles;
|
home.file = hyprFilesAttrs;
|
||||||
|
|
||||||
# Optional: Hyprland settings
|
# Optional Hyprland settings
|
||||||
settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
|
settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ let
|
|||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
assetPath = "${flakeRoot}/generated/.config/hypr";
|
assetPath = "${flakeRoot}/generated/.config/hypr";
|
||||||
|
|
||||||
|
# Determine Hyprland package (systemwide installation is enough)
|
||||||
|
hyprlandPkg =
|
||||||
|
pkgs.hyprland or
|
||||||
|
pkgs.hyprland-git or
|
||||||
|
inputs.hyprland.packages.${pkgs.system}.default;
|
||||||
|
|
||||||
# Recursively read directory and generate Home Manager file entries
|
# Recursively read directory and generate Home Manager file entries
|
||||||
rec readDirRecursive = dir:
|
rec readDirRecursive = dir:
|
||||||
let
|
let
|
||||||
@@ -16,26 +22,28 @@ let
|
|||||||
then readDirRecursive path
|
then readDirRecursive path
|
||||||
else [{
|
else [{
|
||||||
# Destination path relative to home directory
|
# Destination path relative to home directory
|
||||||
name = builtins.replaceStrings [ "${flakeRoot}/generated/" ] [ "" ] path;
|
name = ".config/hypr/${builtins.substring (builtins.stringLength assetPath + 1) (builtins.stringLength path - (builtins.stringLength assetPath + 1)) path}";
|
||||||
value = { source = path; };
|
value = { source = path; };
|
||||||
}]
|
}]
|
||||||
) entries;
|
) entries;
|
||||||
in files;
|
in files;
|
||||||
|
|
||||||
hyprFiles = readDirRecursive assetPath;
|
# Convert list to attribute set (no mkMerge needed)
|
||||||
|
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# Systemwide installation
|
||||||
environment.systemPackages = [ hyprlandPkg ];
|
environment.systemPackages = [ hyprlandPkg ];
|
||||||
|
|
||||||
# Home Manager users declaration
|
# Home Manager users declaration
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
# Merge all files (including subdirectories) into ~/.config/hypr/
|
# Directly define all config files in ~/.config/hypr/
|
||||||
home.file = lib.mkMerge hyprFiles;
|
home.file = hyprFilesAttrs;
|
||||||
|
|
||||||
# Optional: Hyprland settings
|
# Optional Hyprland settings
|
||||||
settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
|
settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user