summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--users.nix3
-rw-r--r--users/gkleen.nix28
-rw-r--r--vali.nix11
3 files changed, 20 insertions, 22 deletions
diff --git a/users.nix b/users.nix
index a7960588..648460d6 100644
--- a/users.nix
+++ b/users.nix
@@ -1,4 +1,5 @@
1{ 1{
2 users.mutableUsers = false; 2 users.mutableUsers = false;
3 users.defaultUserShell = "/run/current-system/sw/bin/zsh"; 3 users.defaultUserShell = "/run/current-system/sw/bin/zsh";
4} // (import ./users/gkleen.nix) 4 users.extraUsers.gkleen = import ./users/gkleen.nix;
5}
diff --git a/users/gkleen.nix b/users/gkleen.nix
index 1e8b62c9..f39b4ff3 100644
--- a/users/gkleen.nix
+++ b/users/gkleen.nix
@@ -1,17 +1,15 @@
1{ 1{
2 users.extraUsers.gkleen = { 2 name = "gkleen";
3 name = "gkleen"; 3 description = "Gregor Kleen";
4 description = "Gregor Kleen"; 4 extraGroups = [ "wheel" "wlan" "lp" "dialout" ];
5 extraGroups = [ "wheel" "wlan" "lp" "dialout" ]; 5 group = "users";
6 group = "users"; 6 uid = 1000;
7 uid = 1000; 7 createHome = true;
8 createHome = true; 8 home = "/home/gkleen";
9 home = "/home/gkleen"; 9 shell = "/run/current-system/sw/bin/zsh";
10 shell = "/run/current-system/sw/bin/zsh"; 10 isNormalUser = true;
11 isNormalUser = true; 11 openssh.authorizedKeys.keyFiles = [
12 openssh.authorizedKeys.keyFiles = [ 12 keys/gkleen-skadhi.pub
13 keys/gkleen-skadhi.pub 13 ];
14 ]; 14 hashedPassword = "$6$fJbC4zdY$fOdHMAfIZldfE1oYcLN0WflJpD1J4tXjCP21QfjP6R4nVcbYI.bb1AjZftcJtpHvBA/tC5pJXYoaxTRFvwxvA/";
15 hashedPassword = "$6$fJbC4zdY$fOdHMAfIZldfE1oYcLN0WflJpD1J4tXjCP21QfjP6R4nVcbYI.bb1AjZftcJtpHvBA/tC5pJXYoaxTRFvwxvA/";
16 };
17} 15}
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}