From 3bc9128dfc0c7b7e5d14239b875eef41eb634670 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 14 Jun 2022 13:02:59 +0000 Subject: refactor(3p): fetch impermanence via niv Change-Id: Ic6bc463304643a7f983a5f7c182f95a7706ca35b Reviewed-on: https://cl.tvl.fyi/c/depot/+/5868 Reviewed-by: tazjin Reviewed-by: sterni Autosubmit: tazjin Tested-by: BuildkiteCI --- third_party/impermanence/default.nix | 12 ------------ third_party/sources/sources.json | 12 ++++++++++++ users/tazjin/home/shared.nix | 2 +- users/tazjin/nixos/modules/persistence.nix | 2 +- users/tazjin/nixos/zamalek/default.nix | 1 - 5 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 third_party/impermanence/default.nix diff --git a/third_party/impermanence/default.nix b/third_party/impermanence/default.nix deleted file mode 100644 index 6ef72e4943..0000000000 --- a/third_party/impermanence/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# NixOS modules for systems with ephemeral root disks. -# -# https://github.com/nix-community/impermanence - -{ pkgs, ... }: - -pkgs.fetchFromGitHub { - owner = "nix-community"; - repo = "impermanence"; - rev = "58558845bc68dcf2bb32caa80564f7fe3f6cbc61"; - sha256 = "10z3g4knkvq838zbfq71pkfyl8cffrpavna448wf5mjscycp0gnv"; -} diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 901b2ccfea..a8310c63ad 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -23,6 +23,18 @@ "url": "https://github.com/nix-community/emacs-overlay/archive/29dcfbc1b29ae7281e95367e0f2358b44224a46e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "impermanence": { + "branch": "master", + "description": "Modules to help you handle persistent state on systems with ephemeral root storage [maintainer=@talyz]", + "homepage": "", + "owner": "nix-community", + "repo": "impermanence", + "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4", + "sha256": "0x7mwbqj1h3rym93hy1knxd33dzspmy5i7y1k930vg85yp3a1y8q", + "type": "tarball", + "url": "https://github.com/nix-community/impermanence/archive/2f39baeb7d039fda5fc8225111bb79474138e6f4.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "naersk": { "branch": "master", "description": "Build rust crates in Nix. No configuration, no code generation, no IFD. Sandbox friendly. [maintainer: @Patryk27]", diff --git a/users/tazjin/home/shared.nix b/users/tazjin/home/shared.nix index 03c7ee10b7..2fd17cdc0b 100644 --- a/users/tazjin/home/shared.nix +++ b/users/tazjin/home/shared.nix @@ -4,7 +4,7 @@ { config, lib, ... }: # home-manager { - imports = [ "${depot.third_party.impermanence}/home-manager.nix" ]; + imports = [ (depot.third_party.sources.impermanence + "/home-manager.nix") ]; home.persistence."/persist/tazjin/home" = { allowOther = true; diff --git a/users/tazjin/nixos/modules/persistence.nix b/users/tazjin/nixos/modules/persistence.nix index c81958161f..5ed3683740 100644 --- a/users/tazjin/nixos/modules/persistence.nix +++ b/users/tazjin/nixos/modules/persistence.nix @@ -3,7 +3,7 @@ { imports = [ - "${depot.third_party.impermanence}/nixos.nix" + (depot.third_party.sources.impermanence + "/nixos.nix") ]; environment.persistence."/persist" = { diff --git a/users/tazjin/nixos/zamalek/default.nix b/users/tazjin/nixos/zamalek/default.nix index e29623e815..f832b0cdec 100644 --- a/users/tazjin/nixos/zamalek/default.nix +++ b/users/tazjin/nixos/zamalek/default.nix @@ -22,7 +22,6 @@ in (usermod "physical.nix") (usermod "zerotier.nix") - (depot.third_party.impermanence + "/nixos.nix") (pkgs.home-manager.src + "/nixos") ] ++ lib.optional (builtins.pathExists ./local-config.nix) ./local-config.nix; -- cgit 1.4.1