From 1ce8d5a3f76016dc0a450295ed4f24e377b26f0f Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Sun, 18 Feb 2024 01:29:38 -0800
Subject: [PATCH] typos, nixos-hw defaults still bad, steal extra bullshit tho

---
 flake.nix              |  2 +-
 systems/NOcomputer.nix | 12 ++++++------
 systems/NOlaptop.nix   | 33 +++++++++++++--------------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6380eb4..80d0d18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,7 +50,7 @@
           specialArgs = { inherit inputs; };
           modules = [
             nixos-hardware.nixosModules.common-cpu-intel
-            # inputs.nixos-hardware.nixosModules.framework
+            # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
             ./systems/BASED.nix
             ./systems/NOlaptop.nix
             ./users/tao.nix
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 667d720..2b71b62 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -27,17 +27,17 @@
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=home_snaps/0/snapshot" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=home_snaps/0/snapshot" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
   fileSystems."/home/.snapshots" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=home_snaps/" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=home_snaps/" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
   fileSystems."/home/tao/Games" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" ];
+    options = [ "subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" "discard=async" ];
   };
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/2B28-151D";
@@ -46,17 +46,17 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=nixos" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=nixos" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
   fileSystems."/var" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=nixos/var" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=nixos/var" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
   fileSystems."/tmp" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
-    options = [ "subvol=nixos/tmp" ];
+    options = [ "subvol=nixos/tmp" "discard=async" ];
   };
   swapDevices = [{ device = "/dev/disk/by-uuid/ca0ed3d7-8758-4ac7-b016-8b4cd9608ded"; }];
 
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index b40a810..49ee7c5 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -10,23 +10,24 @@
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/e4244a97-9b48-49f0-8093-782163045020";
     fsType = "btrfs";
-    options = [ "subvol=home-snaps/0/snapshot" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=home-snaps/0/snapshot" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
   fileSystems."/home/tao/Games" = {
     device = "/dev/disk/by-uuid/e4244a97-9b48-49f0-8093-782163045020";
     fsType = "btrfs";
-    options = [ "subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" ];
+    options = [ "subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" "discard=async" ];
   };
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/e4244a97-9b48-49f0-8093-782163045020";
     fsType = "btrfs";
-    options = [ "subvol=nixos" "noatime" "compress-force=zstd:3" ];
+    options = [ "subvol=nixos" "noatime" "compress-force=zstd:3" "discard=async" ];
   };
 
   swapDevices = [{ device = "/dev/disk/by-uuid/ca55d0ea-c0db-44c5-af3a-e38eec803929"; }];
 
   services.fprintd.enable = true;
   services.fwupd.enable = true;
+  # services.fstrim.enable = true;
   powerManagement.powertop.enable = true;
   hardware.sensor.iio.enable = true;
 
@@ -47,10 +48,14 @@
 
   # SUBSYSTEM=="backlight", GROUP="video", MODE="0664"
   services.udev.extraRules = ''
+    # Ethernet expansion card
+    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
+
     ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"
     ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
   '';
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.initrd.availableKernelModules = [
     "nvme"
     "sd_mod"
@@ -59,10 +64,13 @@
     "xhci_pci"
   ];
   boot.kernelParams = [
-    "mem_sleep_default=deep"
+    "acpi_osi=\"!Windows 2020\""
+    "mem_sleep_default=s2idle"
     "nvme.noacpi=1"
-    "i915.eanble_psr=1"
+    "i915.enable_psr=1"
   ];
+  boot.blacklistedKernelModules = [ "cros-usbpd-charger" ];
+  boot.extraModprobeConfig = ''options snd-hda-intel model=dell-headset-multi'';
   boot.kernelModules = [ "kvm-intel" ];
   powerManagement.cpuFreqGovernor = "powersave";
   systemd.sleep.extraConfig = "HibernateDelaySec=180m";
@@ -70,21 +78,6 @@
   # boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1";
 
   services.pipewire.wireplumber.enable = true;
-  environment.etc = {
-    "wireplumber/main.lua.d/51-fix-static.lua".text = ''
-      rule = {
-        matches = {
-          {
-            { "node.name", "equals", "alsa_output.pci-0000_00_1f.3.analog-stereo.3" },
-          },
-        },
-        apply_properties = {
-          [ "audio.format" ] = "S24LE" ,
-        },
-      }
-      table.insert(alsa_monitor.rules, rule)
-    '';
-  };
 
   networking.hostName = "NOlaptop";
 }