From 2db1d700fb6169cbd63c7a98cd93bb6cb65211f0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 12 Apr 2015 19:24:53 +0200 Subject: move mainUser config to extraUsers.mainUser --- modules/mors/default.nix | 13 ++++++------- modules/uriel/default.nix | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 19c0755fc..f86b23e76 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -145,11 +145,7 @@ #TODO move into modules users.extraUsers = { - root = { - hashedPassword = "$6$78Zog6OCAQn6tFCO$jpOPksguWEsOPz7u1r6kVApD0Zb2SqjFV8Gn1JCZevcMtBI.jm0CcojXvW.v23xWDt4wZE4KcxFSNWNU.E9ef."; - }; - #main user - lass = { + mainUser = { uid = 1337; name = "lass"; #isNormalUser = true; @@ -158,10 +154,13 @@ home = "/home/lass"; useDefaultShell = true; isSystemUser = false; - description = "lassulus"; extraGroups = [ "wheel" "audio" ]; hashedPassword = "$6$78Zog6OCAQn6tFCO$jpOPksguWEsOPz7u1r6kVApD0Zb2SqjFV8Gn1JCZevcMtBI.jm0CcojXvW.v23xWDt4wZE4KcxFSNWNU.E9ef."; }; + root = { + hashedPassword = "$6$78Zog6OCAQn6tFCO$jpOPksguWEsOPz7u1r6kVApD0Zb2SqjFV8Gn1JCZevcMtBI.jm0CcojXvW.v23xWDt4wZE4KcxFSNWNU.E9ef."; + }; + #main user #miefda-mc-dev user miefda = { uid = 1338; @@ -188,7 +187,7 @@ users.extraGroups = { loot = { members = [ - "lass" + config.users.extraUsers.mainUser.name "firefox" "chromium" "google" diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index f572e4418..f68d955ea 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -73,8 +73,7 @@ root = { hashedPassword = "$6$78Zog6OCAQn6tFCO$jpOPksguWEsOPz7u1r6kVApD0Zb2SqjFV8Gn1JCZevcMtBI.jm0CcojXvW.v23xWDt4wZE4KcxFSNWNU.E9ef."; }; - #main user - lass = { + mainUser = { uid = 1337; name = "lass"; #isNormalUser = true; -- cgit v1.2.3