diff --git a/default.nix b/default.nix
index 4b91215..ccda98f 100644
--- a/default.nix
+++ b/default.nix
@@ -9,8 +9,8 @@ let
   };
   
 in {
-  generate-config = { username, user-email, home-dir }:
-    { enable-gui ? false, ... }: pkgs.callPackage user-configs.${username} {
-      inherit username user-email home-dir enable-gui;
+  generate-config = { username, user-email, home-dir, ... }:
+    { enable-gui ? false, ... }: import user-configs.${username} {
+      inherit config lib pkgs username user-email home-dir enable-gui;
     };
 }
diff --git a/doom-emacs-package.nix b/doom-emacs-package.nix
index 74ae771..6fb5366 100644
--- a/doom-emacs-package.nix
+++ b/doom-emacs-package.nix
@@ -24,16 +24,6 @@ in {
         buildInputs = esuper.buildInputs
                       ++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
       });
-      spinner = let version = "1.7.4";
-                in prev.trivialBuild {
-                  inherit version;
-                  pname = "spinner";
-                  src = builtins.fetchTarball {
-                    url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
-                    sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
-                  };
-                  buildPhase = ":";
-                };
     };
   };
 
diff --git a/niten.nix b/niten.nix
index 2b5c64e..b0c764f 100644
--- a/niten.nix
+++ b/niten.nix
@@ -135,8 +135,8 @@ in {
 
     redshift = {
       enable = true;
-      latitude = 47;
-      longitude = 122;
+      latitude = "47";
+      longitude = "122";
     };
   };
 
@@ -149,17 +149,15 @@ in {
       realName = "Niten";
       imap = {
         host = "mail.fudo.org";
-        tls = {
-          enable = true;
-          port = 993;
-        };
+        port = 993;
+        tls.enable = true;
       };
       smtp = {
         host = "mail.fudo.org";
+        port = 587;
         tls = {
           enable = true;
           useStartTls = true;
-          port = 587;
         };
       };
     };
diff --git a/xiaoxuan.nix b/xiaoxuan.nix
index 722e324..5b34a36 100644
--- a/xiaoxuan.nix
+++ b/xiaoxuan.nix
@@ -2,8 +2,9 @@
 
 with lib; if !enable-gui then {} else {
   home = {
-    programs = with pkgs; [
+    packages = with pkgs; [
       fcitx5-configtool
+      fcitx5-gtk
       firefox
       gnome.gnome-tweaks
       google-chrome
@@ -23,10 +24,11 @@ with lib; if !enable-gui then {} else {
     username = username;
   };
 
-  i18n.inputMethod = {
-    enabled = "fcitx5";
-    fcitx5.addons = [ pkgs.fcitx5-rime ];
-  };
+  ## Sigh...have to wait for this
+  # i18n.inputMethod = {
+  #   enabled = "fcitx5";
+  #   fcitx5.addons = [ pkgs.fcitx5-rime ];
+  # };
 
   programs = {
     firefox.enable = true;
@@ -43,8 +45,8 @@ with lib; if !enable-gui then {} else {
 
     redshift = {
       enable = true;
-      latitude = 47;
-      longitude = 122;
+      latitude = "47";
+      longitude = "122";
     };
   };
 
@@ -57,17 +59,15 @@ with lib; if !enable-gui then {} else {
       realName = "Xiaoxuan Jin";
       imap = {
         host = "mail.fudo.org";
-        tls = {
-          enable = true;
-          port = 993;
-        };
+        tls.enable = true;
+        port = 993;
       };
       smtp = {
         host = "mail.fudo.org";
+        port = 587;
         tls = {
           enable = true;
           useStartTls = true;
-          port = 587;
         };
       };
     };