From de8c66d53079cd6776957c15163283199918754e Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Fri, 15 Mar 2024 21:39:09 -0700
Subject: [PATCH] cleanup

---
 extras/dev.nix         |  5 -----
 systems/BASED.nix      |  8 +++-----
 systems/NOcomputer.nix |  2 +-
 users/tao.nix          |  5 ++++-
 users/tao/HOME.nix     | 26 +++++++++++++-------------
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/extras/dev.nix b/extras/dev.nix
index 586b22b..0b75329 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -58,11 +58,6 @@
     trunk
   ];
 
-  # nixpkgs.config.permittedInsecurePackages = [
-  #   # etcher
-  #   "electron-19.1.9"
-  # ];
-
   services.udev.extraRules = ''
     SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
     SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port",  SYMLINK+="ttyBmpTarg"
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 318104a..5fc1bea 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -12,15 +12,12 @@
     cifs-utils
     du-dust
     exfatprogs
-    ffmpeg
-    firefox
     git
     inputs.helix.packages.${pkgs.system}.default
     # libthai
     localsend
     macchina
     mesa
-    mpv
     ouch
     ripgrep
     rustdesk
@@ -29,8 +26,9 @@
     tree
     wezterm
     # wget
-    yt-dlp
-    zellij
+    # yt-dlp
+    # zellij
+    pueue
     zstd
   ];
   programs.partition-manager.enable = lib.mkDefault true;
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 05d8699..6d29df1 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -9,7 +9,7 @@
     # nvidia-vaapi-driver
     # foldingathome
     gwe
-    mesa
+    # mesa
     openrgb
     snapper
   ];
diff --git a/users/tao.nix b/users/tao.nix
index e879b75..eabb087 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -5,6 +5,9 @@
   ...
 }: {
   users.users.tao.packages = with pkgs; [
+    ffmpeg
+    firefox
+    yt-dlp
     # birdtray
     # cider
     # enchant
@@ -51,13 +54,13 @@
     libsForQt5.plasma-integration
     libsForQt5.plasma-vault
     miniserve
+    mpv
     nushell
     obs-studio
     onlyoffice-bin
     pandoc
     pipe-rename
     prusa-slicer
-    pueue
     qmk
     qmk-udev-rules
     ripgrep-all
diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index 39f05f0..b0455c2 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -42,19 +42,19 @@
       settings = builtins.fromTOML (builtins.readFile ./starship.toml);
     };
 
-    taskwarrior = {
-      enable = true;
-    };
+    # taskwarrior = {
+    #   enable = true;
+    # };
 
     wezterm = {
       enable = true;
       extraConfig = builtins.readFile ./wezterm.lua;
     };
 
-    zellij = {
-      enable = true;
-      settings = {};
-    };
+    # zellij = {
+    #   enable = true;
+    #   settings = {};
+    # };
 
     zoxide = {
       enable = true;
@@ -62,12 +62,12 @@
     };
   };
 
-  services = {
-    pueue = {
-      enable = true;
-      settings = {};
-    };
-  };
+  # services = {
+  #   pueue = {
+  #     enable = true;
+  #     settings = {};
+  #   };
+  # };
 
   home.username = "tao";
   home.homeDirectory = "/home/tao";