diff --git a/extras/dev.nix b/extras/dev.nix
index 5e741e7..f091c65 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -5,9 +5,8 @@
 }: {
   environment.systemPackages = with pkgs; [
     # freecad
-    # pijul
     # vulkan-loader
-    etcher
+    # etcher
     hyperfine
     inputs.helix.packages.${pkgs.system}.default
     jq
@@ -36,7 +35,7 @@
 
     # nix
     nil
-    nixpkgs-fmt
+    # nixpkgs-fmt
     alejandra
 
     # python
@@ -56,10 +55,10 @@
     trunk
   ];
 
-  nixpkgs.config.permittedInsecurePackages = [
-    # probably etcher
-    "electron-19.1.9"
-  ];
+  # nixpkgs.config.permittedInsecurePackages = [
+  #   # probably etcher
+  #   "electron-19.1.9"
+  # ];
 
   services.udev.extraRules = ''
     SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
diff --git a/extras/gaming.nix b/extras/gaming.nix
index 6255d67..373a642 100644
--- a/extras/gaming.nix
+++ b/extras/gaming.nix
@@ -1,29 +1,27 @@
-# { pkgs, aagl, ... }: {
 {pkgs, ...}: {
+  # { pkgs, aagl, ... }: {
   # imports = [ aagl.nixosModules.default ];
+  # nix.settings = aagl.nixConfig;
+  # programs.honkers-railway-launcher.enable = true;
+  # nixpkgs.config.permittedInsecurePackages = [
+  #   "electron-24.8.6"
+  #   # "electron-12.2.3"
+  # ];
 
   environment.systemPackages = with pkgs; [
+    # parsec-bin
     heroic
     lutris
     mangohud
     prismlauncher
     protonup
     wine
-    # parsec-bin
-  ];
-
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-24.8.6"
-    # "electron-12.2.3"
   ];
 
   programs.steam.enable = true;
   programs.gamemode.enable = true;
   programs.gamescope.enable = true;
 
-  # nix.settings = aagl.nixConfig;
-  # programs.honkers-railway-launcher.enable = true;
-
   users = {groups.game = {};};
   security.pam.loginLimits = [
     {
@@ -65,10 +63,5 @@
         resample.quality = 1;
       };
     };
-    # "pipewire/pipewire.d/99-input-denoising.conf" = json.generate "99-input-denoising.conf" {
-    #   context.modules = [{
-    #     name = "libpipewire-module-filter-chain";
-    #   }];
-    # };
   };
 }
diff --git a/flake.nix b/flake.nix
index 1187227..29cfb12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   description = "we say NO to shitty OSes";
 
   inputs = {
-    # nixpkgs.url = "nixpkgs/nixos-23.11";
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nixos-hardware.url = "nixos-hardware";
     nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi";
@@ -12,7 +11,6 @@
     helix.inputs.nixpkgs.follows = "nixpkgs";
     jujutsu.url = "github:martinvonz/jj";
     jujutsu.inputs.nixpkgs.follows = "nixpkgs";
-    # hyprland.url = "github:hyprwm/Hyprland";
     # aagl.url = "github:ezKEa/aagl-gtk-on-nix";
     # aagl.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -21,13 +19,8 @@
   };
 
   nixConfig = {
-    # extra-substituters = [ "https://hyprland.cachix.org" "https://ezkea.cachix.org" ];
-    # extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];
-    extra-substituters = ["https://hyprland.cachix.org"];
-    extra-trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
   };
 
-  # outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, aagl, ... }@inputs:
   outputs = {
     self,
     nixpkgs,
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index c51eedd..9d82749 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -6,10 +6,9 @@
 
   environment.systemPackages = with pkgs; [
     # egl-wayland
-    mesa
     # nvidia-vaapi-driver
     gwe
-    # liquidctl
+    mesa
     openrgb
     snapper
   ];
@@ -19,6 +18,7 @@
   environment.sessionVariables = {
     # wayland chromium workaround
     NIXOS_OZONE_WL = "1";
+
     # firefox nvidia-vaapi-driver
     # MOZ_DISABLE_RDD_SANDBOX = "1";
     # LIBVA_DRIVER_NAME = "nvidia";
@@ -72,14 +72,6 @@
   };
   services.snapper.snapshotInterval = "*:0/5";
 
-  # systemd.user.services.fans = {
-  #   description = "NZXT fans to 69% using liquidctl";
-  #   script = ''
-  #     ${pkgs.liquidctl}/bin/liquidctl -m nzxt set sync speed 69
-  #   '';
-  #   wantedBy = [ "default.target" ];
-  # };
-
   # boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelPackages = pkgs.linuxPackages_zen;
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index 857304f..62c1812 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -45,7 +45,6 @@
   #   wantedBy = [ "default.target" ];
   # };
 
-  # 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"
diff --git a/users/tao.nix b/users/tao.nix
index c061599..e2818c7 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -11,7 +11,6 @@
     # expressvpn
     # fractal
     # gh
-    joshuto
     # libftdi
     # libusb
     # mdbook
@@ -36,6 +35,7 @@
     gpt4all-chat
     jellyfin-media-player
     jellyfin-mpv-shim
+    joshuto
     keepassxc
     leetcode-cli
     libsForQt5.kcharselect
@@ -44,7 +44,7 @@
     miniserve
     nushell
     obs-studio
-    ollama
+    # ollama
     onefetch
     onlyoffice-bin
     pandoc
@@ -69,19 +69,18 @@
     zoxide
   ];
   # programs.adb.enable = true;
-  programs.mosh.enable = true;
+  # programs.mosh.enable = true;
   environment.shells = with pkgs; [nushell];
 
+  # virt
+  programs.dconf.enable = true;
+  virtualisation.libvirtd.enable = true;
+
+  hardware.keyboard.qmk.enable = true;
   services.udev.extraRules = ''
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
   '';
-  hardware.keyboard.qmk.enable = true;
-
-  # services.expressvpn.enable = true;
-
-  virtualisation.libvirtd.enable = true;
-  programs.dconf.enable = true;
 
   services.syncthing = {
     enable = true;
@@ -110,12 +109,6 @@
     shell = pkgs.nushell;
   };
 
-  # i18n.inputMethod = {
-  #   enabled = "fcitx5";
-  #   fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-chewing fcitx5-chinese-addons fcitx5-rime ];
-  # };
-
-  # home-manager.useUserPackages = false;
   home-manager.useGlobalPkgs = true;
   home-manager.verbose = true;
   home-manager.backupFileExtension = ".hm-bak";
diff --git a/users/tao/home.nix b/users/tao/home.nix
index 7106f4f..93fcc6f 100644
--- a/users/tao/home.nix
+++ b/users/tao/home.nix
@@ -5,7 +5,6 @@
 }: {
   imports = [
     (import ./helix.nix {inherit pkgs inputs;})
-    # ./hyprland.nix
     ./cargo.nix
   ];