From 3f7f9ceeadd4120584801f0c5ba84d0fd654d1e8 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Thu, 18 Aug 2022 23:15:50 +0200
Subject: [PATCH] Use unstable nix tool

---
 flake.lock       | 22 +++++++++++++++++++---
 flake.nix        | 21 ++++++++++++++++++++-
 hosts/common.nix |  4 ++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4e999ce..13feaca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,11 +67,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660496378,
-        "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=",
+        "lastModified": 1660581366,
+        "narHash": "sha256-et+bi9/jlSF/pHx5AYB9ZP2XDdZEQ0vnF7xlvs4503Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b",
+        "rev": "3d47bbaa26e7a771059d828eecf3bd8bf28a8b0f",
         "type": "github"
       },
       "original": {
@@ -87,6 +87,7 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "secrets": "secrets",
+        "unstable-nixpkgs": "unstable-nixpkgs",
         "vscode-server": "vscode-server",
         "website": "website"
       }
@@ -111,6 +112,21 @@
         "url": "file:///home/h7x4/git/nix-secrets"
       }
     },
+    "unstable-nixpkgs": {
+      "locked": {
+        "lastModified": 1660646295,
+        "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "762b003329510ea855b4097a37511eb19c7077f0",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
     "vscode-server": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 0c0a2bf..fa16496 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.05";
+    unstable-nixpkgs.url = "nixpkgs/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-22.05";
@@ -44,6 +45,7 @@
   outputs = inputs@{
     self,
     nixpkgs,
+    unstable-nixpkgs,
     home-manager,
     vscode-server,
     secrets,
@@ -65,6 +67,17 @@
       overlays = [ self.overlays.lib ];
     };
 
+    unstable-pkgs = import unstable-nixpkgs {
+      inherit system;
+
+      config = {
+        allowUnfree = true;
+        android_sdk.accept_license = true;
+      };
+
+      overlays = [ self.overlays.lib ];
+    };
+
   in {
     overlays = {
       lib = import ./overlays/lib;
@@ -111,7 +124,13 @@
             ./hosts/common.nix
             ./hosts/${name}/configuration.nix
             "${vscode-server}/default.nix"
-            { config._module.args = { inherit inputs; secrets = secrets.outputs.default; }; }
+            {
+              config._module.args = {
+                inherit inputs;
+                inherit unstable-pkgs;
+                secrets = secrets.outputs.default;
+              };
+            }
           ];
         };
     in {
diff --git a/hosts/common.nix b/hosts/common.nix
index 61dea7e..c295a89 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, inputs, secrets, ... }:
+{ pkgs, unstable-pkgs, config, inputs, secrets, ... }:
 let
   inherit (pkgs) lib;
   # inherit (specialArgs) machineVars;
@@ -10,7 +10,7 @@ in {
   };
 
   nix = {
-    package = pkgs.nixFlakes;
+    package = unstable-pkgs.nixFlakes;
     distributedBuilds = config.networking.hostName != "Tsuki";
     binaryCaches = [
       "https://cache.nixos.org/"