From 44b17502a05accf008f81fcba29b5eebb77a6ed9 Mon Sep 17 00:00:00 2001 From: mjallen Date: Tue, 9 Sep 2025 01:06:46 +0000 Subject: [PATCH] temp --- systems/x86_64-linux/jallen-nas/boot.nix | 3 ++- systems/x86_64-linux/jallen-nas/default.nix | 26 +++++++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/systems/x86_64-linux/jallen-nas/boot.nix b/systems/x86_64-linux/jallen-nas/boot.nix index 34877c5..6310cd1 100755 --- a/systems/x86_64-linux/jallen-nas/boot.nix +++ b/systems/x86_64-linux/jallen-nas/boot.nix @@ -15,8 +15,9 @@ in plymouth.enable = lib.mkForce false; initrd = { + supportedFilesystems = [ "bcachefs" ]; clevis = { - enable = true; + enable = false; devices = { "/dev/disk/by-label/nas_pool".secretFile = config.sops.secrets."jallen-nas/nas_pool".path; }; diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index d087173..68364dd 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -11,9 +11,9 @@ { imports = [ ./boot.nix - ./apps.nix +# ./apps.nix ./users.nix - ./services.nix +# ./services.nix ./sops.nix ]; @@ -54,7 +54,8 @@ hardware = { disko = { enable = true; - enableSwap = true; + enableSwap = false; + enableLuks = true; }; nvidia = { @@ -168,7 +169,7 @@ # ################################################### samba = { - enable = true; + enable = false; hostsAllow = "10.0.1."; enableTimeMachine = true; timeMachinePath = "/media/nas/main/timemachine"; @@ -243,12 +244,17 @@ # ################################################### # # Mounts # # # ################################################### - fileSystems."/media/nas/main" = { - label = "nas_pool"; - # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1"; - fsType = "bcachefs"; - mountPoint = "/media/nas/main"; - }; +# fileSystems."/media/nas/main" = { +# label = "nas_pool"; +# # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1"; +# fsType = "bcachefs"; +# mountPoint = "/media/nas/main"; +# options = [ +# "nofail" +# "x-systemd.mount-timeout=0" +# "x-systemd.device-timeout=0" +# ]; +# }; # Configure environment environment = {