From f01d8258a1b271dec81ce3a7cfb51141f82684b2 Mon Sep 17 00:00:00 2001 From: KnightArtorias Date: Sun, 8 Feb 2026 21:59:49 +0000 Subject: [PATCH] Add zfs support to desktops --- flake.lock | 18 +++++++++--------- .../physical/desktop/common/apps/default.nix | 3 ++- .../roles/physical/desktop/common/apps/zfs.nix | 7 +++++++ .../roles/physical/desktop/common/default.nix | 3 +++ 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 nixos/roles/physical/desktop/common/apps/zfs.nix diff --git a/flake.lock b/flake.lock index 114d508..3de1413 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768836546, - "narHash": "sha256-nJZkTamcXXMW+SMYiGFB6lB8l0aJw0xjssfN8xYd/Fs=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b56c5ad14fcf8b5bc887463552483bf000ca562a", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1768837707, - "narHash": "sha256-wuUCT+2TZOKPQZdKS9nQ4tnn3Zx/U/GNHuYZ1D1/NuA=", + "lastModified": 1770579902, + "narHash": "sha256-l2kpxVUKMu1Ctv/jxsel0KziGn4WTrphBCQrGLayajU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2bea8e8f8e32f0d1e189b862b09c4534166fe788", + "rev": "d241506bfcc31dde28d315b42280f4a883e24966", "type": "github" }, "original": { diff --git a/nixos/roles/physical/desktop/common/apps/default.nix b/nixos/roles/physical/desktop/common/apps/default.nix index c87d619..8e6704f 100644 --- a/nixos/roles/physical/desktop/common/apps/default.nix +++ b/nixos/roles/physical/desktop/common/apps/default.nix @@ -3,6 +3,7 @@ ./steam.nix ./pwvucontrol.nix ./wine.nix - ./etcher.nix + # ./etcher.nix + ./zfs.nix ]; } diff --git a/nixos/roles/physical/desktop/common/apps/zfs.nix b/nixos/roles/physical/desktop/common/apps/zfs.nix new file mode 100644 index 0000000..fbc3ab3 --- /dev/null +++ b/nixos/roles/physical/desktop/common/apps/zfs.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + zfs + ]; +} diff --git a/nixos/roles/physical/desktop/common/default.nix b/nixos/roles/physical/desktop/common/default.nix index 3631cb5..8c99161 100644 --- a/nixos/roles/physical/desktop/common/default.nix +++ b/nixos/roles/physical/desktop/common/default.nix @@ -2,4 +2,7 @@ imports = [ ./apps ]; + + boot.supportedFilesystems = [ "zfs" ]; + boot.initrd.supportedFilesystems = [ "zfs" ]; }