From cf657e16ffab115ca52cf85a34ca9e270af0a93c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 6 Jan 2019 02:05:48 +0100
Subject: [PATCH] nix: handle ref/rev correctly for channel fetch

---
 Justfile                                       |  1 +
 nix/default.nix                                |  3 ++-
 nix/os/devices/steveej-laptop/versions.nix     | 10 ++++++++++
 nix/os/devices/steveej-t480s-work/versions.nix | 10 ++++++++--
 nix/variables/versions.nix                     | 10 ++++++++--
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 nix/os/devices/steveej-laptop/versions.nix

diff --git a/Justfile b/Justfile
index 0095766..52e2e63 100755
--- a/Justfile
+++ b/Justfile
@@ -55,6 +55,7 @@ rebuild-this-device rebuildarg="dry-activate":
 
 	if type home-manager > /dev/null 2>&1; then
 		echo Rebuilding home in $(parse_hm_rebuildarg {{rebuildarg}})-mode...
+		source $(just -v _get_nix_path {{invocation_directory()}}/nix/os/devices/$(hostname -s)/versions.nix)
 		if home-manager -v $(parse_hm_rebuildarg {{rebuildarg}}) > ${HOMEREBUILD_LOG} 2>&1 ; then
 			echo Home rebuild successful
 		else
diff --git a/nix/default.nix b/nix/default.nix
index 6cb96b4..b2f3167 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -10,7 +10,8 @@
         url = "https://github.com/NixOS/nixpkgs-channels/";
         # Commit hash for nixos-unstable as of 2018-09-12
         # `git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable`
-        rev = (builtins.getAttr channel channelVersions);
+        ref = (builtins.getAttr channel channelVersions)."ref";
+        rev = (builtins.getAttr channel channelVersions)."rev";
         name = "nixpkgs-channels-${channel}";
       };
       nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [
diff --git a/nix/os/devices/steveej-laptop/versions.nix b/nix/os/devices/steveej-laptop/versions.nix
new file mode 100644
index 0000000..52734ca
--- /dev/null
+++ b/nix/os/devices/steveej-laptop/versions.nix
@@ -0,0 +1,10 @@
+{
+  channelsNixosStable = {
+    ref = "nixos-18.09";
+    rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
+  };
+  channelsNixosUnstable = {
+    ref = "nixos-unstable";
+    rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
+  };
+}
diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix
index 57f56b6..52734ca 100644
--- a/nix/os/devices/steveej-t480s-work/versions.nix
+++ b/nix/os/devices/steveej-t480s-work/versions.nix
@@ -1,4 +1,10 @@
 {
-  channelsNixosStable = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
-  channelsNixosUnstable = "44b02b52ea6a49674f124f50009299f192ed78bb";
+  channelsNixosStable = {
+    ref = "nixos-18.09";
+    rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
+  };
+  channelsNixosUnstable = {
+    ref = "nixos-unstable";
+    rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
+  };
 }
diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix
index 57f56b6..52734ca 100644
--- a/nix/variables/versions.nix
+++ b/nix/variables/versions.nix
@@ -1,4 +1,10 @@
 {
-  channelsNixosStable = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
-  channelsNixosUnstable = "44b02b52ea6a49674f124f50009299f192ed78bb";
+  channelsNixosStable = {
+    ref = "nixos-18.09";
+    rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
+  };
+  channelsNixosUnstable = {
+    ref = "nixos-unstable";
+    rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
+  };
 }