From 0d9ef7ba1cf5098c85aa3143f267d8fea710eeda Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Sat, 30 Sep 2023 22:09:06 -0700
Subject: [PATCH] move stuff

---
 systems/NOlaptop.nix |  2 ++
 users/pi.nix         | 43 +------------------------------------------
 users/tao.nix        | 32 +++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index bfb83c6..ff2d678 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -33,6 +33,8 @@
   #   extraBackends = [ pkgs.epkowa ];
   # };
 
+  services.xserver.displayManager.defaultSession = "plasmawayland";
+
   boot.initrd.availableKernelModules = [
     "nvme"
     "sd_mod"
diff --git a/users/pi.nix b/users/pi.nix
index f8da10d..81d4fec 100644
--- a/users/pi.nix
+++ b/users/pi.nix
@@ -1,54 +1,13 @@
 { pkgs, ... }:
 {
   users.users.tao.packages = with pkgs; [
-    # expressvpn
-    # fractal
-    # gnumake
-    # libftdi
-    # libusb
-    # nix-prefetch-scripts
-    # pkg-config
-    # aspell
-    # aspellDicts.en
-    # enchant
-    # nuspell
-    # hunspellDicts.en-us-large
-    # rustdesk
-    # bottles
-    # cider
-    # darktable
-    # deluge
-    # discord
-    # gh
-    # keepassxc
-    # libsForQt5.kcharselect
     libsForQt5.kdeconnect-kde
-    # mdbook
-    # partition-manager
-    # slack
-    # tectonic
-    # texlab
-    # tio
-    # unstable.typst
-    # ocs-url
-    # typst-lsp
-    # unstable.nushell
-    # unstable.prusa-slicer
-    # unstable.starship
-    # unstable.wezterm
-    # virt-manager
-    # zoom-us
-    # zoxide
-    # obs-studio
   ];
   # programs.nushell.enable = true;
   # environment.shells = with pkgs; [ unstable.nushell ];
 
   # services.expressvpn.enable = true;
 
-  # virtualisation.libvirtd.enable = true;
-  # programs.dconf.enable = true;
-
   # services.syncthing = {
   #   enable = true;
   #   user = "tao";
@@ -64,7 +23,7 @@
 
   users.users.tao = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "libvirtd" "dialout" "scanner" "lp" ];
+    extraGroups = [ "wheel" "dialout" ];
     # shell = pkgs.unstable.nushell;
   };
 
diff --git a/users/tao.nix b/users/tao.nix
index a0e4d3d..f9805f5 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -1,6 +1,12 @@
 { pkgs, ... }:
 {
   users.users.tao.packages = with pkgs; [
+    appimage-run
+    nixpkgs-fmt
+    onlyoffice-bin
+    ripgrep-all
+    snapper
+    unstable.oculante
     # expressvpn
     # fractal
     # gnumake
@@ -13,12 +19,12 @@
     # enchant
     # nuspell
     # hunspellDicts.en-us-large
-    # rustdesk
-    # bottles
-    # cider
+    rustdesk
+    bottles
+    cider
     darktable
     deluge
-    # discord
+    discord
     gh
     keepassxc
     libsForQt5.kcharselect
@@ -29,20 +35,20 @@
     tectonic
     texlab
     tio
-    # unstable.typst
+    unstable.typst
     ocs-url
     typst-lsp
-    # unstable.nushell
-    # unstable.prusa-slicer
-    # unstable.starship
-    # unstable.wezterm
+    unstable.nushell
+    unstable.prusa-slicer
+    unstable.starship
+    unstable.wezterm
     virt-manager
-    # zoom-us
+    zoom-us
     zoxide
     obs-studio
   ];
-  # programs.nushell.enable = true;
-  # environment.shells = with pkgs; [ unstable.nushell ];
+  programs.nushell.enable = true;
+  environment.shells = with pkgs; [ unstable.nushell ];
 
   # services.expressvpn.enable = true;
 
@@ -65,7 +71,7 @@
   users.users.tao = {
     isNormalUser = true;
     extraGroups = [ "wheel" "libvirtd" "dialout" "scanner" "lp" ];
-    # shell = pkgs.unstable.nushell;
+    shell = pkgs.unstable.nushell;
   };
 
   # i18n.inputMethod = {