From 7e49ed2e1943d5e465c0ea8cdd75e766cf58b534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Tue, 28 Nov 2023 00:33:03 +0100
Subject: [PATCH] Reduce number of channels used

This was a fix attempt before I discovered that the issue was that
nixos-install uses the root user's channels. Doesn't hurt anyways.
---
 add_channels.sh | 3 +--
 curacao.nix     | 2 +-
 os/geoffrey.nix | 2 +-
 os/loader.nix   | 1 +
 pindakaas.nix   | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/add_channels.sh b/add_channels.sh
index aea4785..86094df 100755
--- a/add_channels.sh
+++ b/add_channels.sh
@@ -3,7 +3,6 @@
 # TODO Surely there's more elegant?
 
 nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs
+# Below probably only needed on non-NixOS
 nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
-# First commit before 23.05 release date:
-nix-channel --add https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz nixos-hardware
 nix-channel --update
diff --git a/curacao.nix b/curacao.nix
index 9285531..e02df95 100644
--- a/curacao.nix
+++ b/curacao.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    <nixos-hardware/dell/g3/3779>
+    "${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/dell/g3/3779"
     ./os/loader.nix
   ];
 
diff --git a/os/geoffrey.nix b/os/geoffrey.nix
index 5f5eb56..38c642b 100644
--- a/os/geoffrey.nix
+++ b/os/geoffrey.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 {
   imports = [
-    <home-manager/nixos>
+    "${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"}/nixos"
   ];
 
   users.users.geoffrey = {
diff --git a/os/loader.nix b/os/loader.nix
index cf9d18a..c60ff95 100644
--- a/os/loader.nix
+++ b/os/loader.nix
@@ -7,5 +7,6 @@
     ./common.nix
     ./desktop.nix
     ./wireless.nix
+    "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix"
   ];
 }
diff --git a/pindakaas.nix b/pindakaas.nix
index 7fbef93..08da534 100644
--- a/pindakaas.nix
+++ b/pindakaas.nix
@@ -1,7 +1,8 @@
 { pkgs, config, ... }:
 {
   imports = [
-    <nixos-hardware/pine64/pinebook-pro>
+    # First commit before 23.05 release date:
+    "${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/pine64/pinebook-pro"
     ./os/loader.nix
   ];
   # nixos-hardware use latest kernel by default. This obviously runs quickly out of sync with zfs packages.