From 80e91d1685a67bbaa465faf7ac382e011658e431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Mon, 3 May 2021 14:32:34 +0200
Subject: [PATCH] chore: add nixpkgs-unstable as krops source

---
 .versions/nixpkgs-unstable.json | 11 +++++++----
 configs/packages/default.nix    |  2 +-
 configs/packages/writing.nix    |  2 +-
 configs/radio.nix               |  4 +++-
 deploy.nix                      |  1 +
 lib/default.nix                 |  6 ------
 modules/retiolum.nix            |  3 ---
 shell.nix                       |  5 +++++
 systems/wilde/configuration.nix |  2 +-
 9 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.versions/nixpkgs-unstable.json b/.versions/nixpkgs-unstable.json
index dc727e0..744cb20 100644
--- a/.versions/nixpkgs-unstable.json
+++ b/.versions/nixpkgs-unstable.json
@@ -1,7 +1,10 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "0ead6f8cfd461c3a366c8bc9893037afd89f798d",
-  "date": "2020-10-27T18:30:26+01:00",
-  "sha256": "170kziw7bxfm4mwi8q5c2vdpayml0mini4zyxagbvbivivdj5hla",
-  "fetchSubmodules": false
+  "rev": "7c679678d6fd5e9b6a37155fa7b66228341dc4fa",
+  "date": "2021-05-03T12:47:27+01:00",
+  "path": "/nix/store/j6sznqfiqsd39ra8rxm11pi52vis7aad-nixpkgs",
+  "sha256": "1yi897052cy9s1c9il3h8774jmch1p7clyg0b5jrpq1px6bd29rd",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
 }
diff --git a/configs/packages/default.nix b/configs/packages/default.nix
index 8178d0a..170f94a 100644
--- a/configs/packages/default.nix
+++ b/configs/packages/default.nix
@@ -2,7 +2,7 @@
 let
   hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
   worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
-  inherit (import <niveum/lib>) nixpkgs-unstable;
+  nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
 in {
   imports = [
     ./krebs.nix
diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix
index 4b35990..89c188b 100644
--- a/configs/packages/writing.nix
+++ b/configs/packages/writing.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 let
-  inherit (import <niveum/lib>) nixpkgs-unstable;
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
 
   zoteroStyle = { name, sha256 }: {
     name = "${name}.csl";
diff --git a/configs/radio.nix b/configs/radio.nix
index 21e10b9..8657b26 100644
--- a/configs/radio.nix
+++ b/configs/radio.nix
@@ -1,6 +1,8 @@
 { lib, pkgs, config, ... }:
 let
-  inherit (import <niveum/lib>) nixpkgs-unstable tmpfilesConfig;
+  inherit (import <niveum/lib>) tmpfilesConfig;
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
+
   radioStore = "/var/lib/radio";
   htgenPort = 8080;
   meddl = { streamPort = 8000; mpdPort = 6600; };
diff --git a/deploy.nix b/deploy.nix
index a2060e1..118b20c 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -19,6 +19,7 @@ let
       nixos-config.symlink = "system/configuration.nix";
 
       nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
+      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
       home-manager.git = gitFromJson .versions/home-manager.json;
       stockholm.git = gitFromJson .versions/stockholm.json;
       retiolum.git = gitFromJson .versions/retiolum.json;
diff --git a/lib/default.nix b/lib/default.nix
index 9b3ddc5..e3d2818 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,10 +1,4 @@
 rec {
-  nixpkgs-src = builtins.fetchGit {
-    url = "https://github.com/NixOS/nixpkgs";
-    rev = "7c679678d6fd5e9b6a37155fa7b66228341dc4fa";
-  };
-  nixpkgs-unstable = import nixpkgs-src { config.allowUnfree = true; };
-
   tmpfilesConfig = {type, path, mode ? "-", user ? "-", group ? "-", age ? "-", argument ? "-"}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
 
   firewall = lib: {
diff --git a/modules/retiolum.nix b/modules/retiolum.nix
index c2e19b0..bb7db0d 100644
--- a/modules/retiolum.nix
+++ b/modules/retiolum.nix
@@ -4,9 +4,6 @@ let
   netname = "retiolum";
   cfg = config.networking.retiolum;
 in {
-  imports = [ "${(import <niveum/lib>).nixpkgs-src}/nixos/modules/services/networking/tinc.nix" ];
-  disabledModules = [ "services/networking/tinc.nix" ];
-
   options = {
     networking.retiolum.ipv4 = mkOption {
       type = types.str;
diff --git a/shell.nix b/shell.nix
index b525a1a..979ef66 100644
--- a/shell.nix
+++ b/shell.nix
@@ -10,6 +10,11 @@ let
       url = "https://github.com/NixOS/nixpkgs.git";
       path = toString .versions/nixpkgs.json;
     };
+    nixpkgs-unstable = {
+      ref = "refs/heads/master";
+      url = "https://github.com/NixOS/nixpkgs.git";
+      path = toString .versions/nixpkgs-unstable.json;
+    };
     home-manager = {
       ref = "refs/heads/release-${release}";
       url = "https://github.com/nix-community/home-manager.git";
diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix
index a187d81..13f10cd 100644
--- a/systems/wilde/configuration.nix
+++ b/systems/wilde/configuration.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (import <niveum/lib>) nixpkgs-unstable;
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
 in
 {
   imports = [