From de6408f28f996307bc9c0c1315efbc35fa1040bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sat, 31 Dec 2022 10:40:38 +0100 Subject: [PATCH] feat: use @Mic92 retiolum module the old one did this: building '/nix/store/gqvr8gl8ayj9kgjnfr23ax0xpc3rnc34-unit-tinc.retiolum.service.drv'... error: executing '/nix/store/4xw8n979xpivdc46a9ndcvyhwgif00hz-bash-5.1-p16/bin/bash': Argument list too long error: builder for '/nix/store/gqvr8gl8ayj9kgjnfr23ax0xpc3rnc34-unit-tinc.retiolum.service.drv' failed with exit code 1 error: 1 dependencies of derivation '/nix/store/v2ld4847xyb49v7wjb3fvf6lkg2j755b-system-units.drv' failed to build error: 1 dependencies of derivation '/nix/store/bbl9qidw9z0gz56z7yrhfkxsawk5qi7x-etc.drv' failed to build --- configs/retiolum.nix | 2 +- flake.lock | 45 +++++++++++++++---------------- flake.nix | 7 ++--- modules/default.nix | 7 ----- systems/ful/configuration.nix | 2 +- systems/makanek/configuration.nix | 2 +- systems/tabula/configuration.nix | 2 +- systems/tahina/configuration.nix | 2 +- systems/zaatar/configuration.nix | 2 +- 9 files changed, 30 insertions(+), 41 deletions(-) delete mode 100644 modules/default.nix diff --git a/configs/retiolum.nix b/configs/retiolum.nix index 8b43e20..aaa6f7a 100644 --- a/configs/retiolum.nix +++ b/configs/retiolum.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - + ]; networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];}; diff --git a/flake.lock b/flake.lock index 3c30642..f37da6b 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671831633, - "narHash": "sha256-tANQOkJnlqK4M83KvvXFMFrIbR0xkloqXY5ruqzR3kE=", + "lastModified": 1672349765, + "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7eee202e597bc7789498a8664082cf0ffedaa8f", + "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1671752829, - "narHash": "sha256-oFeJzAq0iRL6md9Si8Tx9bltjwjLmldvgUmAteMhYW4=", + "lastModified": 1672353432, + "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9898811c658d39b2692d0ab744377e02fd85d08b", + "rev": "913a47cd064cc06440ea84e5e0452039a85781f0", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "type": "github" }, "original": { @@ -157,19 +157,18 @@ } }, "retiolum": { - "flake": false, "locked": { - "lastModified": 1671456454, - "narHash": "sha256-UzNs+lOqrAOzMf9EdcEZsuvjZnBKgPmmoyiwM81EaTQ=", - "owner": "krebs", - "repo": "retiolum", - "rev": "20ad3544d80690791bed8a639d08848924a7aaa9", - "type": "github" + "lastModified": 1672359952, + "narHash": "sha256-LtjHkpWpI6BmKDFJcq8hIdrgvWUwR735ghyFkv57Ycw=", + "ref": "refs/heads/master", + "rev": "ba72b3c271867111d3d5e006c11c643dd7547d34", + "revCount": 264, + "type": "git", + "url": "https://git.thalheim.io/Mic92/retiolum" }, "original": { - "owner": "krebs", - "repo": "retiolum", - "type": "github" + "type": "git", + "url": "https://git.thalheim.io/Mic92/retiolum" } }, "root": { @@ -211,11 +210,11 @@ "stockholm": { "flake": false, "locked": { - "lastModified": 1671927857, - "narHash": "sha256-eZBh840OWQn1TIN7Fc9agLvaGMUT+6r2CcOgibBVwKE=", + "lastModified": 1672442705, + "narHash": "sha256-rvI3X92HXsBH0+nVm0K+lPfbobZDkkhXSa2RmNu8EA8=", "ref": "refs/heads/master", - "rev": "6e13334579f16940edb1182662d9ac58e57aba0e", - "revCount": 11109, + "rev": "de0226995d553e4a70170ce59483a6d71f41932d", + "revCount": 11156, "type": "git", "url": "https://cgit.lassul.us/stockholm" }, diff --git a/flake.nix b/flake.nix index 105bc36..0457f0c 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ inputs.nixpkgs.follows = "nixos-stable"; inputs.flake-utils.follows = "flake-utils"; }; + retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum"; # legacy menstruation-backend = { @@ -33,10 +34,6 @@ url = "github:kmein/recht"; flake = false; }; - retiolum = { - url = "github:krebs/retiolum"; - flake = false; - }; scripts = { url = "github:kmein/scripts"; flake = false; @@ -129,7 +126,7 @@ nixos-unstable = github "NixOS/nixpkgs"; nix-writers = "https://cgit.krebsco.de/nix-writers"; recht = github "kmein/recht"; - retiolum = github "krebs/retiolum"; + retiolum = "https://git.thalheim.io/Mic92/retiolum"; stockholm = "https://cgit.lassul.us/stockholm"; scripts = github "kmein/scripts"; telebots = github "kmein/telebots"; diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 91edbbd..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./constants.nix - ./dropbox.nix - ./retiolum.nix - ]; -} diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix index a83c1ee..f3cb4dc 100644 --- a/systems/ful/configuration.nix +++ b/systems/ful/configuration.nix @@ -13,7 +13,7 @@ in { - + ]; nix.nixPath = ["/var/src"]; diff --git a/systems/makanek/configuration.nix b/systems/makanek/configuration.nix index aa65e5e..1bddeb5 100644 --- a/systems/makanek/configuration.nix +++ b/systems/makanek/configuration.nix @@ -29,7 +29,7 @@ in { - + ]; diff --git a/systems/tabula/configuration.nix b/systems/tabula/configuration.nix index a740cde..d33a3d1 100644 --- a/systems/tabula/configuration.nix +++ b/systems/tabula/configuration.nix @@ -8,7 +8,7 @@ in { imports = [ ./hardware-configuration.nix - + ]; diff --git a/systems/tahina/configuration.nix b/systems/tahina/configuration.nix index cd826f7..fea875a 100644 --- a/systems/tahina/configuration.nix +++ b/systems/tahina/configuration.nix @@ -8,7 +8,7 @@ in { imports = [ ./hardware-configuration.nix - + ]; diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix index ade92d7..22036e8 100644 --- a/systems/zaatar/configuration.nix +++ b/systems/zaatar/configuration.nix @@ -27,7 +27,7 @@ in { # - + ]; services.restic.backups.moodle-dl = {