diff --git a/flake.lock b/flake.lock index 0451d18..ff92722 100644 --- a/flake.lock +++ b/flake.lock @@ -27,54 +27,9 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1728577371, - "narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "e5c8d2d50981a34602358d917e7be011b2c397a8", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, - "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" - } - }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], @@ -163,44 +118,7 @@ "type": "github" } }, - "flake-compat_4": { - "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-parts": { - "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-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -218,7 +136,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -307,12 +225,12 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1728778939, @@ -351,7 +269,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -419,7 +337,7 @@ "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" }, "original": { "type": "tarball", @@ -448,7 +366,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": [ "flake-parts" ], @@ -462,11 +380,11 @@ ] }, "locked": { - "lastModified": 1728886882, - "narHash": "sha256-cdvOC7opKjAJyX9n1WZJei/j0RTuhVOJoJBfeWrHKWQ=", + "lastModified": 1728972634, + "narHash": "sha256-FrJPsAhfn3xRzzAgVrwriY0ROUIQ6pDsSy2U7nVkYFQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "19773b896a25b0bf9cc113bd9709c1783b94485b", + "rev": "3454a11f09673a73649b5e8d9be5547f03320780", "type": "github" }, "original": { @@ -478,11 +396,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1728817913, - "narHash": "sha256-yPj2pPBLtKY/YqjY/iWC8fmU2LRdUBrIO5dcLpNPy6s=", + "lastModified": 1728948853, + "narHash": "sha256-IfCfZ4k8foOFOqSHxC0QW7NZx8bXDH2ruySZN4Gqqng=", "owner": "neovim", "repo": "neovim", - "rev": "36890824c7edb7bc5458062c14efbfa0b1d280b5", + "rev": "4846bf05dc639592c73135fb6f1a69f410c1c40f", "type": "github" }, "original": { @@ -575,11 +493,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728897630, - "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", + "lastModified": 1728984473, + "narHash": "sha256-eJ00CdiQCgB/icJhQLeeaIzX9U5E1auEb3rCw/+xHbw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", + "rev": "b7f91a266c7565a43ff95814b1b4f624559cf318", "type": "github" }, "original": { @@ -602,22 +520,6 @@ } }, "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-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -661,10 +563,9 @@ "root": { "inputs": { "agenix": "agenix", - "attic": "attic", "deploy-rs": "deploy-rs", "disko": "disko", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index 5588d3d..ce5dd96 100644 --- a/flake.nix +++ b/flake.nix @@ -59,11 +59,6 @@ }; }; - attic = { - url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; inputs = { @@ -97,7 +92,7 @@ }; tanker = import ./system/flakes/tanker.nix { - inherit (inputs) nixpkgs disko home-manager agenix attic; + inherit (inputs) nixpkgs disko home-manager agenix; inherit inputs; }; diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix index aa7fa14..04e95d0 100644 --- a/system/flakes/tanker.nix +++ b/system/flakes/tanker.nix @@ -1,4 +1,4 @@ -{ nixpkgs, disko, home-manager, agenix, attic, inputs, ... }: +{ nixpkgs, disko, home-manager, agenix, inputs, ... }: let default-system = "x86_64-linux"; @@ -49,8 +49,6 @@ in agenix.nixosModules.default - attic.nixosModules.atticd - ../hosts/tanker.nix ]; }; diff --git a/system/nixos/atticd.nix b/system/nixos/atticd.nix index b5519d8..f9d0db7 100644 --- a/system/nixos/atticd.nix +++ b/system/nixos/atticd.nix @@ -9,7 +9,7 @@ in services.atticd = { enable = true; - credentialsFile = config.age.secrets.atticd-environment.path; + environmentFile = config.age.secrets.atticd-environment.path; settings = { listen = "127.0.0.1:8080";