diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
commit | e100119827474928636c2ed9a9772f3c5107663b (patch) | |
tree | 80833a41f9f067125fea734b134b0a9424fd7159 /users | |
parent | 000d46fbd462dc59aa143261b894f9c470e54040 (diff) | |
parent | f655f88cbbc334ad56a79c2287f18defa5aa98ba (diff) | |
download | nixos-e100119827474928636c2ed9a9772f3c5107663b.tar nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.gz nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.bz2 nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.xz nixos-e100119827474928636c2ed9a9772f3c5107663b.zip |
Merge branch 'master' of git:nixos
Diffstat (limited to 'users')
-rw-r--r-- | users/gkleen@ymir.nix | 1 | ||||
-rw-r--r-- | users/mherold.nix | 2 | ||||
-rw-r--r-- | users/some.nix | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/users/gkleen@ymir.nix b/users/gkleen@ymir.nix index 79a121fc..72d4c30c 100644 --- a/users/gkleen@ymir.nix +++ b/users/gkleen@ymir.nix | |||
@@ -1,4 +1,5 @@ | |||
1 | { | 1 | { |
2 | packageOverrides = pkgs: rec { | 2 | packageOverrides = pkgs: rec { |
3 | infinoted = pkgs.libinfinity.override { daemon = true; }; | ||
3 | } // (import ../utils/nix/default.nix) {}; | 4 | } // (import ../utils/nix/default.nix) {}; |
4 | } | 5 | } |
diff --git a/users/mherold.nix b/users/mherold.nix index 209dbadc..4a35d2b9 100644 --- a/users/mherold.nix +++ b/users/mherold.nix | |||
@@ -3,6 +3,6 @@ | |||
3 | description = "Magdalena Herold"; | 3 | description = "Magdalena Herold"; |
4 | extraGroups = ["xmpp" "mail"]; | 4 | extraGroups = ["xmpp" "mail"]; |
5 | group = "users"; | 5 | group = "users"; |
6 | hashedPassword = "$6$rounds=500000$MUhLTEEvBI$NJ1l17WtRpDJGCWzVPfbjxCcx4G/yKSIbYXDMX3D.q3Go6nyWjl6.kF.D5O8.72eTDlbhkJIWF4fkMrs0MQt10"; | 6 | hashedPassword = "$6$rounds=500000$y5qNae9r/U/7$HbSrmPcrPl9OQvRFMeo8PDYar32Y1i/C1R5di82rN4PPQZYxg/W.anHSI5Xws6fOQmDtvGsT0lCe4NFNxuTF41"; |
7 | isNormalUser = true; | 7 | isNormalUser = true; |
8 | } | 8 | } |
diff --git a/users/some.nix b/users/some.nix new file mode 100644 index 00000000..505b3abd --- /dev/null +++ b/users/some.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | { | ||
2 | name = "some"; | ||
3 | description = "SomeNights"; | ||
4 | extraGroups = ["xmpp" "mail"]; | ||
5 | group = "users"; | ||
6 | hashedPassword = "$6$rounds=500000$ZOKcPFUxFCCxbS$PSjgCpHs5GfmmusjTVEBY89NFS.hvY21.iuscfiXW8R.B2UW6ScyrIWWWPJkL4ZfI.6pKwXuf01gxazmDjy251"; | ||
7 | isNormalUser = true; | ||
8 | } | ||