Big commit

config/hardware/zbox.nix

@@ -16,44 +16,49 @@
     extraModulePackages = [ ];
   };
 
-  system.stateVersion = "21.05";
+  system.stateVersion = "23.05";
 
   fileSystems = {
     "/" = {
       device = "zbox-root";
       fsType = "tmpfs";
-      options = [ "mode=755" ];
+      options = [ "mode=755" "noexec" ];
     };
 
     "/boot" = {
       device = "/dev/disk/by-label/ZBOX-BOOT";
       fsType = "vfat";
-      options = [ "noexec" "noatime" "nodiratime" ];
+      options = [ "noexec" "noatime" ];
     };
 
     "/state" = {
       device = "/dev/disk/by-label/zbox-data";
       fsType = "btrfs";
-      options = [ "noatime" "nodiratime" "compress=zstd" "subvol=@state" ];
+      options = [ "noatime" "compress=zstd" "noexec" "subvol=@state" ];
     };
 
     "/nix" = {
       device = "/dev/disk/by-label/zbox-data";
       fsType = "btrfs";
-      options = [ "noatime" "nodiratime" "compress=zstd" "subvol=@nix" ];
+      options = [ "noatime" "compress=zstd" "subvol=@nix" ];
     };
 
     "/var/log" = {
       device = "/dev/disk/by-label/zbox-data";
       fsType = "btrfs";
-      options =
-        [ "noatime" "nodiratime" "compress=zstd" "noexec" "subvol=@logs" ];
+      options = [ "noatime" "compress=zstd" "noexec" "subvol=@log" ];
     };
 
-    "/home" = {
+    "/var/lib/containers" = {
       device = "/dev/disk/by-label/zbox-data";
       fsType = "btrfs";
-      options = [ "noatime" "nodiratime" "compress=zstd" "subvol=@home" ];
+      options = [ "noatime" "compress=zstd" "noexec" "subvol=@containers" ];
+    };
+
+    "/state/services/frigate" = {
+      device = "/dev/disk/by-label/zbox-recordings";
+      fsType = "btrfs";
+      options = [ "noatime" "compress=zstd" "noexec" ];
     };
   };
 
@@ -68,19 +73,16 @@
       driSupport = true;
       driSupport32Bit = true;
       setLdLibraryPath = true;
+      extraPackages = with pkgs; [ nvidia-vaapi-driver vaapiVdpau ];
     };
 
-    pulseaudio = {
-      support32Bit = true;
-      package = pkgs.pulseaudioFull;
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      modesetting.enable = true;
+      powerManagement.enable = false;
     };
 
-    enableRedistributableFirmware = true;
-
     enableAllFirmware = true;
-
-    # Required with Wayland?
-    nvidia.modesetting.enable = true;
   };
 
   networking = {
@@ -101,10 +103,7 @@
     };
   };
 
-  services.xserver.videoDrivers = [ "nvidia" ];
-
   nix.settings.max-jobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   systemd.targets = {
     sleep.enable = false;