Regenerated
This commit is contained in:
+289
-296
File diff suppressed because it is too large
Load Diff
+1
-8
@@ -1824,14 +1824,13 @@ 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 =
|
hyprlandPkg =
|
||||||
pkgs.hyprland or
|
pkgs.hyprland or
|
||||||
pkgs.hyprland-git or
|
pkgs.hyprland-git or
|
||||||
inputs.hyprland.packages.${pkgs.system}.default;
|
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:
|
readDirRecursive = dir:
|
||||||
let
|
let
|
||||||
entries = builtins.attrNames (builtins.readDir dir);
|
entries = builtins.attrNames (builtins.readDir dir);
|
||||||
files = lib.concatMap (e:
|
files = lib.concatMap (e:
|
||||||
@@ -1841,26 +1840,20 @@ let
|
|||||||
in if stat.type == "directory"
|
in if stat.type == "directory"
|
||||||
then readDirRecursive path
|
then readDirRecursive path
|
||||||
else [{
|
else [{
|
||||||
# Destination path relative to home directory
|
|
||||||
name = ".config/hypr/${builtins.substring (builtins.stringLength assetPath + 1) (builtins.stringLength path - (builtins.stringLength assetPath + 1)) 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;
|
||||||
|
|
||||||
# Convert list to attribute set (no mkMerge needed)
|
|
||||||
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Systemwide installation
|
|
||||||
environment.systemPackages = [ hyprlandPkg ];
|
environment.systemPackages = [ hyprlandPkg ];
|
||||||
|
|
||||||
# Home Manager users declaration
|
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
# Directly define all config files in ~/.config/hypr/
|
|
||||||
home.file = hyprFilesAttrs;
|
home.file = hyprFilesAttrs;
|
||||||
|
|
||||||
# Optional Hyprland settings
|
# Optional Hyprland settings
|
||||||
|
|||||||
@@ -4,14 +4,13 @@ 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 =
|
hyprlandPkg =
|
||||||
pkgs.hyprland or
|
pkgs.hyprland or
|
||||||
pkgs.hyprland-git or
|
pkgs.hyprland-git or
|
||||||
inputs.hyprland.packages.${pkgs.system}.default;
|
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:
|
readDirRecursive = dir:
|
||||||
let
|
let
|
||||||
entries = builtins.attrNames (builtins.readDir dir);
|
entries = builtins.attrNames (builtins.readDir dir);
|
||||||
files = lib.concatMap (e:
|
files = lib.concatMap (e:
|
||||||
@@ -21,26 +20,20 @@ let
|
|||||||
in if stat.type == "directory"
|
in if stat.type == "directory"
|
||||||
then readDirRecursive path
|
then readDirRecursive path
|
||||||
else [{
|
else [{
|
||||||
# Destination path relative to home directory
|
|
||||||
name = ".config/hypr/${builtins.substring (builtins.stringLength assetPath + 1) (builtins.stringLength path - (builtins.stringLength assetPath + 1)) 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;
|
||||||
|
|
||||||
# Convert list to attribute set (no mkMerge needed)
|
|
||||||
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
hyprFilesAttrs = lib.listToAttrs (readDirRecursive assetPath);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Systemwide installation
|
|
||||||
environment.systemPackages = [ hyprlandPkg ];
|
environment.systemPackages = [ hyprlandPkg ];
|
||||||
|
|
||||||
# Home Manager users declaration
|
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
# Directly define all config files in ~/.config/hypr/
|
|
||||||
home.file = hyprFilesAttrs;
|
home.file = hyprFilesAttrs;
|
||||||
|
|
||||||
# Optional Hyprland settings
|
# Optional Hyprland settings
|
||||||
|
|||||||
Reference in New Issue
Block a user