From eb9fb7789feabba548593ec3877de1e69b8cfc25 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 29 Jun 2024 18:13:47 +0100 Subject: [PATCH] setup zfs post system install --- flake.lock | 26 ++++++++++---------- hosts/common/disks/zfs/post-install-setup.sh | 3 +++ hosts/common/disks/zfs/zspeed.nix | 13 ++++++++++ hosts/nebula/default.nix | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100755 hosts/common/disks/zfs/post-install-setup.sh diff --git a/flake.lock b/flake.lock index c5a5e39..616dbfa 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1719601133, - "narHash": "sha256-2+e92LyX1fFj3mIZft+K8OzR9NT/1xtheO8hO/3DyRc=", + "lastModified": 1719679628, + "narHash": "sha256-veDG5v8ndU56bkxC37pfh48+1G53hABZ6A67jhrU3vA=", "ref": "refs/heads/master", - "rev": "278ccbbd646e86cab5fd38d43d9134270d8123d0", - "revCount": 141, + "rev": "f75ec74fab8f9054540a33f1e76d8fe9d885560f", + "revCount": 146, "type": "git", "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" }, @@ -340,11 +340,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719469291, - "narHash": "sha256-Efir01r7ThPabDBFOygX1UDyerJFHelbRGdMo/VNw14=", + "lastModified": 1719657372, + "narHash": "sha256-3uCk0WXaUZPErNGUNCCbOg+DgZIjA6OgyqFYJwfZ4+0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8f52e4d1e34039937efb0ee05825b9963ef29739", + "rev": "5b94f0caddc9f406554701a214f879c75fb0ee60", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nur": { "locked": { - "lastModified": 1719596768, - "narHash": "sha256-quSWztqqMxvSJIKddYp1D0GdR7Kg8JjEVCIzMbtBTQ4=", + "lastModified": 1719679086, + "narHash": "sha256-4s1Tn2T9EY9WE94bu9dGZXvl2L1BaerQSzoUfkpSINY=", "owner": "nix-community", "repo": "NUR", - "rev": "35e48702118124ec52a071e300f55c78a4b7b338", + "rev": "0dee89a38d574f3fd8a1ebe1dc43bfe8fb3448ec", "type": "github" }, "original": { diff --git a/hosts/common/disks/zfs/post-install-setup.sh b/hosts/common/disks/zfs/post-install-setup.sh new file mode 100755 index 0000000..444f71d --- /dev/null +++ b/hosts/common/disks/zfs/post-install-setup.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko ./zspeed.nix diff --git a/hosts/common/disks/zfs/zspeed.nix b/hosts/common/disks/zfs/zspeed.nix index 8babffe..08587e3 100644 --- a/hosts/common/disks/zfs/zspeed.nix +++ b/hosts/common/disks/zfs/zspeed.nix @@ -63,6 +63,19 @@ mountpoint = "/postgres"; }; }; + test = { + type = "zfs_volume"; + size = "10G -s"; + options = { + "com.sun:auto-snapshot:daily" = "true"; + "volblocksize" = "8k"; + }; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/test"; + }; + }; }; }; }; diff --git a/hosts/nebula/default.nix b/hosts/nebula/default.nix index eb91028..0bd96dd 100644 --- a/hosts/nebula/default.nix +++ b/hosts/nebula/default.nix @@ -2,7 +2,7 @@ let # Disko setup fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence - dev = "/dev/sda"; # depends on target hardware + dev = "/dev/disk/by-id/ata-QEMU_HARDDISK_QM00005"; # depends on target hardware encrypted = false; # currrently only applies to btrfs impermanence = false; # currrently only applies to btrfs user = "admin";