From 2730602b4065b061b943154c536ee014df6fed46 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Thu, 25 Apr 2024 15:48:29 -0700
Subject: [PATCH] nixos-hardware for nolaptop

---
 flake.nix                  |  4 +---
 systems/NOlaptop.nix       | 29 +++++++++++++----------------
 users/tao/nushell/stuff.nu |  5 +++++
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index bc399a9..4514d50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,9 +84,7 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs;};
         modules = [
-          nixos-hardware.nixosModules.common-cpu-amd
-          nixos-hardware.nixosModules.common-cpu-amd-pstate
-          nixos-hardware.nixosModules.common-gpu-amd
+          nixos-hardware.nixosModules.framework-16-7040-amd
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
           ./systems/BASED.nix
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index 8c649bd..4da7d53 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -21,23 +21,8 @@
     nvtopPackages.amd
   ];
 
-  services.tailscale.useRoutingFeatures = "client";
-
-  nix.buildMachines = [
-    {
-      hostName = "nocomputer";
-      systems = ["x86_64-linux" "i686-linux"];
-      supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"];
-    }
-  ];
-  nix.extraOptions = ''
-    builders-use-substitutes = true
-  '';
-  nix.distributedBuilds = true;
-
-  services.power-profiles-daemon.enable = true;
   services.fwupd.enable = true;
-  services.fprintd.enable = true;
+  services.tailscale.useRoutingFeatures = "client";
 
   systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
 
@@ -79,6 +64,18 @@ AttrKeyboardIntegration=internal";
   services.displayManager.defaultSession = "plasma";
   services.displayManager.sddm.wayland.enable = true;
 
+  nix.buildMachines = [
+    {
+      hostName = "nocomputer";
+      systems = ["x86_64-linux" "i686-linux"];
+      supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"];
+    }
+  ];
+  nix.extraOptions = ''
+    builders-use-substitutes = true
+  '';
+  nix.distributedBuilds = true;
+
   services.udev.extraRules = ''
     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"
diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu
index e3e57ea..8edaed4 100644
--- a/users/tao/nushell/stuff.nu
+++ b/users/tao/nushell/stuff.nu
@@ -28,4 +28,9 @@ alias ts = tailscale
 alias tss = tailscale status
 alias tsx = tailscale exit-node list
 alias zl = zellij
+
+def l [] {
+  ls | sort-by type
+}
+
 task