From 5e609627254ab82499d15f54174856de0276e00a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 7 Mar 2022 17:13:18 +0100
Subject: [PATCH] Enable flakes

---
 home-manager/roles/default.nix | 6 +++++-
 nixos/roles/default.nix        | 1 +
 overlays/pkgSets.nix           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix
index bd6ea77d..4f6e5987 100644
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@@ -41,8 +41,12 @@
     direnv = {
       enable = true;
       enableZshIntegration = true;
-      nix-direnv.enable = true;
+      nix-direnv = {
+        enable = true;
+        enableFlakes = true;
+      };
     };
+
     tmux = {
       enable = true;
       escapeTime = 1;
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 330a4c31..f9ad505e 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -64,6 +64,7 @@
     trustedUsers = [ "maralorn" "laminar" ];
     buildMachines = pkgs.privateValue [ ] "remote-builders";
     extraOptions = ''
+      experimental-features = nix-command flakes
       fallback = true
       auto-optimise-store = true
       builders-use-substitutes = true
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 8e6fad9e..8340ffa5 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -1,6 +1,6 @@
 self: super: {
   # pkgs assumed to be present on a non nixos host
-  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
+  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --log-format bar-with-logs "$@"'';
   core-system-pkgs = {
     inherit (self)
       gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping