diff --git a/configuration.nix b/configuration.nix index d8b16ae..428e089 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,19 +6,24 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.kernelModules = [ "overlay" "vmd" ]; + boot.zfs.extraPools = ["tank"]; + boot.initrd.systemd.tmpfiles.settings."fixdirs"."/nix" = { type = "d"; mode = "0755"; }; + boot.initrd.systemd.tmpfiles.settings."fixdirs"."/home" = { type = "d"; mode = "0755"; }; + boot.initrd.systemd.tmpfiles.settings."fixdirs"."/tank" = { type = "d"; mode = "0755"; }; networking.hostName = "nix-nas"; networking.hostId = "39373132"; # via: head -c4 /etc/machine-id | od -An -tx4 users.users.nicole = { isNormalUser = true; - hashedPassword = "sha512-$6$p73d5mOLoSuJGOol$KRlszaPXZK9/frADlfR3kAr/57DD5f4.CPTGNNX80QWEWFE5y.bM1WiZwmRHiAlrws3q/zCDQ6AqeSyCUX.8U/"; + hashedPassword = "$6$p73d5mOLoSuJGOol$KRlszaPXZK9/frADlfR3kAr/57DD5f4.CPTGNNX80QWEWFE5y.bM1WiZwmRHiAlrws3q/zCDQ6AqeSyCUX.8U/"; extraGroups = [ "wheel" "docker" "libvirtd" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGAsiKDWCwyf1usprg3K6Zk0xE9S4DX6+Bc4+nIOZGmf drezil@Manticore" ]; }; + system.stateVersion = "25.05"; # ← einmalig festnageln security.sudo.wheelNeedsPassword = false; services.openssh.enable = true; @@ -27,6 +32,6 @@ # Wir pinnen den Kernel, bis ZFS 2.3.x für 6.13 bereit ist boot.kernelPackages = pkgs.linuxPackages_6_12; - environment.systemPackages = with pkgs; [ git vim ]; + environment.systemPackages = with pkgs; [ git vim zfs ]; } diff --git a/disko.nix b/disko.nix index 4539387..4852f07 100644 --- a/disko.nix +++ b/disko.nix @@ -17,7 +17,6 @@ format = "vfat"; extraArgs = [ "-F32" ]; mountpoint = "/boot"; - mountpointCreate = true; }; }; rpool = { @@ -39,19 +38,16 @@ root = { type = "zfs_fs"; mountpoint = "/"; - mountpointCreate = true; options.compression = "zstd"; }; nix = { type = "zfs_fs"; mountpoint = "/nix"; - mountpointCreate = true; options.compression = "zstd"; }; home = { type = "zfs_fs"; mountpoint = "/home"; - mountpointCreate = true; options.compression = "zstd"; }; }; @@ -63,7 +59,6 @@ datasets.media = { type = "zfs_fs"; mountpoint = "/tank"; - mountpointCreate = true; options.compression = "zstd"; }; };