From 26b7c5f336fe163a4c8de3aa6049d783ed3b6395 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 24 Oct 2024 13:51:45 +0200 Subject: [PATCH] nix-cache: attic module is now in nixpkgs --- flake.lock | 163 ++++----------------------- flake.nix | 5 - lib/default.nix | 2 - machines/nix-cache/configuration.nix | 4 +- users/erwin/home.nix | 2 +- 5 files changed, 27 insertions(+), 149 deletions(-) diff --git a/flake.lock b/flake.lock index d973577..eff542d 100644 --- a/flake.lock +++ b/flake.lock @@ -22,28 +22,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729116596, - "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "caddy-with-plugins": { "inputs": { "flake-parts": [ @@ -72,7 +50,7 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" @@ -94,27 +72,6 @@ } }, "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" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "git-fs-monitor", @@ -135,9 +92,9 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": [ "ha-now-playing", "flake-utils" @@ -165,7 +122,7 @@ "type": "github" } }, - "crane_4": { + "crane_3": { "inputs": { "nixpkgs": [ "pamedia", @@ -214,7 +171,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1729735549, @@ -232,7 +189,7 @@ }, "eww": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -255,22 +212,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, @@ -286,7 +227,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "locked": { "lastModified": 1709944340, "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=", @@ -302,7 +243,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696267196, @@ -318,7 +259,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -356,27 +297,6 @@ } }, "flake-parts_2": { - "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_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -429,7 +349,7 @@ }, "git-fs-monitor": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-parts": [ "flake-parts" ], @@ -481,7 +401,7 @@ }, "ha-now-playing": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-utils": [ "flake-utils" ], @@ -632,16 +552,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", - "owner": "NixOS", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -659,22 +579,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": 1729449015, "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", @@ -690,7 +594,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -706,7 +610,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1729357638, "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", @@ -722,25 +626,9 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pamedia": { "inputs": { - "crane": "crane_4", + "crane": "crane_3", "flake-parts": [ "flake-parts" ], @@ -768,12 +656,12 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1729104314, @@ -792,13 +680,12 @@ "root": { "inputs": { "anyrun": "anyrun", - "attic": "attic", "caddy-with-plugins": "caddy-with-plugins", "colmena": "colmena", "disko": "disko", "emacs-overlay": "emacs-overlay", "eww": "eww", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", "git-fs-monitor": "git-fs-monitor", "ha-now-playing": "ha-now-playing", @@ -808,7 +695,7 @@ "nil": "nil", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pamedia": "pamedia", "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": "rust-overlay", @@ -841,7 +728,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1729695320, diff --git a/flake.nix b/flake.nix index 4451b04..070f47d 100644 --- a/flake.nix +++ b/flake.nix @@ -87,11 +87,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - attic = { - url = "github:zhaofengli/attic"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - colmena = { url = "github:zhaofengli/colmena"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/default.nix b/lib/default.nix index 440df3f..d7f3cd2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -23,13 +23,11 @@ rec { [ self.overlays.default inputs.rust-overlay.overlays.default - inputs.attic.overlays.default inputs.emacs-overlay.overlay inputs.eww.overlays.default inputs.nil.overlays.default inputs.ha-now-playing.overlays.${system} inputs.pamedia.overlays.default - # inputs.atuin.overlays.default ] ++ nixpkgs.lib.optional (system == "aarch64-linux") ( _final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); } diff --git a/machines/nix-cache/configuration.nix b/machines/nix-cache/configuration.nix index 7be5afe..f98ac8f 100644 --- a/machines/nix-cache/configuration.nix +++ b/machines/nix-cache/configuration.nix @@ -1,6 +1,5 @@ { self, - attic, caddy-with-plugins, ... }: @@ -14,7 +13,6 @@ { imports = [ (modulesPath + "/virtualisation/lxc-container.nix") - attic.nixosModules.atticd ../../users/root ../../users/erwin ]; @@ -101,7 +99,7 @@ atticd = { enable = true; - credentialsFile = config.sops.secrets.attic-credentials.path; + environmentFile = config.sops.secrets.attic-credentials.path; settings = { listen = "127.0.0.1:8080"; diff --git a/users/erwin/home.nix b/users/erwin/home.nix index c253bfd..9b8a3cf 100644 --- a/users/erwin/home.nix +++ b/users/erwin/home.nix @@ -198,7 +198,7 @@ in [ amdgpu_top atool - inputs.attic.packages.${pkgs.system}.attic-client + attic-client bitwarden-cli blink1-tool bottles