diff --git a/base.nix b/base.nix
index a1aa0a7..4ccca9a 100644
--- a/base.nix
+++ b/base.nix
@@ -88,17 +88,17 @@
   nix.settings.min-free =  3 * 1024 * 1024 * 1024; # starts cg
   nix.settings.max-free = 20 * 1024 * 1024 * 1024; # condition to end gc triggered by min-free
 
-  services.thermald.enable = lib.mkIf (lib.all (x: x) [
-      (config.nixpkgs.system == "x86_64-linux")
-      (!config.boot.isContainer or false)
-    ]) true;
+  services.thermald.enable = lib.all (x: x) [
+    (config.nixpkgs.system == "x86_64-linux")
+    (!config.boot.isContainer or false)
+  ];
 
   # no acme in VM mode:
   virtualisation.vmVariant = {
-     /* users.users.root.initialPassword = "root"; */
-     security.acme.defaults.server = "https://127.0.0.1";
-     security.acme.preliminarySelfsigned = true;
-   };
+    /* users.users.root.initialPassword = "root"; */
+    security.acme.defaults.server = "https://127.0.0.1";
+    security.acme.preliminarySelfsigned = true;
+  };
 
   # System fonts
   # Nice to have when X-forwading on headless machines
diff --git a/users/adrlau/default.nix b/users/adrlau/default.nix
index 06469df..df2d342 100644
--- a/users/adrlau/default.nix
+++ b/users/adrlau/default.nix
@@ -5,7 +5,7 @@
   nix.settings.allowed-users = [ "adrlau" ];
   nix.settings.trusted-users = [ "adrlau" ];
 
-  users.users.adrlau = {
+  users.users."adrlau" = {
     isNormalUser = true;
     uid = 1007;
     description = "Adrian";
diff --git a/users/bartvbl/default.nix b/users/bartvbl/default.nix
index 2f7e624..8dd703c 100644
--- a/users/bartvbl/default.nix
+++ b/users/bartvbl/default.nix
@@ -4,7 +4,7 @@
   nix.settings.allowed-users = [ "bartvbl" ];
   nix.settings.trusted-users = [ "bartvbl" ];
 
-  users.users.bartvbl = {
+  users.users."bartvbl" = {
     isNormalUser = true;
     uid = 1004;
     description = "Bart Iver van Blokland";
diff --git a/users/daniel/default.nix b/users/daniel/default.nix
index 9d431f5..60acef7 100644
--- a/users/daniel/default.nix
+++ b/users/daniel/default.nix
@@ -5,7 +5,7 @@
   nix.settings.allowed-users = [ "daniel" ];
   nix.settings.trusted-users = [ "daniel" ];
 
-  users.users.daniel = {
+  users.users."daniel" = {
     isNormalUser = true;
     uid = 1003;
     description = "daniel";
diff --git a/users/eirikwit/default.nix b/users/eirikwit/default.nix
index 3420ea1..07630fe 100644
--- a/users/eirikwit/default.nix
+++ b/users/eirikwit/default.nix
@@ -5,7 +5,7 @@
   nix.settings.allowed-users = [ "eirikwit" ];
   nix.settings.trusted-users = [ "eirikwit" ];
 
-  users.users.eirikwit = {
+  users.users."eirikwit" = {
     isNormalUser = true;
     uid = 1005;
     description = "eirik";
diff --git a/users/h7x4/default.nix b/users/h7x4/default.nix
index 9ef290b..534c238 100644
--- a/users/h7x4/default.nix
+++ b/users/h7x4/default.nix
@@ -5,7 +5,7 @@
   nix.settings.allowed-users = [ "h7x4" ];
   nix.settings.trusted-users = [ "h7x4" ];
 
-  users.users.h7x4 = {
+  users.users."h7x4" = {
     isNormalUser = true;
     uid = 1006;
     description = "Øystein";
diff --git a/users/jornane/default.nix b/users/jornane/default.nix
index c37aa98..101da64 100644
--- a/users/jornane/default.nix
+++ b/users/jornane/default.nix
@@ -5,7 +5,7 @@
   nix.settings.allowed-users = [ "jornane" ];
   nix.settings.trusted-users = [ "jornane" ];
 
-  users.users.jornane = {
+  users.users."jornane" = {
     isNormalUser = true;
     uid = 1002;
     description = "jornane";
diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix
index 57cab29..dde4683 100644
--- a/users/pbsds/default.nix
+++ b/users/pbsds/default.nix
@@ -34,8 +34,8 @@
   nix.settings.allowed-users = [ "pbsds" ];
   nix.settings.trusted-users = [ "pbsds" ];
 
-  users.groups.pbsds.gid = 1001; # TODO: remove this, add a uid map to NFS instead
-  users.users.pbsds = {
+  users.groups."pbsds".gid = 1001; # TODO: remove this, add a uid map to NFS instead
+  users.users."pbsds" = {
     isNormalUser = true;
     uid = 1001; # TODO: uid mapping be done at nfs-mount level? That way we can enforce
     description = "pbsds";
@@ -82,4 +82,9 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILocbYCqu63RT2+mE0l+ZWWw9RVHNcydtLXbLklg6oPe pederbs@pvv"
     ];
   };
+
+  #virtualisation.vmVariant = {
+  #  users.users."pbsds".initialHashedPassword = "TODO";
+  #}
+
 }