From f072eb4b18ceaf5bed8219e885a28bd0ab84b7c8 Mon Sep 17 00:00:00 2001
From: Kat Huang <kkathuang@gmail.com>
Date: Fri, 10 Jul 2020 12:33:10 -0700
Subject: [PATCH] [NixOS] Tweaks for kat

---
 nixos/configuration.nix    | 38 +++-----------------------------------
 nixos/machines/katboon.nix |  2 ++
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 1e94d270..041c237b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -25,7 +25,6 @@ in
 {
   nixpkgs.overlays = [
     (import ./overlays.nix)
-    (import ../dotfiles/config/taffybar/taffybar/environment.nix)
   ];
 
   # Allow all the things
@@ -141,14 +140,6 @@ in
     plasma5.breeze-gtk
     plasma5.breeze-qt5
 
-    # Haskell Desktop
-    (import ../dotfiles/config/taffybar/default.nix)
-    (import ../dotfiles/config/xmonad/default.nix)
-    # notifications-tray-icon
-    haskellPackages.status-notifier-item
-    haskellPackages.xmonad
-    haskellPackages.dbus-hslogger
-
     # Desktop
     autorandr
     betterlockscreen
@@ -156,6 +147,7 @@ in
     clipit
     feh
     gnome3.gpaste
+    gnome3.gnome-tweaks
     kdeconnect
     libnotify
     lxqt.lxqt-powermanagement
@@ -334,36 +326,14 @@ in
     desktopManager = {
       plasma5.enable = true;
     };
-    windowManager = {
-      session = [
-        {
-          name = "xmonad";
-          start = ''
-            /usr/bin/env imalison-xmonad &
-            waitPID=$!
-          '';
-        }
-        {
-          name = "waymonad";
-          start = ''
-            /usr/bin/env waymonad
-            waitPID=$!
-          '';
-        }
-      ];
-    };
     displayManager = {
-      sddm = {
-        enable = true;
-      };
+      sddm.enable = true;
       sessionCommands = ''
         systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
       '';
     };
   };
 
-  virtualisation.docker.enable = true;
-
   users.extraUsers = let
     extraGroups = [
       "audio"
@@ -385,16 +355,14 @@ in
   in {
     imalison = userDefaults // {
       name = "imalison";
-      uid = 1000;
       home = "/home/imalison";
       shell = pkgs.zsh;
     };
     kat = userDefaults // {
       name = "kat";
-      uid = 1001;
       home = "/home/kat";
       shell = pkgs.zsh;
     };
   };
-  nix.trustedUsers = ["imalison"];
+  nix.trustedUsers = ["imalison" "kat"];
 }
diff --git a/nixos/machines/katboon.nix b/nixos/machines/katboon.nix
index aa01f228..fef906ea 100644
--- a/nixos/machines/katboon.nix
+++ b/nixos/machines/katboon.nix
@@ -9,6 +9,8 @@
       ../configuration.nix
     ];
 
+  system.stateVersion = "20.03";
+
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];