From 3dd2fe984607d3b7e9470032af1cbec1ed31d803 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 22:56:40 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index 1ebe5536..6b2f1ba4 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 1ebe553662f95c877acd716555aee404af994420
+Subproject commit 6b2f1ba42459b7a3b62502baab88997613178d7e
-- 
cgit v1.2.3


From 0c56b240b4882e27e5bc8da6c77a3ebfea129569 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:06:29 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index 6b2f1ba4..5262d988 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 6b2f1ba42459b7a3b62502baab88997613178d7e
+Subproject commit 5262d988777e45cb76a53da781bab4242594516b
-- 
cgit v1.2.3


From a5ddf80061c46fff19295ffa56c2e84393c7a411 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:12:58 +0200
Subject: =?UTF-8?q?Support=20for=20libP=C3=B6ttering=20(he=20doesn=C2=B4t?=
 =?UTF-8?q?=20like=20symlinks)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom/dotfiles.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/dotfiles.nix b/custom/dotfiles.nix
index c6e22e92..305794da 100644
--- a/custom/dotfiles.nix
+++ b/custom/dotfiles.nix
@@ -17,7 +17,8 @@ let
     value = ''
       cd ${dotfiles}
       ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ${coreutils}/bin/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 \( -not -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name.dir}/{}"
+      ${findutils}/bin/find . -type f \( -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- cp -f "${dotfiles}/{}" "${name.dir}/{}"
       ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- chown -h "${name.owner}:${name.group}" "${name.dir}/{}"
     '';
   };
-- 
cgit v1.2.3


From cbcc1e432846f2c88215b123428867a3ec035467 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:14:20 +0200
Subject: cp should overwrite existing symlinks

---
 custom/dotfiles.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/dotfiles.nix b/custom/dotfiles.nix
index 305794da..f96675e1 100644
--- a/custom/dotfiles.nix
+++ b/custom/dotfiles.nix
@@ -18,7 +18,7 @@ let
       cd ${dotfiles}
       ${findutils}/bin/find . -type d -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ${coreutils}/bin/install -o ${name.owner} -g ${name.group} -d "${name.dir}/{}"
       ${findutils}/bin/find . -type f \( -not -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- ln -s -f "${dotfiles}/{}" "${name.dir}/{}"
-      ${findutils}/bin/find . -type f \( -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- cp -f "${dotfiles}/{}" "${name.dir}/{}"
+      ${findutils}/bin/find . -type f \( -path './.config/systemd/*' \) -print0 | ${findutils}/bin/xargs -0 -I '{}' -- cp --remove-destination "${dotfiles}/{}" "${name.dir}/{}"
       ${findutils}/bin/find . -type f -print0 | ${findutils}/bin/xargs -0 -I '{}' -- chown -h "${name.owner}:${name.group}" "${name.dir}/{}"
     '';
   };
-- 
cgit v1.2.3


From d05cad13570daaf6793d22df056ce3f4edeb1646 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:17:24 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index 5262d988..640d38ab 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 5262d988777e45cb76a53da781bab4242594516b
+Subproject commit 640d38abbc4302d08721624f49d56641af751ab4
-- 
cgit v1.2.3


From 961f02710c203ca980d0c458f0f14755643459d3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:22:28 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index 640d38ab..ef6720c0 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 640d38abbc4302d08721624f49d56641af751ab4
+Subproject commit ef6720c055c91c75b1f00467bbcead6ff52d23d5
-- 
cgit v1.2.3


From 8385114dfdc983cdc1ed77142c94f9d19baf7ca0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:23:45 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index ef6720c0..f730cf5e 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit ef6720c055c91c75b1f00467bbcead6ff52d23d5
+Subproject commit f730cf5e57ae33ddef1b74c2ee9a9386e51e9ea8
-- 
cgit v1.2.3


From 02a097c4897145fd4bfd6490eb873f2a9c05b170 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jul 2015 23:25:02 +0200
Subject: Bump in dotfiles

---
 dotfiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles b/dotfiles
index f730cf5e..7e14dc64 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit f730cf5e57ae33ddef1b74c2ee9a9386e51e9ea8
+Subproject commit 7e14dc64630e39adf884f229a57b5431fec434a5
-- 
cgit v1.2.3