This commit is contained in:
Charlotte 🦝 Delenk 2023-01-28 21:18:18 +01:00
parent ec25fe79de
commit b94f291908
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 21 additions and 92 deletions

View file

@ -9,7 +9,6 @@
imports = [attic.nixosModules.atticd]; imports = [attic.nixosModules.atticd];
services.atticd = { services.atticd = {
enable = true; enable = true;
package = nix-packages.packages.${system}.attic-server;
credentialsFile = config.sops.secrets."services/attic".path; credentialsFile = config.sops.secrets."services/attic".path;
settings = { settings = {
listen = "[::1]:57448"; listen = "[::1]:57448";

View file

@ -22,34 +22,6 @@
"type": "github" "type": "github"
} }
}, },
"attic_2": {
"inputs": {
"crane": "crane_2",
"flake-compat": "flake-compat_3",
"flake-utils": [
"nix-packages",
"flake-utils"
],
"nixpkgs": [
"nix-packages",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1674800265,
"narHash": "sha256-i9D3Ne4ktffiNfyM+jp7dOhRDkktm2SgtBCxkkFZP5E=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "54d93ff61f98639d41d7897f7059aacabcb07772",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"cargo2nix": { "cargo2nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -166,33 +138,27 @@
}, },
"crane_2": { "crane_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": "flake-compat_3",
"nix-packages",
"attic",
"flake-compat"
],
"flake-utils": [ "flake-utils": [
"nix-packages",
"attic",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nix-packages",
"attic",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_3" "rust-overlay": [
"rust-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1672095661, "lastModified": 1674934931,
"narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", "narHash": "sha256-TmGfRDBK7EkR0VY8Jr0WU4WdyzZxiXDGVGUzIXPFXRI=",
"owner": "ipetkov", "owner": "DarkKirb",
"repo": "crane", "repo": "crane",
"rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", "rev": "42c3f329daa267857c6bc6d21c9eec468e97e2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ipetkov", "owner": "DarkKirb",
"repo": "crane", "repo": "crane",
"type": "github" "type": "github"
} }
@ -632,7 +598,9 @@
}, },
"nix-packages": { "nix-packages": {
"inputs": { "inputs": {
"attic": "attic_2", "attic": [
"attic"
],
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
@ -752,22 +720,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1673800717,
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1674096995, "lastModified": 1674096995,
@ -857,6 +809,7 @@
"attic": "attic", "attic": "attic",
"cargo2nix": "cargo2nix", "cargo2nix": "cargo2nix",
"chir-rs": "chir-rs", "chir-rs": "chir-rs",
"crane": "crane_2",
"dns": "dns", "dns": "dns",
"ema": "ema", "ema": "ema",
"emanote": "emanote", "emanote": "emanote",
@ -872,7 +825,7 @@
"nixpkgs-noto-variable": "nixpkgs-noto-variable", "nixpkgs-noto-variable": "nixpkgs-noto-variable",
"nur": "nur", "nur": "nur",
"prismmc": "prismmc", "prismmc": "prismmc",
"rust-overlay": "rust-overlay_4", "rust-overlay": "rust-overlay_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"tomlplusplus": "tomlplusplus" "tomlplusplus": "tomlplusplus"
} }
@ -930,35 +883,6 @@
} }
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": {
"flake-utils": [
"nix-packages",
"attic",
"crane",
"flake-utils"
],
"nixpkgs": [
"nix-packages",
"attic",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670034122,
"narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_4": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"

View file

@ -23,6 +23,12 @@ rec {
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
crane = {
url = "github:DarkKirb/crane";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
};
dns = { dns = {
url = "github:DarkKirb/dns.nix"; url = "github:DarkKirb/dns.nix";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
@ -57,7 +63,7 @@ rec {
}; };
nix-packages = { nix-packages = {
url = "github:DarkKirb/nix-packages"; url = "github:DarkKirb/nix-packages";
#inputs.attic.follows = "attic"; inputs.attic.follows = "attic";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };