summaryrefslogtreecommitdiff
path: root/vali.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-07-03 20:36:51 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-07-03 20:36:51 +0200
commitbecb65b0cd99ed8d338160fa5f5d3b79a458f42a (patch)
treeb1c326290c53be54cbc8d1a0088672d51babc607 /vali.nix
parentbb56572f19e9150276d566e60788ce1df7da795f (diff)
downloadnixos-becb65b0cd99ed8d338160fa5f5d3b79a458f42a.tar
nixos-becb65b0cd99ed8d338160fa5f5d3b79a458f42a.tar.gz
nixos-becb65b0cd99ed8d338160fa5f5d3b79a458f42a.tar.bz2
nixos-becb65b0cd99ed8d338160fa5f5d3b79a458f42a.tar.xz
nixos-becb65b0cd99ed8d338160fa5f5d3b79a458f42a.zip
cleanup
Diffstat (limited to 'vali.nix')
-rw-r--r--vali.nix11
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 @@
4 4
5{ config, pkgs, ... }: 5{ config, pkgs, ... }:
6 6
7{ 7(import ./users.nix) {
8 imports = 8 imports =
9 [ # Include the results of the hardware scan. 9 [ # Include the results of the hardware scan.
10 ./vali-hw.nix 10 ./vali-hw.nix
11 ./users.nix 11 ./custom/zsh.nix
12 ]; 12 ];
13 13
14 # Use the GRUB 2 boot loader. 14 # Use the GRUB 2 boot loader.
@@ -66,10 +66,9 @@
66 # services.xserver.desktopManager.kde4.enable = true; 66 # services.xserver.desktopManager.kde4.enable = true;
67 67
68 users.extraUsers.root = let 68 users.extraUsers.root = let
69 template = (import users/gkleen.nix).users.extraUsers.gkleen; 69 template = (import users/gkleen.nix)
70 in 70 in
71 { 71 with template; {
72 shell = template.shell; 72 inherit shell openssh.authorizedKeys.keyFiles;
73 openssh.authorizedKeys.keyFiles = template.openssh.authorizedKeys.keyFiles;
74 }; 73 };
75} 74}