From b7d47ddd3710772ea082cdae51e492b10c50b500 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Mon, 7 Feb 2022 00:58:06 +0000
Subject: [PATCH 1/2] Use nixos-rebuild switch instead of
 switch-to-configuration

This fixes https://github.com/MatthewCroughan/nixinate/issues/5
---
 flake.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 356e41e..775472d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,8 +22,6 @@
               SSH_USER=${flake.nixosConfigurations.${machine}._module.args.nixinate.sshUser}
               SSH_HOST=${flake.nixosConfigurations.${machine}._module.args.nixinate.host}
               BUILD_ON=${flake.nixosConfigurations.${machine}._module.args.nixinate.buildOn}
-              SYSTEM_CLOSURE=${flake}#nixosConfigurations.${machine}.config.system.build.toplevel
-              
               echo "🚀 Deploying nixosConfigurations.${machine} from ${flake}"
               echo "👤 SSH User: $SSH_USER"
               echo "🌐 SSH Host: $SSH_HOST"
@@ -33,11 +31,8 @@
                 echo "🤞 Activating configuration on ${machine} via ssh:"
                 ( set -x; ${final.openssh}/bin/ssh -t $SSH_USER@$SSH_HOST 'sudo nixos-rebuild switch --flake /tmp/nixcfg#${machine}' )
               elif [ $BUILD_ON = "local" ]; then
-                echo "🔨 Building system closure locally and copying it to remote store:"
-                ( set -x; ${final.nixFlakes}/bin/nix copy --to ssh://$SSH_USER@$SSH_HOST $SYSTEM_CLOSURE )
-                echo "🤞 Activating configuration on ${machine} via ssh:"
-                SYSTEM_CLOSURE_PATH=$(${final.nixFlakes}/bin/nix path-info $SYSTEM_CLOSURE)
-                ( set -x; ${final.openssh}/bin/ssh -t $SSH_USER@$SSH_HOST "sudo $SYSTEM_CLOSURE_PATH/bin/switch-to-configuration switch" )
+                echo "🔨 Building system closure locally, copying it to remote store and activating it:"
+                ( set -x; NIX_SSHOPTS="-t" ${final.nixos-rebuild}/bin/nixos-rebuild switch --flake ${flake}#${machine} --target-host $SSH_USER@$SSH_HOST --use-remote-sudo )
               else
                 echo "_module.args.nixinate.buildOn is not set to a valid value of 'local' or 'remote'"
               fi

From 07a62f362bfb575aa410566c09e13e468f60ff73 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Mon, 7 Feb 2022 00:59:29 +0000
Subject: [PATCH 2/2] Use nixos-unstable

This is required to make nixos-rebuild work with flakes.
---
 flake.lock | 8 ++++----
 flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 207452d..975daaa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -63,16 +63,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1640887906,
-        "narHash": "sha256-Eupk1UlNicCD2UNZuEKt6yhE6kFWAxXM/HyziOjG9CA=",
+        "lastModified": 1643852787,
+        "narHash": "sha256-RHrvroV61jcfTXfW0Rwc0qu/8lHmfYxSy49adyXkB0I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd",
+        "rev": "76e3df7c0687d5b9ff31431fd4ee4d4cd07a4b2f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 775472d..ef29de3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Nixinate your systems 🕶️";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     examples.url = "path:./examples";
   };
   outputs = { self, nixpkgs, examples, ... }: