From d1abf63abbc8bdef0ab2cef277ef1f0ea9242f39 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 27 Sep 2022 02:01:38 +0200
Subject: [PATCH] s/nixFlakes/nix/

---
 README.md                          | 11 -----------
 hosts/hydra/updater.nix            |  2 +-
 hosts/server10/microvm-staging.nix |  2 +-
 modules/autoupdate.nix             |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 997368b2..9dcad625 100644
--- a/README.md
+++ b/README.md
@@ -34,16 +34,6 @@ Make sure you have access.
 
 > Nix Flakes ist gegenwärtig bei Nix (Version 20.09) noch keine standardmäßige Funktionalität für Nix. Die Bereitstellung der Kommandos für Nix Flakes müssen als experimentelle Funktionalität für das Kommando ''nix'' festgelegt werden, um sie verfügbar zu machen.
 
-A Nix environment with Nix Flakes support is required.
-
-### Temporary Shell with Nix Flakes
-
-Set up an environment (with the common command [nix-shell](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html)) in which the [package *nixFlakes*](https://search.nixos.org/packages?query=nixflakes) (for Nix Flakes) is available and jump into it
-
-```bash
-nix-shell -p nixFlakes
-```
-
 Set some configuration (do this only once):
 
 ```bash
@@ -56,7 +46,6 @@ set this to your NixOS configuration:
 ```nix
 { pkgs, ... }: {
   nix = {
-    package = pkgs.nixFlakes;
     extraOptions = "experimental-features = nix-command flakes";
   };
 }
diff --git a/hosts/hydra/updater.nix b/hosts/hydra/updater.nix
index be843d0a..5bd0335a 100644
--- a/hosts/hydra/updater.nix
+++ b/hosts/hydra/updater.nix
@@ -17,7 +17,7 @@ in
     # Timer-triggered service that updates flake.lock and pushes to a branch to be picked up by Hydra.
     services.updater = {
       wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ git nixFlakes curl openssh ];
+      path = with pkgs; [ git nix curl openssh ];
       script = ''
         git config --global user.email "astro@spaceboyz.net"
         git config --global user.name "Astrobot"
diff --git a/hosts/server10/microvm-staging.nix b/hosts/server10/microvm-staging.nix
index 4031b354..8b93162b 100644
--- a/hosts/server10/microvm-staging.nix
+++ b/hosts/server10/microvm-staging.nix
@@ -60,7 +60,7 @@ in
       serviceConfig = {
         Type = "oneshot";
       };
-      path = with pkgs; [ nixFlakes git ];
+      path = with pkgs; [ nix git ];
       environment.HOME = config.users.users.root.home;
       scriptArgs = "%i";
       script = ''
diff --git a/modules/autoupdate.nix b/modules/autoupdate.nix
index eb8b3302..f31a249a 100644
--- a/modules/autoupdate.nix
+++ b/modules/autoupdate.nix
@@ -18,7 +18,7 @@
     # for the first time.
     systemd.services.autoupdate = lib.mkIf config.c3d2.autoUpdate {
       wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ nixFlakes nettools curl jq ];
+      path = with pkgs; [ nix nettools curl jq ];
       serviceConfig = {
         Type = "oneshot";
         # switch-to-configuration may not return. HACK: cap running