diff --git a/config/services/atticd.nix b/config/services/atticd.nix index d240a32f..b5382df6 100644 --- a/config/services/atticd.nix +++ b/config/services/atticd.nix @@ -9,7 +9,6 @@ imports = [attic.nixosModules.atticd]; services.atticd = { enable = true; - package = nix-packages.packages.${system}.attic-server; credentialsFile = config.sops.secrets."services/attic".path; settings = { listen = "[::1]:57448"; diff --git a/flake.lock b/flake.lock index c94efce6..17eeb885 100644 --- a/flake.lock +++ b/flake.lock @@ -22,34 +22,6 @@ "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": { "inputs": { "flake-compat": "flake-compat_2", @@ -166,33 +138,27 @@ }, "crane_2": { "inputs": { - "flake-compat": [ - "nix-packages", - "attic", - "flake-compat" - ], + "flake-compat": "flake-compat_3", "flake-utils": [ - "nix-packages", - "attic", "flake-utils" ], "nixpkgs": [ - "nix-packages", - "attic", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { - "lastModified": 1672095661, - "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", - "owner": "ipetkov", + "lastModified": 1674934931, + "narHash": "sha256-TmGfRDBK7EkR0VY8Jr0WU4WdyzZxiXDGVGUzIXPFXRI=", + "owner": "DarkKirb", "repo": "crane", - "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", + "rev": "42c3f329daa267857c6bc6d21c9eec468e97e2d7", "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "DarkKirb", "repo": "crane", "type": "github" } @@ -632,7 +598,9 @@ }, "nix-packages": { "inputs": { - "attic": "attic_2", + "attic": [ + "attic" + ], "flake-compat": "flake-compat_4", "flake-utils": [ "flake-utils" @@ -752,22 +720,6 @@ "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": { "locked": { "lastModified": 1674096995, @@ -857,6 +809,7 @@ "attic": "attic", "cargo2nix": "cargo2nix", "chir-rs": "chir-rs", + "crane": "crane_2", "dns": "dns", "ema": "ema", "emanote": "emanote", @@ -872,7 +825,7 @@ "nixpkgs-noto-variable": "nixpkgs-noto-variable", "nur": "nur", "prismmc": "prismmc", - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_3", "sops-nix": "sops-nix", "tomlplusplus": "tomlplusplus" } @@ -930,35 +883,6 @@ } }, "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": { "flake-utils": [ "flake-utils" diff --git a/flake.nix b/flake.nix index 0edab2dc..13a63249 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,12 @@ rec { inputs.flake-utils.follows = "flake-utils"; 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 = { url = "github:DarkKirb/dns.nix"; inputs.flake-utils.follows = "flake-utils"; @@ -57,7 +63,7 @@ rec { }; nix-packages = { url = "github:DarkKirb/nix-packages"; - #inputs.attic.follows = "attic"; + inputs.attic.follows = "attic"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; };