From e716081479a8388496e1a56bf7c7a30f26ef50dd Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 20 Nov 2021 14:36:07 +0000
Subject: [PATCH] Nix 2.4 fix, tf-nix update, auto-git-pull

---
 config/profiles/base/nix.nix | 9 +++------
 config/tf                    | 2 +-
 nix/sources.json             | 6 +++---
 shell.nix                    | 1 +
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/config/profiles/base/nix.nix b/config/profiles/base/nix.nix
index 15d11359..9b890b9f 100644
--- a/config/profiles/base/nix.nix
+++ b/config/profiles/base/nix.nix
@@ -4,13 +4,10 @@
   boot.loader.grub.configurationLimit = 8;
   boot.loader.systemd-boot.configurationLimit = 8;
 
-  environment.systemPackages = [
-    (pkgs.writeShellScriptBin "nixFlakes" ''
-      exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
-    '')
-  ];
-
   nix = {
+    extraOptions = lib.optionalString (lib.versionAtLeast config.nix.package.version "2.4") ''
+        experimental-features = nix-command flakes
+    '';
     nixPath = [
       "nixpkgs=${sources.nixpkgs}"
       "nur=${sources.nur}"
diff --git a/config/tf b/config/tf
index 465d7ba2..51fafb2e 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 465d7ba25cd26d438f19d14ff9df7592cb6e89c4
+Subproject commit 51fafb2e4e5e19f8ae1ee1617b8b012dafc14443
diff --git a/nix/sources.json b/nix/sources.json
index 130b8cbd..f22d66ff 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -171,10 +171,10 @@
         "homepage": null,
         "owner": "arcnmx",
         "repo": "tf-nix",
-        "rev": "778ac1da6674bd2cdabe5e8929d3356d5bc44cb6",
-        "sha256": "1j652yjmc0xikx3c2cqx86mai7y8ji4va512z6xdvnlw3w6i5rhj",
+        "rev": "2e8642b7be0b63807d73a168ea880521de1e83b6",
+        "sha256": "0zfi7aglchia0b4qkp9qplklmabzkxlz5bl5pfjb574xq85prmn2",
         "type": "tarball",
-        "url": "https://github.com/arcnmx/tf-nix/archive/778ac1da6674bd2cdabe5e8929d3356d5bc44cb6.tar.gz",
+        "url": "https://github.com/arcnmx/tf-nix/archive/2e8642b7be0b63807d73a168ea880521de1e83b6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/shell.nix b/shell.nix
index 64a46b56..bc668419 100644
--- a/shell.nix
+++ b/shell.nix
@@ -70,6 +70,7 @@ with lib; pkgs.mkShell {
     export HOME_USER=$(id -un)
     export CI_PLATFORM="impure"
     export NIX_PATH="$NIX_PATH:home=${toString ./.}"
+    git pull
   '';
 }