summaryrefslogtreecommitdiffstats
path: root/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-07-21 18:57:58 +0200
committerlassulus <lass@aidsballs.de>2015-07-21 19:08:41 +0200
commit2eb1002f7a47b09b64ae1985642168e9733c92e7 (patch)
treedb10a92c46b3ab462c8e32b1a56914a7920aa49d /1systems
parent1edc8c249da009e8e99ee4d0f6dce9449ab03c41 (diff)
1&2 lass: move userconfig to base.nix
Diffstat (limited to '1systems')
-rw-r--r--1systems/lass/mors.nix15
-rw-r--r--1systems/lass/uriel.nix33
2 files changed, 10 insertions, 38 deletions
diff --git a/1systems/lass/mors.nix b/1systems/lass/mors.nix
index 940dc4fdb..7e70be8c4 100644
--- a/1systems/lass/mors.nix
+++ b/1systems/lass/mors.nix
@@ -168,21 +168,6 @@
'';
};
- users.extraUsers = {
- #main user
- mainUser = {
- uid = 1337;
- name = "lass";
- #isNormalUser = true;
- group = "users";
- createHome = true;
- home = "/home/lass";
- useDefaultShell = true;
- isSystemUser = false;
- extraGroups = [ "wheel" "audio" ];
- };
- };
-
environment.systemPackages = with pkgs; [
];
diff --git a/1systems/lass/uriel.nix b/1systems/lass/uriel.nix
index 25745d055..a5a0833dc 100644
--- a/1systems/lass/uriel.nix
+++ b/1systems/lass/uriel.nix
@@ -1,5 +1,6 @@
{ config, pkgs, ... }:
+with builtins;
{
imports = [
../../2configs/lass/desktop-base.nix
@@ -30,6 +31,15 @@
enable = true;
};
}
+ {
+ users.extraUsers = {
+ root = {
+ openssh.authorizedKeys.keys = map readFile [
+ ../../Zpubkeys/uriel.ssh.pub
+ ];
+ };
+ };
+ }
];
networking.hostName = "uriel";
@@ -87,29 +97,6 @@
'';
};
- users.extraUsers = {
- root = {
- openssh.authorizedKeys.keys = [
- config.sshKeys.lass.pub
- ];
- };
- mainUser = {
- uid = 1337;
- name = "lass";
- #isNormalUser = true;
- group = "users";
- createHome = true;
- home = "/home/lass";
- useDefaultShell = true;
- isSystemUser = false;
- description = "lassulus";
- extraGroups = [ "wheel" "audio" ];
- openssh.authorizedKeys.keys = [
- config.sshKeys.lass.pub
- ];
- };
- };
-
environment.systemPackages = with pkgs; [
];