From a6eca476252bd514689aa0434cc6e3e11855e8d2 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Thu, 24 Nov 2022 03:24:32 +0100
Subject: [PATCH] Remove nixFlakes alias

---
 home-manager/roles/hotkeys.nix   | 2 +-
 nixos/roles/laminar/projects.nix | 4 ++--
 overlays/pkgSets.nix             | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix
index c56fba15..41f64c9b 100644
--- a/home-manager/roles/hotkeys.nix
+++ b/home-manager/roles/hotkeys.nix
@@ -17,7 +17,7 @@ in [
     Research = {
       Zotero = fork "zotero";
       Open = fork "evince ~/git/promotion/out/print.pdf";
-      Build = "sh -c 'cd ~/git/promotion; flix develop -c flix run'";
+      Build = "sh -c 'cd ~/git/promotion; nix develop -c nix run'";
       Directory = fork "footclient -d ~/git/promotion";
       Edit = edit_dir "~/git/promotion";
     };
diff --git a/nixos/roles/laminar/projects.nix b/nixos/roles/laminar/projects.nix
index 8d0b59f7..ff85537b 100644
--- a/nixos/roles/laminar/projects.nix
+++ b/nixos/roles/laminar/projects.nix
@@ -15,9 +15,9 @@
       if [[ -e "flake.nix" ]]; then
         echo "Flake detected."
         echo "Running 'flake check'"
-        ${pkgs.nixFlakes}/bin/flix flake check
+        ${pkgs.nix}/bin/nix flake check
         echo "Running 'nix build'"
-        ${pkgs.nixFlakes}/bin/flix build $FLAGS
+        ${pkgs.nix}/bin/nix build $FLAGS
       else
         echo "Building default.nix"
         nix-build $FLAGS
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index b20abadf..c4a17d85 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -67,7 +67,6 @@ self: super: {
       fdroidserver
       jq
       cachix
-      nixFlakes
       ;
   };