cleanup

1 files changed, 5 insertions, 6 deletions

diff --git a/vali.nix b/vali.nix
index 624edaa9..5811f778 100644
--- a/vali.nix
+++ b/vali.nix
@@ -4,11 +4,11 @@
 
 { config, pkgs, ... }:
 
-{
+(import ./users.nix) {
   imports =
     [ # Include the results of the hardware scan.
       ./vali-hw.nix
-      ./users.nix
+      ./custom/zsh.nix
     ];
 
   # Use the GRUB 2 boot loader.
@@ -66,10 +66,9 @@
   # services.xserver.desktopManager.kde4.enable = true;
 
   users.extraUsers.root = let
-    template = (import users/gkleen.nix).users.extraUsers.gkleen;
+    template = (import users/gkleen.nix)
     in
-      {
-        shell = template.shell;
-        openssh.authorizedKeys.keyFiles = template.openssh.authorizedKeys.keyFiles;
+      with template; {
+        inherit shell openssh.authorizedKeys.keyFiles;
       };
 }