2 files changed, 11 insertions, 4 deletions

diff --git a/custom/dotfiles.nix b/custom/dotfiles.nix
index 3c438e27..08952c39 100644
--- a/custom/dotfiles.nix
+++ b/custom/dotfiles.nix
@@ -1,6 +1,7 @@
 { fetchgit
 , lib
 , findutils
+, coreutils
 }:
 
 let
@@ -11,11 +12,12 @@ let
     sha256 = "62a16cb79b0491b49fcfb3c03904cf8f83bf03aeeb1bff285a66bb15efd3a4e1";
   });
   setupUser = name : {
-    inherit name;
+    name = name.dir;
     value = ''
       cd ${dotfiles}
-      ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- mkdir -p "${name}/{}"
-      ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name}/{}"
+      ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ${coreutils}/install -o ${name.owner} -g ${name.group} -d "${name.dir}/{}"
+      ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name.dir}/{}"
+      ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- chown "${name.owner}:${name.group}" "${name.dir}/{}"
     '';
   };
 in
diff --git a/vali.nix b/vali.nix
index fe88f401..b1a866ff 100644
--- a/vali.nix
+++ b/vali.nix
@@ -75,7 +75,12 @@ rec {
 
   system.activationScripts = let
     setupUsers = pkgs.callPackage custom/dotfiles.nix {};
-    in setupUsers [ "/home/gkleen" ];
+    toRec = name : {
+      dir = "/home/${name}";
+      owner = name;
+      group = "users";
+    };
+    in setupUsers (builtins.map toRec [ "gkleen" ]);
 
   services.xserver = {
     windowManager.xmonad = {