summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-07-16 11:05:31 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-07-16 11:05:31 +0200
commitda267a7cf4459ce35901c83e3423fff7767244a0 (patch)
treeeef931d583c80f38bcbfd0599b7f4cefa7e8733e
parent7d963a85f3e7e0a111d9bc50b7447356c955d28d (diff)
parent02a097c4897145fd4bfd6490eb873f2a9c05b170 (diff)
downloadnixos-da267a7cf4459ce35901c83e3423fff7767244a0.tar
nixos-da267a7cf4459ce35901c83e3423fff7767244a0.tar.gz
nixos-da267a7cf4459ce35901c83e3423fff7767244a0.tar.bz2
nixos-da267a7cf4459ce35901c83e3423fff7767244a0.tar.xz
nixos-da267a7cf4459ce35901c83e3423fff7767244a0.zip
Merge branch 'master' of git.yggdrasil.li:nixos
-rw-r--r--custom/dotfiles.nix3
m---------dotfiles0
2 files changed, 2 insertions, 1 deletions
diff --git a/custom/dotfiles.nix b/custom/dotfiles.nix
index c6e22e92..f96675e1 100644
--- a/custom/dotfiles.nix
+++ b/custom/dotfiles.nix
@@ -17,7 +17,8 @@ let
17 value = '' 17 value = ''
18 cd ${dotfiles} 18 cd ${dotfiles}
19 ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ${coreutils}/bin/install -o ${name.owner} -g ${name.group} -d "${name.dir}/{}" 19 ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ${coreutils}/bin/install -o ${name.owner} -g ${name.group} -d "${name.dir}/{}"
20 ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name.dir}/{}" 20 ${findutils}/bin/find . -type f \( -not -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name.dir}/{}"
21 ${findutils}/bin/find . -type f \( -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- cp --remove-destination "${dotfiles}/{}" "${name.dir}/{}"
21 ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- chown -h "${name.owner}:${name.group}" "${name.dir}/{}" 22 ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- chown -h "${name.owner}:${name.group}" "${name.dir}/{}"
22 ''; 23 '';
23 }; 24 };
diff --git a/dotfiles b/dotfiles
Subproject 1ebe553662f95c877acd716555aee404af99442 Subproject 7e14dc64630e39adf884f229a57b5431fec434a