Satori: misc changes

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/satori/boot.nix

@@ -1,22 +1,24 @@
-{lib, config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   boot = {
+    zfs.forceImportAll = false;
+    supportedFilesystems = [ "zfs" ];
     kernelPackages = pkgs.unstable.linuxPackages_latest;
-    initrd={
-      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
- /*     preDeviceCommands = ''
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci" ];
+      /*     preDeviceCommands = ''
         DEVS="0000:01:00.0 0000:01:00.1 0000:01:00.2 0000:01:00.3"
         for DEV in $DEVS; do
-          echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
+        echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
         done
         modprobe -i vfio-pci
         '';*/
-      kernelModules = [];
+      kernelModules = [ ];
     };
-    kernelParams = [ "intel_pstate=active" "intel_iommu=on" ]; 
+    kernelParams = [ "intel_pstate=active" "intel_iommu=on" ];
     kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
-    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback];
+    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback ];
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -24,8 +26,8 @@
       };
       grub = {
         enable = true;
- #       useOSProber = true;
-        efiSupport =  true;
+        #       useOSProber = true;
+        efiSupport = true;
         device = "nodev";
         splashImage = ./cirno.png;
         splashMode = "stretch";

hosts/satori/hardware.nix

@@ -5,30 +5,36 @@
     [
       (modulesPath + "/installer/scan/not-detected.nix")
     ];
+
   fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047";
+    { device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047";
       fsType = "btrfs";
       options = [ "compress-force=zstd:3" ];
     };
 
   fileSystems."/boot/efi" =
-    {
-      device = "/dev/disk/by-uuid/2424-5639";
+    { device = "/dev/disk/by-uuid/2424-5639";
       fsType = "vfat";
     };
-  fileSystems."/mnt/Games" =
-    {
-      device = "/dev/disk/by-uuid/A4CC66B6CC668282";
+
+  fileSystems."/mnt/ntfs" =
+    { device = "/dev/disk/by-uuid/A4CC66B6CC668282";
       fsType = "ntfs";
       options = [ "uid=natto" "gid=users" "umask=0022" "rw" ];
     };
-  fileSystems."/mnt/Stuff" =
-    {
-      device = "/dev/disk/by-uuid/e5be3621-8608-4ffe-bd33-5e6d22fef4ff";
-      fsType = "btrfs";
-      options = [ "compress-force=zstd:3" ];
+
+  fileSystems."/mnt/real" =
+    { device = "/dev/disk/by-uuid/6372bc0c-0917-469d-a845-2ce65513e306";
+      fsType = "ext4";
+      options = [ "rw" ];
     };
+
+  fileSystems."/mnt/stuff" =
+    { device = "stuff";
+      fsType = "zfs";
+      neededForBoot = false;
+    };
+
   zramSwap = {
     enable = true;
     algorithm = "lz4";

hosts/satori/networking.nix

@@ -3,12 +3,18 @@
 {
   networking = {
     hostName = "Satori";
+    hostId = "beca3df0";
     wireless.enable = true;
     wireless.interfaces = [ "wlp0s20f3" ];
     firewall = {
       allowedTCPPorts = [ 22 18172 6600 8001 ];
       allowedUDPPorts = [ 22 17840 18172 ];
     };
+
+    defaultGateway = {
+      address = "192.168.0.1";
+    };
+
     interfaces = {
       enp7s0 = {
         useDHCP = true;

hosts/satori/pkgs.nix

@@ -28,13 +28,8 @@
     rnix-lsp
     vulkan-tools
     vulkan-headers
-    msr-tools
-    (steam.override {
-      extraLibraries = pkgs: [ pkgs.pipewire ];
-      extraProfile = ''
-        unset VK_ICD_FILENAMES
-        export VK_ICD_FILENAMES=${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.json:${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd32.json'';
-    })
+   msr-tools
+   steam  
     igrep
   ];
 

hosts/satori/services.nix

@@ -13,6 +13,7 @@
     udev.extraRules = ''
       ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
     '';
+    zfs.autoScrub.enable = true;
   };
   systemd.services.tor.wantedBy = lib.mkForce [ ];
   systemd.enableUnifiedCgroupHierarchy = false;

hosts/satori/stuff.nix

@@ -22,6 +22,7 @@
     };
   };
   security = {
+    polkit.enable = true;
     sudo.enable = true;
     doas = {
       enable = true;
@@ -44,6 +45,7 @@
     monoid
     office-code-pro
     hanazono
+    eb-garamond
  #   noto-fonts-cjk
   ];
   users.users.natto = {