diff --git a/systems/BASED.nix b/systems/BASED.nix
index d786fea..a83806b 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -6,18 +6,17 @@
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    # macchina
-    inputs.agenix.packages.${pkgs.system}.default
+    # inputs.helix.packages.${pkgs.system}.default
     bat
     bottom
     cifs-utils
     du-dust
     exfatprogs
-    firefox
     ffmpeg
+    firefox
     git
-    # inputs.helix.packages.${pkgs.system}.default
     helix
+    inputs.agenix.packages.${pkgs.system}.default
     localsend
     mesa
     mpv
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index f9e638c..e342934 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -57,6 +57,14 @@
     KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a3c5", MODE="0666"
   '';
 
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.kernelModules = ["i2c-dev" "kvm-amd"];
+  boot.kernelParams = ["nvidia-drm.modeset=1"];
+  # boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
+  # boot.blacklistedKernelModules = with config.boot.kernelPackages; [ k10temp ];
+
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
@@ -93,14 +101,6 @@
   };
   swapDevices = [{device = "/dev/disk/by-uuid/ca0ed3d7-8758-4ac7-b016-8b4cd9608ded";}];
 
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-  boot.kernelModules = ["i2c-dev" "kvm-amd"];
-  boot.kernelParams = ["nvidia-drm.modeset=1"];
-  # boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
-  # boot.blacklistedKernelModules = with config.boot.kernelPackages; [ k10temp ];
-
   # windows can suck my ass
   time.hardwareClockInLocalTime = true;
 
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index 857b4e6..5740cfc 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -1,8 +1,5 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    # prescurve
-    libinput
-    powertop
     fw-ectool
     nvtopPackages.amd
   ];
diff --git a/users/tao.nix b/users/tao.nix
index b265149..45c9bcd 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -6,25 +6,17 @@
   ...
 }: {
   users.users.tao.packages = with pkgs; [
-    inputs.plasma-manager.packages.${pkgs.system}.default
-    # enchant
     # fractal
-    # joshuto
-    # libftdi
-    # libusb
+    # kdeconnect
+    # libsForQt5.kcharselect
     # mendeley
-    # nuspell
-    # ocs-url
-    oculante
-    # onefetch
     # slack
     # tectonic
     # texlab
     # tio
     # toastify
-    vial
+    # virt-manager
     # wkhtmltopdf
-    # yazi
     appimage-run
     aspell
     aspellDicts.en
@@ -32,18 +24,17 @@
     calibre
     darktable
     deluge
+    discord
+    inputs.plasma-manager.packages.${pkgs.system}.default
     jellyfin-media-player
     jellyfin-mpv-shim
+    kdePackages.plasma-vault
     keepassxc
     leetcode-cli
-    # kdeconnect
-    # libsForQt5.kcharselect
-    # libsForQt5.kdeconnect-kde
-    # libsForQt5.plasma-integration
-    kdePackages.plasma-vault
     miniserve
     nushell
     obs-studio
+    oculante
     onlyoffice-bin
     pandoc
     pipe-rename
@@ -60,13 +51,12 @@
     typst
     typst-fmt
     typst-lsp
-    # virt-manager
+    vial
     wezterm
     yt-dlp
     zathura
     zoom-us
     zoxide
-    discord
   ];
   # programs.adb.enable = true;
   programs.kdeconnect.enable = true;
@@ -101,23 +91,26 @@
           "uwuraid"
         ];
       in {
-        "sync" = {
-          path = "/home/tao/sync";
-          devices = devs;
-        };
-        "school" = {
-          path = "/home/tao/school";
-          devices = devs;
-        };
-        "projects" = {
-          path = "/home/tao/projects";
+        "documents" = {
+          path = "/home/tao/documents";
           devices = devs;
         };
         "pictures" = {
           path = "/home/tao/pictures";
           devices = devs;
         };
-        # "pictures".path = "/home/tao/pictures";
+        "projects" = {
+          path = "/home/tao/projects";
+          devices = devs;
+        };
+        "school" = {
+          path = "/home/tao/school";
+          devices = devs;
+        };
+        "sync" = {
+          path = "/home/tao/sync";
+          devices = devs;
+        };
       };
     };
   };
diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index 9d39659..2b5bdf2 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -50,6 +50,8 @@ in {
       enable = true;
       userName = "Tao Tien";
       userEmail = "29749622+taotien@users.noreply.github.com";
+      # extraConfig = {
+      # };
     };
 
     nushell = {
@@ -93,13 +95,13 @@ in {
   };
 
   xdg.userDirs = {
-    desktop = null;
     documents = "documents";
     download = "downloads";
     music = "music";
     pictures = "pictures";
     templates = "templates";
     videos = "videos";
+    desktop = null;
     publicShare = null;
     createDirectories = true;
     enable = true;
diff --git a/users/tao/starship.toml b/users/tao/starship.toml
index ce98942..802f5e6 100644
--- a/users/tao/starship.toml
+++ b/users/tao/starship.toml
@@ -1,3 +1,5 @@
+command_timeout = 1000
+
 format = """
 [](#9A348E)\
 $username\