From f91f829f1df02e3d122d0b461ee4733d6cb50e2e Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 29 Sep 2022 12:36:36 +0200 Subject: [PATCH] add retiolum as flake --- flake.lock | 17 +++++++++++++++++ flake.nix | 8 +++++++- nixos/system/all/tinc.nix | 11 +---------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 7358db3..55db498 100644 --- a/flake.lock +++ b/flake.lock @@ -793,6 +793,22 @@ "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git" } }, + "retiolum": { + "flake": false, + "locked": { + "lastModified": 1664394335, + "narHash": "sha256-7dMfkp2+cwjzgzrSCsDzdktMha+SdPOm/jr49iOOkoI=", + "owner": "krebs", + "repo": "retiolum", + "rev": "86208b5a747d7aa661240b2d5c2f229f2ed76959", + "type": "github" + }, + "original": { + "owner": "krebs", + "repo": "retiolum", + "type": "github" + } + }, "revealjs": { "flake": false, "locked": { @@ -824,6 +840,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "polygon-art": "polygon-art", "private_assets": "private_assets", + "retiolum": "retiolum", "secrets": "secrets", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index 73014db..44dc3a9 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,11 @@ url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main"; flake = false; }; + retiolum = { + url = "github:krebs/retiolum"; + flake = false; + }; + }; outputs = @@ -74,6 +79,7 @@ , private_assets , secrets , sops-nix + , retiolum }: let system = "x86_64-linux"; @@ -128,7 +134,7 @@ ]; }; specialArgs = { - inherit private_assets; + inherit private_assets retiolum; }; }; diff --git a/nixos/system/all/tinc.nix b/nixos/system/all/tinc.nix index 3685b79..50d9ff7 100644 --- a/nixos/system/all/tinc.nix +++ b/nixos/system/all/tinc.nix @@ -1,13 +1,4 @@ -{ config, pkgs, lib, ... }: -let - - retiolum = pkgs.fetchgit { - url = "https://github.com/krebs/retiolum"; - rev = "5b067937a10ea43f88f14cc6e0a5485c2ddcc826"; - sha256 = "0kczrr6dr5dmhx2kbanw46w6ig2v3w42rqhjanv87xhwkgw81l08"; - }; - -in +{ config, pkgs, lib, retiolum, ... }: { imports = [ ../../modules ];