From 5beaab8f85d9e9d0a77eed3207254e68fa70ca68 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Tue, 3 Feb 2026 00:27:37 -0800
Subject: [PATCH] stu

---
 extras/dev.nix         | 29 ++++++++++++++---------------
 systems/NOcomputer.nix | 32 +++++++++++++++++---------------
 users/tao.nix          | 18 +++++++-----------
 users/tao/HOME.nix     |  1 +
 4 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/extras/dev.nix b/extras/dev.nix
index 85676a2..8a83dac 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -7,28 +7,33 @@
     environment.systemPackages = with pkgs; [
         maturin
         mission-planner
-        # keep-sorted start
+        # keep-sorted start sticky_comments=no
         # act
         # asm-lsp
         # bash-language-server
         # digital
+        # egglog
         # etcher
         # fontforge
         # freecad
         # git-cliff
+        # lazyjj
         # lua-language-server
         # lychee # link checker
         # markdown-oxide # markdown lsp
+        # mask
+        # mprocs
+        # nomachine-client
+        # presenterm
         # quickemu
         # radicle-node
         # vulkan-loader
+        # z3
         b3sum
         basedpyright
         delta
         devenv
         direnv
-        egglog
-        flip-link
         gh
         gpclient
         hyperfine
@@ -36,13 +41,8 @@
         just
         just-lsp
         keep-sorted
-        lazyjj
         lldb
-        mask
         mergiraf
-        mprocs
-        # nomachine-client
-        presenterm
         qFlipper
         qemu
         sd
@@ -52,7 +52,6 @@
         tokei # repo code stats
         typos
         wild
-        z3
         # keep-sorted end
 
         # # databases
@@ -76,11 +75,11 @@
         gdb
         gnumake
 
-        # cringelang
-        go
-        delve
-        gotools
-        gopls
+        # # cringelang
+        # go
+        # delve
+        # gotools
+        # gopls
 
         # nix
         nil
@@ -95,8 +94,8 @@
         uv
 
         # rust
+        # keep-sorted start sticky_comments=no
         # leptosfmt
-        # keep-sorted start
         bacon
         cargo-autoinherit
         cargo-binstall
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 682af5c..1cc72a8 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -5,24 +5,26 @@
     ...
 }: {
     environment.systemPackages = with pkgs; [
-        # nvtopPackages.nvidia
+        # keep-sorted start sticky_comments=no
         # egl-wayland
-        # gpt4all-chat
-        nvidia-vaapi-driver
         # foldingathome
-        # gwe
-        # openrgb
-        openrgb-plugin-effects
-        openrgb-plugin-hardwaresync
+        # openrgb-plugin-effects
+        # openrgb-plugin-hardwaresync
+        gwe
+        nvidia-vaapi-driver
+        nvtopPackages.nvidia
+        openrgb-with-all-plugins
+        # keep-sorted end
     ];
 
     environment.sessionVariables = {
-        # wayland chromium workaround
-        NIXOS_OZONE_WL = "1";
+        # # wayland chromium workaround
+        # NIXOS_OZONE_WL = "1";
 
         # firefox nvidia-vaapi-driver
-        MOZ_DISABLE_RDD_SANDBOX = "1";
-        LIBVA_DRIVER_NAME = "nvidia";
+        # MOZ_DISABLE_RDD_SANDBOX = "1";
+        # LIBVA_DRIVER_NAME = "nvidia";
+        # CUDA_DISABLE_PERF_BOOST = "1";
     };
 
     hardware.nvidia = {
@@ -41,10 +43,10 @@
     };
     services.lact.enable = true;
 
-    services.syncplay = {
-        enable = true;
-        motd = "we only watch kino here";
-    };
+    # services.syncplay = {
+    #     enable = true;
+    #     motd = "we only watch kino here";
+    # };
 
     services.udev.extraRules = ''
         # pcpanel
diff --git a/users/tao.nix b/users/tao.nix
index deb38b3..e088478 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -6,17 +6,19 @@
     ...
 }: {
     users.users.tao.packages = with pkgs; [
-        # keep-sorted start
+        # keep-sorted start sticky_comments=no
+        # android-tools
         # boxxy
         # carapace
-        # cloud-hypervisor
         # davinci-resolve
         # fractal
-        # freerdp
-        # inputs.plasma-manager.packages.${pkgs.system}.default
+        # freecad-wayland
+        # gurk-rs
         # jellyfin-media-player
-        # libsForQt5.kcharselect
+        # nixos-anywhere
         # piper
+        # syncthingtray
+        # taskwarrior3
         # tectonic
         # texlab
         # thunderbird
@@ -29,9 +31,7 @@
         darktable
         deluge
         discord
-        # freecad-wayland
         gocryptfs
-        # gurk-rs
         jellyfin-mpv-shim
         keepassxc
         man-pages
@@ -39,7 +39,6 @@
         miniserve
         mousai
         nix-output-monitor
-        nixos-anywhere
         nufmt
         nushell
         nvd
@@ -60,8 +59,6 @@
         snapper
         starship
         syncplay
-        # syncthingtray
-        taskwarrior3
         tinymist
         toastify
         typst
@@ -74,7 +71,6 @@
         zoom-us
         zotero
         zoxide
-        # android-tools
         # keep-sorted end
     ];
     virtualisation.waydroid = {
diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index 4004990..4d5387b 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -109,6 +109,7 @@ in {
                     default-command = "log";
                     pager = "delta --syntax-theme gruvbox-dark";
                     diff-formatter = ":git";
+                    merge-editor = "mergiraf";
                 };
                 fix.tools.alejandra = {
                     command = ["alejandra"];