From ea450ca4dfb2527a6264ab2ed61acc41c3862354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Thu, 1 May 2025 22:12:27 +0200 Subject: [PATCH] flake: move attic to flake=false --- flake.lock | 104 +++----------------------------------------- flake.nix | 5 +-- modules/default.nix | 9 +++- 3 files changed, 15 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index 83eddda..14086e8 100644 --- a/flake.lock +++ b/flake.lock @@ -44,22 +44,7 @@ } }, "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "lix": [ - "lix" - ], - "lix-module": [ - "lix-module" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, + "flake": false, "locked": { "lastModified": 1742679462, "narHash": "sha256-L9q9KDqiJEREM/GRnSo4vB9VCvclmdRT9vXuFwBmb9Y=", @@ -108,6 +93,7 @@ } }, "crane": { + "flake": false, "locked": { "lastModified": 1745454774, "narHash": "sha256-oLvmxOnsEKGtwczxp/CwhrfmQUG2ym24OMWowcoRhH8=", @@ -123,7 +109,6 @@ } }, "crane_2": { - "flake": false, "locked": { "lastModified": 1745454774, "narHash": "sha256-oLvmxOnsEKGtwczxp/CwhrfmQUG2ym24OMWowcoRhH8=", @@ -200,22 +185,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -232,27 +201,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -425,7 +373,7 @@ "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], @@ -447,7 +395,7 @@ }, "niko-nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs" }, "locked": { @@ -480,27 +428,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737420293, - "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1723603349, @@ -544,22 +471,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1743259260, @@ -602,7 +513,7 @@ "agenix": "agenix", "attic": "attic", "conduit-src": "conduit-src", - "crane": "crane_2", + "crane": "crane", "darwin": "darwin", "disko": "disko", "firefox-darwin": "firefox-darwin", @@ -792,10 +703,7 @@ }, "zjstatus": { "inputs": { - "crane": [ - "attic", - "crane" - ], + "crane": "crane_2", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 15190f9..4df88d5 100644 --- a/flake.nix +++ b/flake.nix @@ -56,9 +56,7 @@ }; attic = { url = "git+https://git.lix.systems/nrabulinski/attic.git"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - inputs.lix-module.follows = "lix-module"; + flake = false; }; crane = { url = "github:ipetkov/crane"; @@ -71,7 +69,6 @@ zjstatus = { url = "github:dj95/zjstatus"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.crane.follows = "attic/crane"; }; lix = { url = "git+https://git.lix.systems/lix-project/lix.git"; diff --git a/modules/default.nix b/modules/default.nix index 867871e..4b28fee 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -25,12 +25,19 @@ in inputs.disko.nixosModules.disko inputs.mailserver.nixosModules.default inputs.home-manager.nixosModules.home-manager - inputs.attic.nixosModules.atticd + "${inputs.attic}/nixos/atticd.nix" inputs.lix-module.nixosModules.default { disabledModules = [ "services/networking/atticd.nix" ]; + services.atticd.useFlakeCompatOverlay = false; + nixpkgs.overlays = [ + (final: _: { + attic-client = config.packages.attic-client.result.${final.system}; + attic-server = config.packages.attic-server.result.${final.system}; + }) + ]; } ]; };