From 69354bbd3af8a82543c25f83ba21a9de9c897570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 2 Jun 2021 08:53:35 +0200 Subject: [PATCH] feat: add nur via krops --- .versions/nur.json | 10 ++++++++++ configs/default.nix | 5 +---- deploy.nix | 1 + shell.nix | 5 +++++ 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 .versions/nur.json diff --git a/.versions/nur.json b/.versions/nur.json new file mode 100644 index 0000000..889b5be --- /dev/null +++ b/.versions/nur.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/nix-community/NUR", + "rev": "57e32d3d8923ade143426ccf1bfbcf4f52f34975", + "date": "2021-06-02T04:12:55+00:00", + "path": "/nix/store/aqzka9m16d5zkxk8jqa31b40gfmq6a8d-NUR", + "sha256": "0y8y28w7g091h4h85prbzvrggdag3nan27563wi00805zyr9wslj", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/configs/default.nix b/configs/default.nix index b2c1ab1..c0bb44d 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -21,10 +21,7 @@ in { config = { allowUnfree = true; packageOverrides = pkgs: { - nur = import (builtins.fetchTarball - "https://github.com/nix-community/NUR/archive/222ea29ec4afb09c5565a7e5dda14bfd65a4a9f6.tar.gz") { - inherit pkgs; - }; + nur = import { inherit pkgs; }; writeDashBin = pkgs.writers.writeDashBin; writeDash = pkgs.writers.writeDash; gfs-fonts = pkgs.callPackage {}; diff --git a/deploy.nix b/deploy.nix index 118b20c..6dde2d1 100644 --- a/deploy.nix +++ b/deploy.nix @@ -23,6 +23,7 @@ let home-manager.git = gitFromJson .versions/home-manager.json; stockholm.git = gitFromJson .versions/stockholm.json; retiolum.git = gitFromJson .versions/retiolum.json; + nur.git = gitFromJson .versions/nur.json; system-secrets.pass = { dir = toString ~/.password-store; name = "systems/${name}"; diff --git a/shell.nix b/shell.nix index b4ef08b..5992722 100644 --- a/shell.nix +++ b/shell.nix @@ -35,6 +35,11 @@ let url = "https://github.com/krebs/retiolum"; path = toString .versions/retiolum.json; }; + nur = { + ref = "refs/heads/master"; + url = "https://github.com/nix-community/NUR"; + path = toString .versions/nur.json; + }; }; in pkgs.mkShell { buildInputs = [