9 files changed, 11 insertions, 1 deletions

diff --git a/users/gkleen.nix b/users/gkleen.nix
index 0d45cbd8..c23821f8 100644
--- a/users/gkleen.nix
+++ b/users/gkleen.nix
@@ -1,7 +1,7 @@
 {
   name = "gkleen";
   description = "Gregor Kleen";
-  extraGroups = [ "wheel" "wlan" "lp" "dialout" "audio" "xmpp" "mail" ];
+  extraGroups = [ "wheel" "wlan" "lp" "dialout" "audio" "xmpp" "mail" "ssh" ];
   group = "users";
   uid = 1000;
   createHome = true;
diff --git a/users/lkellers.nix b/users/lkellers.nix
index 9dc77cba..8b211fa3 100644
--- a/users/lkellers.nix
+++ b/users/lkellers.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$KHcqXGtdlq$ofrsiltqq8hMfNv0hp2hjhoDOI4/R//7A4vowp4SAJ0YRWEX6gfGqw.hxjhBfaQb/mitsKUnynqy7.eytTECv/";
+  isNormalUser = true;
 }
diff --git a/users/llovisa.nix b/users/llovisa.nix
index 04cd7c0f..abddd8fa 100644
--- a/users/llovisa.nix
+++ b/users/llovisa.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$ahydieatcH$MN9WtcyhNmVQ/r4aBv9MqGDSLM4QynFpsg4tvEjzaWTj7YJ3oYcU7JdYeYcSJgfy6qPsVzC81Pm2SR.rs7Jlo0";
+  isNormalUser = true;
 }
diff --git a/users/mherold.nix b/users/mherold.nix
index 4337b8dd..94c37789 100644
--- a/users/mherold.nix
+++ b/users/mherold.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$m.AN79AQAVp$5CnNImtGaYdYqSVHbeQV6XFKQwJyr1wMghM8W7qzvwFqtQVRvltjqWS2w7Thv7BDoaxZ9IdgoeiL/BiQfJ8dL1";
+  isNormalUser = true;
 }
diff --git a/users/mkleen.nix b/users/mkleen.nix
index 52ee9165..9c775e65 100644
--- a/users/mkleen.nix
+++ b/users/mkleen.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$ySWDkpwfqBDt$A0i/jnJDj75kfJJ/KHppe/Aqbk5IPBG2Z0gDkGaBwP9rAEfQZIUvQeyhi1GOxgxcJWDOu77ULiacih0Md/F8H1";
+  isNormalUser = true;
 }
diff --git a/users/tkleen.nix b/users/tkleen.nix
index 4bdc0c10..a36cc747 100644
--- a/users/tkleen.nix
+++ b/users/tkleen.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$bYwSamirigbgL6$h/VI5yxcsY25fJb9DwUdgSiSi8Re1iGwXUHaOPfVgrZDKkrkoKvDg36d/GQhlfEA9XWh58gFmW9rgVeHsse.C1";
+  isNormalUser = true;
 }
diff --git a/users/vkleen.nix b/users/vkleen.nix
index 1807ddda..5ef89d39 100644
--- a/users/vkleen.nix
+++ b/users/vkleen.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$6$rounds=500000$wOgtkxOshMT$3wT9nRqSCZRr9MkZcDQjMM3YbAekqCxEF0TwYcmjLqUk8Z44jeWQS96H/r3SKCfKWWcIWcQNp/dAxQ/QlcKAv.";
+  isNormalUser = true;
 }
diff --git a/users/xmpp-template.nix b/users/xmpp-template.nix
index ec3c754d..f1fdd620 100644
--- a/users/xmpp-template.nix
+++ b/users/xmpp-template.nix
@@ -4,4 +4,5 @@
   extraGroups = ["xmpp"];
   group = "users";
   hashedPassword = "$(pwgen -s 32 1 | tee /dev/stderr | mkpasswd -s -m sha-512 -R 500000)";
+  isNormalUser = true;
 }
diff --git a/ymir.nix b/ymir.nix
index ff5cbbde..6fb4fdcc 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -135,6 +135,9 @@ in rec {
   services.openssh = {
     enable = true;
     passwordAuthentication = false;
+    extraConfig = ''
+      AllowGroups ssh
+    '';
   };
 
   services.fcron = {