From 4eac12cf97c9e72c433ce0da33e514cc41e7649b Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 20 Jan 2021 17:57:54 -0800
Subject: [PATCH] Revert "[NixOS] Tweaks for kat"

This reverts commit f072eb4b18ceaf5bed8219e885a28bd0ab84b7c8.
---
 dotfiles/config/taffybar/taffybar |  2 +-
 nixos/configuration.nix           | 27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index c8fe1a41..d1246c40 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit c8fe1a41497c2b68ba6c15404125afa7de283e86
+Subproject commit d1246c40967abc848b5d7b4f9e69a14f898e995f
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9ba9e802..6e5c0a3e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -161,7 +161,6 @@ in
     clipit
     feh
     gnome3.gpaste
-    gnome3.gnome-tweaks
     kdeconnect
     libnotify
     lxqt.lxqt-powermanagement
@@ -216,6 +215,7 @@ in
     carnix
     # rls
     rustc
+    rustfmt
 
     # Clojure
     boot
@@ -340,14 +340,29 @@ in
     desktopManager = {
       plasma5.enable = true;
     };
+    windowManager = {
+      session = [
+        {
+          name = "xmonad";
+          start = ''
+            /usr/bin/env imalison-xmonad &
+            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"
@@ -370,21 +385,17 @@ 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 = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-   };
   nix.trustedUsers = ["imalison" "kat"];
 }