diff --git a/extras/dev.nix b/extras/dev.nix
index f49655a..7d39631 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -12,6 +12,8 @@
     # pkgconfig
     # rustup
     # udev
+    nixpkgs-fmt
+    nil
     expat
     fontconfig
     freetype
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 3546b49..fc72538 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -1,34 +1,22 @@
 { lib, pkgs, modulesPath, ... }: {
   environment.systemPackages = with pkgs; [
-    # exfatprogs
-    # rustup
-    # appimage-run
     bat
     bottom
-    cifs-utils
     du-dust
+    exfatprogs
     ffmpeg
     firefox
     git
     helix
     mesa
     mpv
-    # nfs-utils
-    nil
-    # nixpkgs-fmt
-    # onlyoffice-bin
     ouch
-    # ripgrep-all
+    ripgrep
     skim
-    # snapper
     tree
-    # unstable.yazi
-    # unstable.joshuto
-    # xunstable.oculante
     wezterm
     wget
     yt-dlp
-    zathura
     zstd
   ];
   programs.partition-manager.enable = lib.mkDefault true;
@@ -49,13 +37,6 @@
     VISUAL = "hx";
   };
 
-  # xdg.portal = {
-  #   enable = true;
-  #   extraPortals = with pkgs; [
-  #     xdg-desktop-portal-wlr
-  #   ];
-  # };
-
   hardware.enableAllFirmware = true;
   hardware.bluetooth.enable = lib.mkDefault true;
 
@@ -66,20 +47,6 @@
 
   networking.networkmanager = {
     enable = true;
-    # dispatcherScripts = [{
-    #   source = pkgs.writeText "upHook" ''
-    #     logger "event $2"
-    #     if [ "$2" == "vpn-up" ]; then
-    #       iptables -A OUTPUT -o tun0 -j ACCEPT
-    #       iptables -A OUTPUT ! -o tun0 -j DROP
-    #     fi
-    #     if [ "$2" == "vpn-down" ]; then
-    #       iptables -D OUTPUT -o tun0 -j ACCEPT
-    #       iptables -D OUTPUT ! -o tun0 -j DROP
-    #     fi
-    #   '';
-    #   type = "basic";
-    # }];
   };
   networking.firewall.enable = false;
 
diff --git a/systems/NObangers.nix b/systems/NObangers.nix
index 255e98f..290bbb7 100644
--- a/systems/NObangers.nix
+++ b/systems/NObangers.nix
@@ -5,36 +5,33 @@
   ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+    device = "/dev/disk/by-label/NIXOS_SD";
     fsType = "ext4";
+    options = [ "noatime" ];
     autoResize = true;
   };
   programs.partition-manager.enable = false;
 
-  services.tailscale.enable = true;
-  services.openssh.enable = true;
-  services.flatpak.enable = false;
   services.printing.enable = false;
   services.btrfs.autoScrub.enable = false;
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
   boot.loader.grub.enable = false;
   boot.loader.systemd-boot.enable = false;
-  boot.loader.efi.canTouchEfiVariables = false;
   boot.loader.generic-extlinux-compatible.enable = true;
-  console.enable = false;
+  # console.enable = false;
   # powerManagement.cpuFreqGovernor = "ondemand";
 
   hardware = {
     raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      #audio.enable = true;
+      # apply-overlays-dtmerge.enable = true;
+      # audio.enable = true;
       fkms-3d.enable = true;
     };
-    deviceTree = {
-      enable = true;
-      # filter = "*rpi-4-*.dtb";
-    };
+    # deviceTree = {
+    # enable = true;
+    # filter = "*rpi-4-*.dtb";
+    # };
   };
 
   nixpkgs.hostPlatform = "aarch64-linux";
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 6b3f3d9..7916799 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -4,13 +4,13 @@
     autoLogin.user = "tao";
   };
 
-
   environment.systemPackages = with pkgs;
     [
       # mesa
       openrgb
       gwe
       liquidctl
+      snapper
       # egl-wayland
       # nvidia-vaapi-driver
     ];
@@ -21,7 +21,6 @@
     NIXOS_OZONE_WL = "1";
   };
 
-
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09";
     fsType = "btrfs";
@@ -37,7 +36,6 @@
     fsType = "btrfs";
     options = [ "subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" ];
   };
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/2B28-151D";
     fsType = "vfat";
@@ -59,7 +57,6 @@
   };
   swapDevices = [{ device = "/dev/disk/by-uuid/ca0ed3d7-8758-4ac7-b016-8b4cd9608ded"; }];
 
-
   services.snapper.configs =
     {
       home = {
@@ -73,7 +70,6 @@
     };
   services.snapper.snapshotInterval = "*:0/5";
 
-
   # systemd.user.services.fans = {
   #   description = "NZXT fans to 69% using liquidctl";
   #   script = ''
@@ -82,13 +78,11 @@
   #   wantedBy = [ "default.target" ];
   # };
 
-
   # boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelPackages = pkgs.unstable.linuxPackages_latest;
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.kernelModules = [ "i2c-dev" "kvm-amd" ];
 
-
   hardware.opengl = {
     enable = true;
     driSupport = true;
@@ -110,13 +104,11 @@
     wantedBy = [ "multi-user.target" ];
   };
 
-
   services.udev.packages = [ pkgs.openrgb ];
   services.udev.extraRules = ''
     KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a3c5", MODE="0666"
   '';
 
-
   time.hardwareClockInLocalTime = true;
   networking.hostName = "NOcomputer";
 }
diff --git a/users/tao.nix b/users/tao.nix
index 912962e..35428d9 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -1,24 +1,18 @@
 { pkgs, ... }: {
   users.users.tao.packages = with pkgs; [
-    appimage-run
-    nixpkgs-fmt
-    onlyoffice-bin
-    ripgrep-all
-    snapper
-    unstable.oculante
+    # enchant
     # expressvpn
     # fractal
-    # gnumake
     # libftdi
     # libusb
-    # nix-prefetch-scripts
+    # mdbook
+    # nuspell
+    # partition-manager
     # pkg-config
+    # slack
+    appimage-run
     aspell
     aspellDicts.en
-    # enchant
-    # nuspell
-    # hunspellDicts.en-us-large
-    rustdesk
     bottles
     cider
     darktable
@@ -28,23 +22,26 @@
     keepassxc
     libsForQt5.kcharselect
     libsForQt5.kdeconnect-kde
-    # mdbook
-    # partition-manager
-    # slack
+    obs-studio
+    ocs-url
+    onlyoffice-bin
+    ripgrep-all
+    rustdesk
+    snapper
     tectonic
     texlab
     tio
-    unstable.typst
-    ocs-url
     typst-lsp
     unstable.nushell
+    unstable.oculante
     unstable.prusa-slicer
     unstable.starship
+    unstable.typst
     unstable.wezterm
     virt-manager
+    zathura
     zoom-us
     zoxide
-    obs-studio
   ];
   environment.shells = with pkgs; [ unstable.nushell ];