chore: add nixpkgs-unstable as krops source

.versions/nixpkgs-unstable.json

@@ -1,7 +1,10 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "0ead6f8cfd461c3a366c8bc9893037afd89f798d",
+  "rev": "7c679678d6fd5e9b6a37155fa7b66228341dc4fa",
-  "date": "2020-10-27T18:30:26+01:00",
+  "date": "2021-05-03T12:47:27+01:00",
-  "sha256": "170kziw7bxfm4mwi8q5c2vdpayml0mini4zyxagbvbivivdj5hla",
+  "path": "/nix/store/j6sznqfiqsd39ra8rxm11pi52vis7aad-nixpkgs",
-  "fetchSubmodules": false
+  "sha256": "1yi897052cy9s1c9il3h8774jmch1p7clyg0b5jrpq1px6bd29rd",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
 }

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

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";

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; };

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;

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: {

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;

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";

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 = [