From c40b0dc031f3cb32e86bff1f83760a75fa5c5b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Aug 2022 09:47:39 +0200 Subject: [PATCH] fix standalone example --- example/stand-alone/configuration.nix | 34 ++++++++++++++++++++++----- example/stand-alone/tsp-disk.json | 22 ----------------- 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 example/stand-alone/tsp-disk.json diff --git a/example/stand-alone/configuration.nix b/example/stand-alone/configuration.nix index 2ee1597..2a15c32 100644 --- a/example/stand-alone/configuration.nix +++ b/example/stand-alone/configuration.nix @@ -1,10 +1,32 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - disko = (builtins.fetchGit { - url = https://cgit.lassul.us/disko/; - rev = "88f56a0b644dd7bfa8438409bea5377adef6aef4"; - }) + "/lib"; - cfg = builtins.fromJSON ./tsp-disk.json; + disko = import (builtins.fetchGit { + url = "https://github.com/nix-community/disko"; + ref = "master"; + }) { + inherit lib; + }; + cfg = { + type = "devices"; + content = { + sda = { + type = "table"; + format = "msdos"; + partitions = [{ + type = "partition"; + part-type = "primary"; + start = "1M"; + end = "100%"; + bootable = true; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }]; + }; + }; + }; in { imports = [ (disko.config cfg) diff --git a/example/stand-alone/tsp-disk.json b/example/stand-alone/tsp-disk.json deleted file mode 100644 index 1d82c13..0000000 --- a/example/stand-alone/tsp-disk.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "devices", - "content": { - "sda": { - "type": "table", - "format": "msdos", - "partitions": [ - { "type": "partition", - "start": "1M", - "end": "100%", - "bootable": true, - "content": { - "type": "filesystem", - "format": "ext4", - "mountpoint": "/" - } - } - ] - } - } -} -