From 08d0f5453ad1ed2efe7ec6fb79b2d091a891b3e9 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 4 Sep 2018 12:48:24 +0200
Subject: [PATCH] steveej-laptop: improve and canonicalize activation scripts

---
 nixos-configuration/steveej-laptop/system.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos-configuration/steveej-laptop/system.nix b/nixos-configuration/steveej-laptop/system.nix
index 85c41fb..e7c073e 100644
--- a/nixos-configuration/steveej-laptop/system.nix
+++ b/nixos-configuration/steveej-laptop/system.nix
@@ -294,19 +294,19 @@ rec {
   # Activation scripts for impure set up of paths in /
   system.activationScripts.bin = ''
     echo "setting up /bin..."
-    ln -sfn ${pkgs.bash}/bin/bash /tmp/.binbash
-    mv /tmp/.binbash /bin/bash
+    ln -sfT ${pkgs.bash}/bin/bash /bin/.bash
+    mv -Tf /bin/.bash /bin/bash
   '';
   system.activationScripts.etcX11sessinos = ''
     echo "setting up /etc/X11/sessions..."
     mkdir -p /etc/X11
-    [[ ! -L /etc/X11/sessions ]] || rm /etc/X11/sessions
-    ln -sf ${config.services.xserver.displayManager.session.desktops} /etc/X11/sessions
+    ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions
+    mv -Tf /etc/X11/.sessions /etc/X11/sessions
   '';
-
   system.activationScripts.lib64 = ''
     echo "setting up /lib64..."
     mkdir -p /lib64
-    ln -sf ${pkgs.stdenv.glibc}/lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
+    ln -sfT ${pkgs.stdenv.glibc}/lib/ld-linux-x86-64.so.2 /lib64/.ld-linux-x86-64.so.2
+    mv -Tf /lib64/.ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
   '';
 }