hosts/satori: random stuff

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

hosts/satori/boot.nix

@@ -2,8 +2,8 @@
 
 {
   boot = {
-    zfs.forceImportAll = false;
     supportedFilesystems = [ "zfs" ];
+
     kernelPackages = pkgs.unstable.linuxPackages_latest;
     initrd = {
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci" ];
@@ -18,7 +18,7 @@
     };
     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_vulkan_beta v4l2loopback ];
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -35,5 +35,6 @@
       };
     };
     binfmt.emulatedSystems = [ "aarch64-linux" ];
+    zfs.extraPools = [ "stuff" ];
   };
 }

hosts/satori/default.nix

@@ -8,6 +8,8 @@
       ./networking.nix
       ./boot.nix
       ./services.nix
+      ./graphics.nix
+      ./xorg.nix
       ./nix.nix
     ];
   system.stateVersion = "21.05";

hosts/satori/graphics.nix

@@ -15,32 +15,33 @@ in
   hardware = {
     /*opengl =
       let
-        fn = oa: with lib; {
-          nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang;
-          mesonFlags = oa.mesonFlags ++ singleton "-Dvulkan-layers=device-select,overlay";
-          patches = oa.patches ++ singleton ./mesa-vulkan-layer-nvidia.patch;
-          postInstall = oa.postInstall + ''
-            mv $out/lib/libVkLayer* $drivers/lib
-            layer=VkLayer_MESA_device_select
-            substituteInPlace $drivers/share/vulkan/implicit_layer.d/''${layer}.json \
-            --replace "lib''${layer}" "$drivers/lib/lib''${layer}"
-            layer=VkLayer_MESA_overlay
-            substituteInPlace $drivers/share/vulkan/explicit_layer.d/''${layer}.json \
-            --replace "lib''${layer}" "$drivers/lib/lib''${layer}"
-          '';
-        };
+      fn = oa: with lib; {
+      nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang;
+      mesonFlags = oa.mesonFlags ++ singleton "-Dvulkan-layers=device-select,overlay";
+      patches = oa.patches ++ singleton ./mesa-vulkan-layer-nvidia.patch;
+      postInstall = oa.postInstall + ''
+      mv $out/lib/libVkLayer* $drivers/lib
+      layer=VkLayer_MESA_device_select
+      substituteInPlace $drivers/share/vulkan/implicit_layer.d/''${layer}.json \
+      --replace "lib''${layer}" "$drivers/lib/lib''${layer}"
+      layer=VkLayer_MESA_overlay
+      substituteInPlace $drivers/share/vulkan/explicit_layer.d/''${layer}.json \
+      --replace "lib''${layer}" "$drivers/lib/lib''${layer}"
+      '';
+      };
       in
       with pkgs; {
-        driSupport32Bit = true;
-        enable = true;
-        package = (mesa.overrideAttrs fn).drivers;
-        package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers;
+      driSupport32Bit = true;
+      enable = true;
+      package = (mesa.overrideAttrs fn).drivers;
+      package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers;
       };*/
     opengl = {
       driSupport32Bit = true;
       enable = true;
     };
     nvidia = {
+      package = config.boot.kernelPackages.nvidia_x11_vulkan_beta;
       prime = {
         #      sync.enable = true;
         offload = { enable = true; };

hosts/satori/hardware.nix

@@ -7,44 +7,44 @@
     ];
 
   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/ntfs" =
-    { device = "/dev/disk/by-uuid/A4CC66B6CC668282";
+    {
+      device = "/dev/disk/by-uuid/A4CC66B6CC668282";
       fsType = "ntfs";
       options = [ "uid=natto" "gid=users" "umask=0022" "rw" ];
     };
 
   fileSystems."/mnt/real" =
-    { device = "/dev/disk/by-uuid/6372bc0c-0917-469d-a845-2ce65513e306";
+    {
+      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";
     memoryPercent = 30;
     priority = -1;
   };
+
   powerManagement = {
     enable = true;
     cpuFreqGovernor = "schedutil";
   };
+
   hardware = {
     bluetooth.enable = true;
   };

hosts/satori/networking.nix

@@ -2,32 +2,24 @@
 
 {
   networking = {
-    hostName = "Satori";
+    hostName = "satori";
     hostId = "beca3df0";
     wireless.enable = true;
     wireless.interfaces = [ "wlp0s20f3" ];
     firewall = {
       allowedTCPPorts = [ 22 18172 6600 8001 ];
       allowedUDPPorts = [ 22 17840 18172 ];
+      trustedInterfaces = [ "docker0" ];
     };
 
-    defaultGateway = {
-      address = "192.168.0.1";
-    };
+    defaultGateway = "192.168.1.1";
 
     interfaces = {
       enp7s0 = {
         useDHCP = true;
         ipv4.addresses = [{
           prefixLength = 24;
-          address = "192.168.0.109";
-        }];
-      };
-      wlp0s20f3 = {
-        useDHCP = true;
-        ipv4.addresses = [{
-          prefixLength = 24;
-          address = "192.168.0.109";
+          address = "192.168.1.109";
         }];
       };
     };

hosts/satori/pkgs.nix

@@ -28,8 +28,8 @@
     rnix-lsp
     vulkan-tools
     vulkan-headers
-   msr-tools
-   steam  
+    msr-tools
+    steam
     igrep
   ];
 
@@ -50,29 +50,6 @@
     };
     zsh = {
       enable = true;
-      promptInit = ''
-        RPROMPT='%B%F{cyan}%n%f@%F{red}%m%b'
-        function preexec() {
-          timer=$(date +%s%3N)
-        }
-        function precmd() {
-        if [ $timer ]; then
-          now=$(date +%s%3N)
-          elapsed=$(($now-$timer))
-          unset timer
-          unit="ms"
-          if [ $elapsed -gt 1000 ]; then
-            elapsed=$(echo "scale=1; $elapsed/1000" | ${pkgs.bc}/bin/bc -l)
-            unit="s"
-          fi
-          if (( $(echo "$elapsed > 60" | ${pkgs.bc}/bin/bc -l) )) then
-            elapsed=$(echo "scale=2; $elapsed/60" | ${pkgs.bc}/bin/bc -l)
-            unit="m"
-          fi
-          RPROMPT='%B%F{cyan}%n%f@%F{red}%m %F{yellow}~%f %F{magenta}$elapsed $unit%f%b '
-        fi
-        }
-      '';
       histSize = 30000;
       enableCompletion = true;
       enableBashCompletion = true;
@@ -82,8 +59,8 @@
         highlightStyle = "fg=yellow,bold";
       };
       ohMyZsh = {
+        plugins = [ "git" ];
         enable = true;
-        theme = "awesomepanda";
       };
     };
     dconf.enable = true;

hosts/satori/stuff.nix

@@ -19,6 +19,7 @@
     shellAliases = rec {
       ec = "emacsclient";
       ecc = ec + " -c";
+      ecnw = ec + " -nw";
     };
   };
   security = {