fix: getattic working

Seems to have been mainstreamed
This commit is contained in:
silver 2024-11-01 13:35:33 +00:00
parent 3abcd9837f
commit 0d7d8ee3e2
Signed by: silver
GPG key ID: 36F93D61BAD3FD7D
3 changed files with 85 additions and 223 deletions

View file

@ -15,7 +15,6 @@ https://docs.attic.rs/introduction.html
lib,
config,
pkgs,
inputs,
...
}:
with lib; let
@ -23,7 +22,6 @@ with lib; let
cfg = config.services.skynet."${name}";
in {
imports = [
inputs.attic.nixosModules.atticd
];
options.services.skynet."${name}" = {
@ -53,7 +51,7 @@ in {
enable = true;
# Replace with absolute path to your credentials file
credentialsFile = "/etc/atticd.env";
environmentFile = "/etc/atticd.env";
settings = {
listen = "127.0.0.1:8080";

View file

@ -47,7 +47,7 @@
"inputs": {
"fenix": "fenix_2",
"flakeCompat": "flakeCompat_2",
"nixpkgs": "nixpkgs_19"
"nixpkgs": "nixpkgs_18"
},
"locked": {
"lastModified": 1719514321,
@ -84,33 +84,10 @@
"type": "github"
}
},
"attic": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_3",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1730257295,
"narHash": "sha256-OQl+aAsKiyygvpzck1u0sZf/R4T9zM903CgNDFmmzA8=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "48c8b395bfbc6b76c7eae74df6c74351255a095c",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"bfom": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_5",
"utils": "utils"
},
"locked": {
@ -145,9 +122,9 @@
},
"colmena": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"stable": "stable"
},
"locked": {
@ -167,7 +144,7 @@
"compsoc_public": {
"inputs": {
"bfom": "bfom",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_6",
"utils": "utils_2"
},
"locked": {
@ -184,27 +161,6 @@
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722960479,
"narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
"owner": "ipetkov",
"repo": "crane",
"rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -273,22 +229,6 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@ -304,7 +244,7 @@
"type": "github"
}
},
"flake-compat_3": {
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -362,27 +302,6 @@
"type": "indirect"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@ -579,7 +498,7 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1713520724,
@ -597,7 +516,7 @@
},
"naersk_2": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1721727458,
@ -615,7 +534,7 @@
},
"naersk_3": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1686572087,
@ -631,27 +550,6 @@
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1703013332,
@ -683,38 +581,7 @@
"type": "indirect"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1722995383,
"narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1687011986,
"narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=",
@ -728,7 +595,7 @@
"type": "indirect"
}
},
"nixpkgs_12": {
"nixpkgs_11": {
"locked": {
"lastModified": 1686921029,
"narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
@ -743,7 +610,7 @@
"type": "indirect"
}
},
"nixpkgs_13": {
"nixpkgs_12": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
@ -757,7 +624,7 @@
"type": "indirect"
}
},
"nixpkgs_14": {
"nixpkgs_13": {
"locked": {
"lastModified": 1724114134,
"narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=",
@ -771,7 +638,7 @@
"type": "indirect"
}
},
"nixpkgs_15": {
"nixpkgs_14": {
"locked": {
"lastModified": 1690026219,
"narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
@ -785,6 +652,20 @@
"type": "indirect"
}
},
"nixpkgs_15": {
"locked": {
"lastModified": 1689935543,
"narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_16": {
"locked": {
"lastModified": 1689935543,
@ -800,20 +681,6 @@
}
},
"nixpkgs_17": {
"locked": {
"lastModified": 1689935543,
"narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_18": {
"locked": {
"lastModified": 1695978539,
"narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
@ -827,7 +694,7 @@
"type": "indirect"
}
},
"nixpkgs_19": {
"nixpkgs_18": {
"locked": {
"lastModified": 1668226844,
"narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=",
@ -843,6 +710,20 @@
"type": "github"
}
},
"nixpkgs_19": {
"locked": {
"lastModified": 1724395761,
"narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1722630782,
@ -859,37 +740,7 @@
"type": "github"
}
},
"nixpkgs_20": {
"locked": {
"lastModified": 1724395761,
"narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1726042813,
"narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "159be5db480d1df880a0135ca0bfed84c2f88353",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@ -905,6 +756,20 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1714091391,
@ -920,20 +785,6 @@
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
@ -947,7 +798,7 @@
"type": "indirect"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
@ -962,7 +813,7 @@
"type": "indirect"
}
},
"nixpkgs_9": {
"nixpkgs_8": {
"locked": {
"lastModified": 1723151389,
"narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
@ -976,18 +827,32 @@
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1722995383,
"narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"agenix": "agenix",
"alejandra": "alejandra",
"arion": "arion",
"attic": "attic",
"colmena": "colmena",
"compsoc_public": "compsoc_public",
"flake-utils": "flake-utils_2",
"lix": "lix",
"lix-module": "lix-module",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_7",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"skynet_discord_bot": "skynet_discord_bot",
"skynet_ldap_backend": "skynet_ldap_backend",
@ -1037,7 +902,7 @@
"simple-nixos-mailserver": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
],
@ -1060,7 +925,7 @@
"skynet_discord_bot": {
"inputs": {
"naersk": "naersk_2",
"nixpkgs": "nixpkgs_10",
"nixpkgs": "nixpkgs_9",
"utils": "utils_3"
},
"locked": {
@ -1080,7 +945,7 @@
"skynet_ldap_backend": {
"inputs": {
"naersk": "naersk_3",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_11",
"utils": "utils_4"
},
"locked": {
@ -1099,7 +964,7 @@
},
"skynet_ldap_frontend": {
"inputs": {
"nixpkgs": "nixpkgs_13",
"nixpkgs": "nixpkgs_12",
"utils": "utils_5"
},
"locked": {
@ -1118,7 +983,7 @@
},
"skynet_website": {
"inputs": {
"nixpkgs": "nixpkgs_14",
"nixpkgs": "nixpkgs_13",
"utils": "utils_6"
},
"locked": {
@ -1137,7 +1002,7 @@
},
"skynet_website_2009": {
"inputs": {
"nixpkgs": "nixpkgs_15",
"nixpkgs": "nixpkgs_14",
"utils": "utils_7"
},
"locked": {
@ -1156,7 +1021,7 @@
},
"skynet_website_2017": {
"inputs": {
"nixpkgs": "nixpkgs_16",
"nixpkgs": "nixpkgs_15",
"utils": "utils_8"
},
"locked": {
@ -1175,7 +1040,7 @@
},
"skynet_website_2023": {
"inputs": {
"nixpkgs": "nixpkgs_17",
"nixpkgs": "nixpkgs_16",
"utils": "utils_9"
},
"locked": {
@ -1194,7 +1059,7 @@
},
"skynet_website_games": {
"inputs": {
"nixpkgs": "nixpkgs_18",
"nixpkgs": "nixpkgs_17",
"utils": "utils_10"
},
"locked": {
@ -1214,7 +1079,7 @@
"skynet_website_wiki": {
"inputs": {
"alejandra": "alejandra_2",
"nixpkgs": "nixpkgs_20",
"nixpkgs": "nixpkgs_19",
"utils": "utils_11"
},
"locked": {

View file

@ -27,7 +27,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
colmena.url = "github:zhaofengli/colmena";
attic.url = "github:zhaofengli/attic";
# we host our own
simple-nixos-mailserver = {