From f8df6790bb82a00b3900c6066595b5d62c63ee75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 5 Oct 2023 01:00:40 +0200 Subject: Remove unused flakes --- systems/dilion/flake.lock | 43 +----- systems/dilion/flake.nix | 2 - systems/eldiron/flake.lock | 233 ++++++++++++++--------------- systems/eldiron/flake.nix | 4 +- systems/eldiron/websites/tools/default.nix | 5 + 5 files changed, 117 insertions(+), 170 deletions(-) (limited to 'systems') diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock index 7301a99..b6aef70 100644 --- a/systems/dilion/flake.lock +++ b/systems/dilion/flake.lock @@ -92,18 +92,6 @@ "type": "path" } }, - "environment_4": { - "locked": { - "lastModified": 1, - "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", - "path": "../environment", - "type": "path" - }, - "original": { - "path": "../environment", - "type": "path" - } - }, "files-watcher": { "locked": { "lastModified": 1, @@ -546,7 +534,6 @@ "myuids": "myuids", "nixpkgs": "nixpkgs_5", "secrets": "secrets_2", - "ssh": "ssh", "system": "system" } }, @@ -586,34 +573,6 @@ "type": "path" } }, - "secrets_3": { - "locked": { - "lastModified": 1, - "narHash": "sha256-5AakznhrJFmwCD7lr4JEh55MtdAJL6WA/YuBks6ISSE=", - "path": "../../secrets", - "type": "path" - }, - "original": { - "path": "../../secrets", - "type": "path" - } - }, - "ssh": { - "inputs": { - "environment": "environment_3", - "secrets": "secrets_3" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-NufDaV9j3eKqlJNs09lqytKDTuwjh4Wh78mOEyID05w=", - "path": "../../flakes/private/ssh", - "type": "path" - }, - "original": { - "path": "../../flakes/private/ssh", - "type": "path" - } - }, "stable": { "locked": { "lastModified": 1669735802, @@ -633,7 +592,7 @@ "system": { "inputs": { "backports": "backports", - "environment": "environment_4", + "environment": "environment_3", "mypackages": "mypackages", "myuids": "myuids_2", "secrets-public": "secrets-public" diff --git a/systems/dilion/flake.nix b/systems/dilion/flake.nix index 9747086..e4fc53f 100644 --- a/systems/dilion/flake.nix +++ b/systems/dilion/flake.nix @@ -5,7 +5,6 @@ my-lib.url = "path:../../flakes/lib"; monitoring.url = "path:../../flakes/private/monitoring"; - ssh.url = "path:../../flakes/private/ssh"; environment.url = "path:../../flakes/private/environment"; system.url = "path:../../flakes/private/system"; @@ -26,7 +25,6 @@ system = inputs.system.nixosModule; monitoring = inputs.monitoring.nixosModule; environment = inputs.environment.nixosModule; - ssh = inputs.ssh.nixosModule; myuids = inputs.myuids.nixosModule; secrets = inputs.secrets.nixosModule; diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 0573b0e..c52dd61 100644 --- a/systems/eldiron/flake.lock +++ b/systems/eldiron/flake.lock @@ -2,8 +2,8 @@ "nodes": { "backports": { "inputs": { - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_15" + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1, @@ -404,11 +404,11 @@ }, "flake-utils_10": { "locked": { - "lastModified": 1610051610, - "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "flake-utils_11": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -434,11 +434,11 @@ }, "flake-utils_12": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -449,11 +449,11 @@ }, "flake-utils_13": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "flake-utils_17": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "flake-utils_18": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1609246779, + "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "flake-utils_20": { "locked": { - "lastModified": 1609246779, - "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -704,11 +704,11 @@ }, "flake-utils_8": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -808,7 +808,7 @@ "mypackages": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "webapps-ttrss": "webapps-ttrss" }, "locked": { @@ -825,7 +825,7 @@ "mypackages_2": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "webapps-ttrss": "webapps-ttrss_2" }, "locked": { @@ -842,7 +842,7 @@ "mypackages_3": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_20", "webapps-ttrss": "webapps-ttrss_3" }, "locked": { @@ -1299,21 +1299,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1631570365, - "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "df7113c0727881519248d4c7d080324e0ee3327b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1611097871, "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", @@ -1328,7 +1313,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1611097871, "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", @@ -1343,7 +1328,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "flake": false, "locked": { "lastModified": 1596265691, @@ -1360,7 +1345,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1687502512, "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", @@ -1376,7 +1361,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1646497237, "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", @@ -1392,7 +1377,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1633901457, "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", @@ -1407,7 +1392,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "flake": false, "locked": { "lastModified": 1596265691, @@ -1424,7 +1409,7 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1646497237, "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", @@ -1440,40 +1425,40 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { + "flake": false, "locked": { - "lastModified": 1687701825, - "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", "type": "github" } }, - "nixpkgs_20": { - "flake": false, + "nixpkgs_2": { "locked": { - "lastModified": 1596265691, - "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "lastModified": 1687701825, + "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_20": { "locked": { "lastModified": 1646497237, "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", @@ -1489,7 +1474,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_21": { "flake": false, "locked": { "lastModified": 1596265691, @@ -1506,7 +1491,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_22": { "flake": false, "locked": { "lastModified": 1596265691, @@ -1523,7 +1508,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_23": { "flake": false, "locked": { "lastModified": 1596265691, @@ -1540,7 +1525,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_24": { "locked": { "lastModified": 1646497237, "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", @@ -1556,7 +1541,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_25": { "locked": { "lastModified": 1597943282, "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", @@ -1571,7 +1556,7 @@ "type": "github" } }, - "nixpkgs_27": { + "nixpkgs_26": { "locked": { "lastModified": 1597943282, "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", @@ -1586,6 +1571,21 @@ "type": "github" } }, + "nixpkgs_27": { + "locked": { + "lastModified": 1631570365, + "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_28": { "locked": { "lastModified": 1611097871, @@ -1878,22 +1878,6 @@ "type": "path" } }, - "paste": { - "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-a6rqBy5/ePeKhqag8K7FtOHpYLur3Z6Yzk7uCqH522A=", - "path": "../../paste", - "type": "path" - }, - "original": { - "path": "../../paste", - "type": "path" - } - }, "peertube": { "flake": false, "locked": { @@ -1948,9 +1932,9 @@ }, "peertube_open_instance": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "myuids": "myuids_5", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "peertube": "peertube" }, "locked": { @@ -1966,9 +1950,9 @@ }, "peertube_origin": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "myuids": "myuids_6", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "peertube": "peertube_2" }, "locked": { @@ -2110,21 +2094,6 @@ "type": "path" } }, - "private-paste": { - "inputs": { - "paste": "paste" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-w8WnrSJj05Y8hJsJfY46sI6PUSg2xo5h9t0zWP4woog=", - "path": "../../flakes/private/paste", - "type": "path" - }, - "original": { - "path": "../../flakes/private/paste", - "type": "path" - } - }, "private-peertube": { "inputs": { "peertube_open_instance": "peertube_open_instance", @@ -2143,8 +2112,8 @@ }, "private-ports": { "inputs": { - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_14", + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_13", "nixpkgs-4": "nixpkgs-4" }, "locked": { @@ -2196,8 +2165,8 @@ "public-copanier": { "inputs": { "copanier": "copanier", - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_17" + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1, @@ -2213,9 +2182,9 @@ "public-diaspora": { "inputs": { "diaspora": "diaspora", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_13", "myuids": "myuids_8", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1, @@ -2231,9 +2200,9 @@ "public-etherpad-lite": { "inputs": { "etherpad-lite": "etherpad-lite", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_14", "mypackages": "mypackages_2", - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1, @@ -2272,10 +2241,10 @@ }, "public-grocy": { "inputs": { - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_15", "grocy": "grocy", "mypackages": "mypackages_3", - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1, @@ -2302,10 +2271,10 @@ }, "public-mastodon": { "inputs": { - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_16", "mastodon": "mastodon", "myuids": "myuids_9", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1, @@ -2320,10 +2289,10 @@ }, "public-mediagoblin": { "inputs": { - "flake-utils": "flake-utils_18", + "flake-utils": "flake-utils_17", "mediagoblin": "mediagoblin", "myuids": "myuids_10", - "nixpkgs": "nixpkgs_24" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1, @@ -2355,7 +2324,7 @@ "public-mypackages": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_25", + "nixpkgs": "nixpkgs_24", "webapps-ttrss": "webapps-ttrss_4" }, "locked": { @@ -2383,9 +2352,9 @@ }, "public-openarc": { "inputs": { - "flake-utils": "flake-utils_19", + "flake-utils": "flake-utils_18", "myuids": "myuids_12", - "nixpkgs": "nixpkgs_26", + "nixpkgs": "nixpkgs_25", "openarc": "openarc_5" }, "locked": { @@ -2401,9 +2370,9 @@ }, "public-opendmarc": { "inputs": { - "flake-utils": "flake-utils_20", + "flake-utils": "flake-utils_19", "myuids": "myuids_13", - "nixpkgs": "nixpkgs_27" + "nixpkgs": "nixpkgs_26" }, "locked": { "lastModified": 1, @@ -2416,6 +2385,22 @@ "type": "path" } }, + "public-paste": { + "inputs": { + "flake-utils": "flake-utils_20", + "nixpkgs": "nixpkgs_27" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-a6rqBy5/ePeKhqag8K7FtOHpYLur3Z6Yzk7uCqH522A=", + "path": "../../flakes/paste", + "type": "path" + }, + "original": { + "path": "../../flakes/paste", + "type": "path" + } + }, "public-peertube": { "inputs": { "flake-utils": "flake-utils_21", @@ -2494,7 +2479,6 @@ "private-openarc": "private-openarc", "private-opendmarc": "private-opendmarc", "private-openldap": "private-openldap", - "private-paste": "private-paste", "private-peertube": "private-peertube", "private-ports": "private-ports", "private-ssh": "private-ssh", @@ -2513,6 +2497,7 @@ "public-myuids": "public-myuids", "public-openarc": "public-openarc", "public-opendmarc": "public-opendmarc", + "public-paste": "public-paste", "public-peertube": "public-peertube", "public-secrets": "public-secrets", "public-surfer": "public-surfer", diff --git a/systems/eldiron/flake.nix b/systems/eldiron/flake.nix index c126d0b..205571f 100644 --- a/systems/eldiron/flake.nix +++ b/systems/eldiron/flake.nix @@ -23,6 +23,7 @@ public-mypackages.url = "path:../../flakes/mypackages"; public-loginctl-linger.url = "path:../../flakes/loginctl-linger"; public-multi-apache-container.url = "path:../../flakes/multi-apache-container"; + public-paste.url = "path:../../flakes/paste"; public-taskwarrior-web.url = "path:../../flakes/taskwarrior-web"; private-peertube.url = "path:../../flakes/private/peertube"; @@ -34,7 +35,6 @@ private-opendmarc.url = "path:../../flakes/private/opendmarc"; private-milters.url = "path:../../flakes/private/milters"; private-monitoring.url = "path:../../flakes/private/monitoring"; - private-paste.url = "path:../../flakes/private/paste"; private-ssh.url = "path:../../flakes/private/ssh"; private-chatons.url = "path:../../flakes/private/chatons"; private-system.url = "path:../../flakes/private/system"; @@ -59,6 +59,7 @@ peertube = public-peertube.nixosModule; diaspora = public-diaspora.nixosModule; fiche = public-fiche.nixosModule; + paste = public-paste.nixosModule; environment = private-environment.nixosModule; openarc = private-openarc.nixosModule; @@ -67,7 +68,6 @@ chatons = private-chatons.nixosModule; system = private-system.nixosModule; monitoring = private-monitoring.nixosModule; - paste = private-paste.nixosModule; milters = private-milters.nixosModule; }; moduleArgs = with inputs; { diff --git a/systems/eldiron/websites/tools/default.nix b/systems/eldiron/websites/tools/default.nix index 4d9e3c1..397b644 100644 --- a/systems/eldiron/websites/tools/default.nix +++ b/systems/eldiron/websites/tools/default.nix @@ -383,6 +383,11 @@ in { paths = [ config.secrets.fullPaths."mpd" ]; }; + services.paste = { + enable = true; + webDirectory = "/paste"; + }; + services.phpfpm.pools = { tools = { user = "wwwrun"; -- cgit v1.2.3