From 49f7f4b5fb298d1eb3e4e3fefbfea9a9aad69c85 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Wed, 11 May 2022 13:46:28 +0200
Subject: [PATCH] Fix user definition places

- define userlist in machine
- define metadata in common/users.nix
- define options and settings in modules/users.nix
---
 common/users.nix              |  3 ---
 machines/stel-xps/default.nix | 13 ++++++++++++-
 modules/users.nix             | 14 --------------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/common/users.nix b/common/users.nix
index c2e57ae..0cd0efe 100644
--- a/common/users.nix
+++ b/common/users.nix
@@ -3,9 +3,6 @@ with lib; {
   config = {
     elss = {
       users = {
-        enable = true;
-        admiins = [ "ellmau" ];
-        users = [ ];
         meta = {
           ellmau = {
             description = "Stefan Ellmauthaler";
diff --git a/machines/stel-xps/default.nix b/machines/stel-xps/default.nix
index 722b378..0a4162e 100644
--- a/machines/stel-xps/default.nix
+++ b/machines/stel-xps/default.nix
@@ -1,6 +1,17 @@
 { config, pkgs, ...}:
 {
-  imports = [ ./printer.nix ];
+
+  elss = {
+    users = {
+      enable = true;
+      admins = [ "ellmau" ];
+      users = [ ];
+    };
+  };
+  imports = [
+    ../../common/users.nix
+    ./printer.nix
+  ];
 
   variables = {
     hostName = "stel-xps";
diff --git a/modules/users.nix b/modules/users.nix
index 7fbe541..37be2b9 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -4,20 +4,6 @@ with lib; {
   options.elss.users = {
     enable = mkEnableOption "elss specific user configuration";
 
-    commonUserFile = mkOption {
-      type = types.attrsOf
-        (types.submodule{
-          options = {
-            enable = mkEnableOption "use a common file of users";
-            fileLoc = mkOption {
-              description = "path to the file of users";
-              type = types.path;
-              default = ../common/users.nix;
-            };
-          };
-        });
-    };
-
     users = mkOption {
       description = "logins of non-admin users to configure";
       type = types.listOf types.str;