diff --git a/modules/features/stylix/atelier-plateau.nix b/modules/features/stylix/atelier-plateau.nix index 312fc15..bbdd7bc 100644 --- a/modules/features/stylix/atelier-plateau.nix +++ b/modules/features/stylix/atelier-plateau.nix @@ -8,6 +8,7 @@ config, lib, pkgs, + user-parts, ... }: @@ -80,19 +81,19 @@ }; }; - home-manager.users.serenity = { + home-manager.users.${user-parts.user.username} = { # copies avatars from flake into home home.file."Avatars" = { source = ../../../assets/media/avatars; - target = "/home/serenity/Pictures/Avatars"; + target = "/home/${user-parts.user.username}/Pictures/Avatars"; recursive = true; }; # copies wallpapers from flake into home home.file."Wallpapers" = { source = ../../../assets/media/wallpapers; - target = "/home/serenity/Pictures/Wallpapers"; + target = "/home/${user-parts.user.username}/Pictures/Wallpapers"; recursive = true; }; diff --git a/modules/features/stylix/autogen.nix b/modules/features/stylix/autogen.nix index 7201d9a..d8761a9 100644 --- a/modules/features/stylix/autogen.nix +++ b/modules/features/stylix/autogen.nix @@ -8,6 +8,7 @@ config, lib, pkgs, + user-parts, ... }: @@ -72,19 +73,19 @@ }; }; - home-manager.users.serenity = { + home-manager.users.${user-parts.user.username} = { # copies avatars from flake into home home.file."Avatars" = { source = ../../../assets/media/avatars; - target = "/home/serenity/Pictures/Avatars"; + target = "/home/${user-parts.user.username}/Pictures/Avatars"; recursive = true; }; # copies wallpapers from flake into home home.file."Wallpapers" = { source = ../../../assets/media/wallpapers; - target = "/home/serenity/Pictures/Wallpapers"; + target = "/home/${user-parts.user.username}/Pictures/Wallpapers"; recursive = true; }; diff --git a/modules/features/stylix/catpuccin-mocha.nix b/modules/features/stylix/catpuccin-mocha.nix index 72ec097..ed93474 100644 --- a/modules/features/stylix/catpuccin-mocha.nix +++ b/modules/features/stylix/catpuccin-mocha.nix @@ -8,6 +8,7 @@ config, lib, pkgs, + user-parts, ... }: @@ -73,19 +74,19 @@ }; }; - home-manager.users.serenity = { + home-manager.users.${user-parts.user.username} = { # copies avatars from flake into home home.file."Avatars" = { source = ../../../assets/media/avatars; - target = "/home/serenity/Pictures/Avatars"; + target = "/home/${user-parts.user.username}/Pictures/Avatars"; recursive = true; }; # copies wallpapers from flake into home home.file."Wallpapers" = { source = ../../../assets/media/wallpapers; - target = "/home/serenity/Pictures/Wallpapers"; + target = "/home/${user-parts.user.username}/Pictures/Wallpapers"; recursive = true; }; diff --git a/modules/system/core.nix b/modules/system/core.nix index 3936a91..3bad178 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -5,7 +5,12 @@ # common module declaration flake.nixosModules.core = - { lib, pkgs, ... }: + { + lib, + pkgs, + user-parts, + ... + }: { @@ -65,7 +70,7 @@ ]; # configures disk automount service - home-manager.users.serenity = { + home-manager.users.${user-parts.user.username} = { services.udiskie = { enable = true; tray = "always";