fix mail relay and add infiniband pkey

clusters/stokes/cluster.nix

@@ -12,6 +12,10 @@ let
   configuration = {
     system.autoUpgrade.enable = lib.mkForce false;
 
+    nixpkgs.overlays = [
+      (import ./overlays.nix)
+    ];
+
     boot = {
       loader.systemd-boot.enable = true;
       loader.efi.canTouchEfiVariables = true;
@@ -23,6 +27,9 @@ let
       ];
     };
 
+    services.udev.extraRules = ''
+      KERNEL=="ibp59s0", SUBSYSTEM=="net", ATTR{create_child}:="0x2222"
+    '';
 
     console = {
       font = "Lat2-Terminus16";
@@ -30,14 +37,49 @@ let
     };
 
     i18n = {
-      defaultLocale = "en_DK.UTF-8";
+      defaultLocale = "en_US.UTF-8";
       extraLocaleSettings = {
-        LC_TIME = "en_DK.UTF-8";
+          LC_CTYPE="en_DK.UTF-8";
+          LC_TIME="en_DK.UTF-8";
+          LC_PAPER="en_DK.UTF-8";
+          LC_NAME="en_DK.UTF-8";
+          LC_ADDRESS="en_DK.UTF-8";
+          LC_TELEPHONE="en_DK.UTF-8";
+          LC_MEASUREMENT="en_DK.UTF-8";
+          LC_IDENTIFICATION="en_DK.UTF-8";
       };
     };
 
     time.timeZone = "Europe/Oslo";
 
+    programs.msmtp = {
+      enable = true;
+      accounts = {
+        default = {
+          auth = false;
+          tls = false;
+          tls_starttls = false;
+          port = 24;
+          from = "stokes@regnekraft.io";
+          host = "smtpgw.itpartner.no";
+          # user = "utvikling";
+          # password = "S0m3rp0m@de#21!";
+        };
+      };
+      defaults = {
+        aliases = "/etc/aliases";
+      };
+    };
+
+    environment.etc = {
+      "aliases" = {
+        text = ''
+          root: jonas.juselius@oceanbox.io
+        '';
+        mode = "0644";
+      };
+    };
+
     features = {
       os = {
         # boot.uefi = true;
@@ -47,14 +89,6 @@ let
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
         ];
         docker.enable = false;
-
-        mailRelay = {
-          enable = true;
-          adminEmail = "jonas.juselius@tromso.serit.no";
-          mailDomain = "itpartner.no";
-          mailGateway = "smtpgw.itpartner.no:465";
-          mailAuthUser = "utvikling";
-        };
       };
       cachix.enable = false;
 
@@ -135,6 +169,13 @@ let
 
     systemd.services."serial-getty@ttyS0".enable = true;
 
+    environment.etc."beegfs/connauthfile" = {
+        source = ./connauthfile;
+        mode = "0400";
+        uid = 0;
+        gid = 0;
+      };
+
     nix = {
       maxJobs = 32;
       trustedUsers = [ "@wheel" ];
@@ -217,6 +258,7 @@ let
 
   openssh-shosts = pkgs.openssh.overrideAttrs (attrs: {
     buildFlags = [ "SSH_KEYSIGN=/run/wrappers/bin/ssh-keysign" ];
+    doCheck = false; # the tests take hours
   });
 
   myvnc =

clusters/stokes/connauthfile

@@ -0,0 +1 @@
+Elåºt8p¼IòÞV‹7öF5(µãMtßÍsƒÍD££œ
Ù<>íXÛ%Nöñ:@(9s6]Œ£*¼¯ôËq;…SËYbˤ„k—hdŽ1mÂk<uN/X+]¨Ïÿš6;¹žÙ9/3f

clusters/stokes/default.nix

@@ -145,13 +145,19 @@ let
         device = "/home";
         options = [ "bind" ];
       };
-      "/exports/opt" = {
+      "/stokes" = {
-        device = "/opt";
+        device = "/home";
         options = [ "bind" ];
       };
+      "/opt" = {
+        device = "10.1.63.80:/opt";
+        fsType = "nfs";
+        options = [ "soft" "rdma" "defaults" ];
+      };
       "/data" = {
         device = "10.1.63.80:/data";
         fsType = "nfs";
+        options = [ "soft" "rdma" "defaults" ];
       };
       "/vol/local-storage/vol1" = {
         device = "/vol/vol1";
@@ -245,6 +251,11 @@ let
       ];
     };
 
+    # ssh-rsa is deprecated, but putty/winscp users use it
+    services.openssh.extraConfig = ''
+      pubkeyacceptedalgorithms ssh-rsa,ssh-ed25519-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,rsa-sha2-512,rsa-sha2-256
+    '';
+
     imports = [ ./cluster.nix ./hw/frontend.nix ];
   };
 
@@ -252,19 +263,34 @@ let
     # deployment.tags = [ "compute" ];
 
     fileSystems = {
-      "/home/stokes" = {
+      "/stokes" = {
         device = "10.1.63.100:/home";
         fsType = "nfs";
+        options = [
+          "soft"
+          "defaults"
+          "noauto"
+          "x-systemd.automount"
+        ];
       };
       "/opt" = {
-        device = "10.1.63.100:/opt";
+        device = "10.1.63.80:/opt";
         fsType = "nfs";
+        options = [ "soft" "rdma" "defaults" ];
       };
       "/data" = {
         device = "10.1.63.80:/data";
         fsType = "nfs";
+        options = [ "soft" "rdma" "defaults" ];
       };
     };
+
+    systemd.automounts = [
+      {
+        where = "/stokes";
+        wantedBy = [ "default.target" ];
+      }
+    ];
   };
 
   mkCompute = host:
@@ -299,7 +325,7 @@ let
           } ];
 
         };
-        interfaces.ibp65s0 = {
+        interfaces.ibp65s0.2222 = {
           useDHCP = false;
           ipv4.addresses = [ {
             address = ipoib;

clusters/stokes/overlays.nix

@@ -0,0 +1,11 @@
+self: super:
+let
+  msmtp = super.msmtp.overrideAttrs (attrs: rec {
+    configureFlags = attrs.configureFlags ++ [ "--with-tls=openssl" ];
+    buildInputs = attrs.buildInputs ++ [ super.openssl ];
+  });
+in
+{
+    # inherit msmtp;
+}
+

clusters/stokes/users.nix

@@ -19,6 +19,7 @@
     ata = { gid = 1014; };
     kvile ={ gid = 1015; };
     achim ={ gid = 1016; };
+    mib ={ gid = 1017; };
     # @grp@
 
     sif = {
@@ -39,6 +40,7 @@
         "yugaos"
         "ata"
         "achim"
+        "mib"
       ];
     };
 
@@ -50,6 +52,7 @@
         "bast"
         "frankgaa"
         "hes"
+        "eli"
       ];
     };
   };
@@ -112,6 +115,7 @@
       createHome = false;
       openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTq/IAtLkvHaPKTsp5U9YnhBj7PLFflS9vWpm5e/bFXQkSShkqUOktff1GITIN+RTpUS8zF9UkJA8fj5K382DhIn4jVb9HvQzmHNBTxU5ClpOuKhfibrts5IKMLAiN1enwZYu0iUIVfDKTYmqgAnjN8B6OyzIAB8bsBUMdN29PEwJT4cCVRRySLRfoWiXiZKow71FzXIACgxMwGhj2fpslKQoat2LGny03XR7EZrv36u1OktT28Gxf4ZrGpT9+3SAyf7aW20xHALU/dHXVsfsuqnoqw1InZ5VhvIVtoIj+5Vc5dkTXkychL0Hb+WxiH5O/3T18YUqes08UPZX5G9kB fga@akvaplan.niva.no"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXv//iSTq5k1iYPZq9MKuF2OCE2UQPdR6TglWAeAnwL72UoKG068qDK3Ys+mFRY/S957hLn0FPFJPigcSaLzBq2v3G6kKySg68XWQfxBTSi5Wg81taNoJKQK+QAKfU2FiW9i1dLkvRKEXlY3tmF2mZLwqvrClRQMw8Nz0PQ5LnQfRgge07aXA3nDEf/nRuIaPG8zEki56lOONMWz4bGTjPn1y6y9gYAmskOc9w7uEOAy3VxkoR8fKvQM0ZTgt+6+68QxReyaDHH+12AqDxDy4wTCNX1LU902NDxyJZrUa2Xv9me2qN5O7hDOL/8S19MkJPBDEttMtA2rsFQlD9WYqycqgFhbOzLb7gixK1lrL3CYHsE9fXD2LuitSDXf79HFnCVHD5HJG7CbpIJLNNeTOCx94vspf9J8OENNdnNCgMFC1FKV/vdCiZ/RAOUCINrekvrX8FNjlXIhHOeK/gG6gP61oWpx3qbOExeMQTqWa9cGeHPtIdPiJVCza9Mg4X+0D9DCaP7KVLAxKioWqyd2WsyYeVhXA0OqnkEQk/jPZUjnxL1rnlH3I6QtVxHyqKcmmWEoRUnXId0ASUqx2hmsmI0TZD197PLFq53VO86v7jlAXLyzwmPh5VWdTOywklRpM29sZplVG/6gkHm/vM0DVSTEjVW+4mMFlzaiKgujH2fw== frankgaa@frankenstein"
       ];
     };
 
@@ -141,6 +145,7 @@
       isNormalUser = true;
       createHome = false;
       openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6wGrhV03oBuYimLuLrNSbT4mXyxZGKoH0acV1CgbDUwi4d7J2Q39/v+uhGzk8ipNw+NAjXfZXlvPaSP4lYCjh2t5b184tDNWZ3VCdOEfgP7E24m9fZaKq7PoqmoVNqNiFaTVuOM8cUiKsLapHMNF4DKpSl+tp6yLS30Jqmf2gTQNscvR/DLYuqT/T8C+/txGfLwmdlzDp9DrVMRWZJ0wYlaEPxbleGSAKjnG7jl+rEgBiAhIoKFdaLCP35lSWMxVw733y4KzBTzs+25oIwPmCoJXJyhqFm3OMMC1KsItrNc8sSVZ7GsD+lwG1kv3KfMjp2L4kLgfih9WFArsVMFc8Iejp2Pw1PTYlAHngarwmYlzN/kPsomRZSktGbjnbe1w9sf7L2+zfPv5/tfcgvimKK1FwglCOvKlFcpEj7MyGrZ1m+t3xWCcFjo0qXMVL5N8JVmcZw+c7E0rTzJd+EfYo9pUYqU3d4gyMpBwt3+qirnCXzhIzLyYuL3lxVeTN/hc= havard@vortex"
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDH/05mXyrYgxlWazFDtTJBCCB4YzQQiPcAkeeolztt320CPQ+pRyLgCzyAVGT5AlisXanHyWFSsPXrfM5MRNbm2U87s8DoZLZS5CYMk+ieGKdbac8jUgaw16EKyW05NHfHhDGYL+DyTQ76WAe/btzgDpvkal5B824a6abqc/oYz7D5rnAqoIpt56m1BG3tJrSz8K3nbOGpnMKt3vlVSLqZ6WNtSfXT+hHjOTfacQYH9XGQn/nYIuUzgDUswiboJ8nox5eduJxFrUHY6GGFiFeX6+hxIZUOZZm4hff01+sBxWy4y727tzCTbZIw2ERKcxu94BOC/EJsIyQDkaHwzaIwP7bB8V5yqpz7Fjgt5Bu+pMxUV8uwZmA5S5r3UuXlKHaspaqDR7RVjCUWcwCSgMYioxLtcnZr2DdKuezXbOU8O/FRsxuqFEzZTeCrckAi8gFzTanIZYmkwujjRg1hidOMc5qcn2yH/5NyBlQ+Y4XjD0XTMjSLpONczuyG3t6SJpE= haavaes@nzinga"
       ];
     };
@@ -157,6 +162,7 @@
       createHome = false;
       openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDSHaeXMssp55DPb9Pnqn1WxQqutvOsvIrYDKgTsrnmf/GC3N7h593pX27Qrzjaf0OYHcT7drUbDvRIFsuzmtplff/87fqbx/GGyYUrP+LZwOB7BKHrRlixaVeOOmvE/f9SNM0sIolq47qKFHM2KMsbk5zhSiOmbsCXWzdyYu+kjRgSjSs8NByoKzW9+dUuop/dcTZtDJd0oxUwkpU3c+MSkdAtDpvuxG6vq56Z4j9llg8kzHtLQI7t8w35FhIcXaJOE+LXJfq1FuAl9rw0QMAvotRJ+wHiMOqdkbABkmHG594JNCvZStqN4r8r3ZI20AF8xB3EiLVAuiB08kdEcuoGJCj7IHUwozbds4PO32oDSVy2/IR6VtRJQSNLH99nSbDQ9AmJtn3gSVJvAil1zaw/PZGez/UnDevN7KwUnf6wxH7yxDqgRjEmTu62z7HxQkPKMbuIvcHCQV9ota4eJZFOpr9tH44tuETcvkOButJH1Qa6AMKZPj10bxlqPIHKFS3dhus0BiUIWbjUY9/dC3LwW0S8TeP1NLx0vUeDiqY7BId6jZ8yeguQTvngPFJw5VPEuH5X/6sSXoCn1MnwdhXyeIylE5JoPXahVGQkaHo1Hap0JajxIlsZN6Q719qwSYJouH4mjdFBT46kw8CSH2sedv5qCQPchVmvaADirytYTQ== pckey"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCi3EpMAnE7+qQ64sptQojfT4ZrkeHaMdVYonGF6mhvsGlI7eysaYCuCafac5ta2FNez5tHTiUl+dohTiCjy2ZoOEpbwvTySwodXxzfy/ePNbl7LHvruT7YJVDy3t9kjD6jASzwRLKmSgooKQh3ed3gmY62/gNbKfISZWj0+Z3VXY6CA0JCV0BEzmF/e0+606flbhHNpxmmxc5PmriO/Dr+bB9R9QgO9iAcKhHXhqt0A99bM4jP8NU8eHibleYEXrVtATXY2YBmqriTsFYBtE3aENERNMkriy2qpXi16/lOuAS4R0TrmVn7nRQK0T/wCNrMZPxz5APv2z8UdFQi6qgLDFzUqwqzwUcZHH2QIn+ZjeWzSmKcw0SzNuf+K6cqikm9+mU1FMFxPy1S/W5ZNjih2BeBxklhhmhnl1ZRHttzJs2Ra+XIV1r66YBsC57dYd78MrUPR2Kv9qM0lmSpM4V30l04qsd17+NlWBx1weZ+7YsTpDpIo8qhuc0xLkGxSVzsJWBZNOF9JgKDIHRj50jDAOVNr2jQXvG+8yApqwe64J0H3a5p0ivBK+lmELgwz+8UtH41E3Vj1DuWJwXD9JOhppulNIegxGHcsoF2yku3n7eaE1QjrECssl65nj5+YBJi3xFbjMdqaMONYxRv6o/gxuewCDTZwwdo80jhVm5EgQ== mad@AKVA9409"
       ];
     };
 
@@ -201,6 +207,7 @@
       openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEA8cclW3+wlmFl4fNEIqudlrtKVsZCXdzLgXNaGnqZPbqUCVXqw6rigFXSPYnRnE47yi8heC+06ga+4l8LkAuFCPhoZN6xxq6M7qmlNRHtpNn6PrXuDaTkgNig9TD2BCbHGwkqIByPhea4qQbM0mLKRk+a4H0ZGHsJnZI+nm185sSo6jQJ1gCHLk6ZZOoRDGYjoZIs3En3fTSTJBfbluf5A/gVXf2pbvIQ+R5QEOszRcln6nFfTd2Lwu2t63jA1pHN3KQoKcJ9RtBrRC0ZgZrOlEU1bpGLwuHwpj5xoxlsoI49QMgqJL4PE06mNGLYuxl6N/Sj6l90fuPFrEQpf45S0w== rsa-key-20201217"
         "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvn2P+ID0J4SEIZF22Ewx4YqrUxgM78eUPZPtEngvQhi+s+lROpmkPPG7JQ2AO4tsATIOWHhXXerIciWuP5W8LikUmr4xXdQD7S1lbmH1sKvgyquPqyfjucQlP/efcoYXGQMp7tFs/1Z1RXPmq4oG3IZIy/wZOgiT8/wP/nCVOAahtAE1VxRldber286ruoF4e3GFjSxYafjyifaYwSvHySiKKqjVCaHw1oVv6bJn2H1sjuU19LSvDTZk+zMlWuxe1HW2dLtrGQGptd1JSURzmuc+stmrDBeiSGQ5QZza4+6TZKnSMNZ0RrjvTLlT+qW6OYMSPkiSDlEjkB47kIGQKQ== eli@AKVA9163"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzfAkO/BS5fjBABEq3L6b5IQ9MwTMM6D1y6T15NEnzaTHsWKuX+tkCA/h7NA4wM/WIvr5sDfiaZNNxZPYvUmMMGEerXQUVGZgJIOtL9UEpclfM0y/s9vMsavIlfyDYROp7/1fKqKjmbl+JpdxvHwoAEwiwKHBYiXGIUBvKvhWQhdNvSHM6Ac2zXSjKj6N47W72QkacL2G/DIipKYmTepVPX/QZAyfdDPYCf2y4/IGEHxehYRl4Z41NR4un/um5hThkQG0vqYLF2FIn9yYLVVtrUzh3P91EKi5i9eQzzP3UzvZcYJEqVZ8zqZDbb68zl39x2RYqW68gT5UcYUav7CKtPDF5HhyCHFhUuRCP+GUzUb/sMfrNmsMcpPZKXbFtluGtM8ZkuyH9BUeeyQ6MxBKaPAoWM5yvOmAM689LwEk1tklRpSGlYVO8eYrNxN/6Drd2oa70Wf3OP2d+ddu2G2hXw/YoW+dG1MYnoWpMFImkoOSfZR+1E6JUbDU9xIpeg00EAC9bDv6X6F/nen+rtWpL5igVmv0QQlojdfZMdRFXJlswFqLJFXO+XCSY/ALhoq3PSQipp6AmI0uW/F7RizoIiGN1cds3dg5EpdCHIK+TWpeVAjaByb4ih66tRq9KgtdBo/BEsfd2bSiDyCMtXRw09QhIHjpoRi1V7Hz1CRnJ3Q== akvaplan\elb@AKVA9319"
       ];
     };
 
@@ -285,7 +292,7 @@
       useDefaultShell = true;
       # shell = pkgs.fish;
       openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDatpj7SvijgKhVsuSrunxu7xDnFx6N7sQWDPoxMOu28HTVKuH9awZgw4Wcq7WYw9hlypHt6pVVm7cLq0eanJpB0rQKYNAt5DTs1T3Tf9n1ejWeNLkLaLem1NdHW6Lwag793/eFPtGljsYBug5taL8mtsjPQ9Yw5D/HaRC2fEK1TSvwGMyM9L0mArrEe8dFNrlaH3rqdPsfBNBGUO/ZKCbgsnk13lO2YtW2BPjhZUUbgpQ/KkpYvTYdYT/tp9JPEt55tzTyZgRkJfYdaoU699jQ9fsnLKWjYU88Z0iZfDL/8IFJ0hW6oJCSHa/5EZq2pM+8y25KkHa4EhPOqEWctsFd rsa-key-20210816"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDC5BCXIMi1BkCcT0Rod7BLUDhUaB7xjKLBBM62e+a/JGdjiIHnv3LCjEUGjXh4Nnx3DlUXhx7up2MN/8WjcBcMnA2JvMwCIAgTVWJleJycoeg6BZvCRn8ffkNPa4i2Mw4PsYhX2AFQnmy/pgK1tRNeCXKtQw37rNwz256eJRcf7Alxv7Jf3VlCy6r8aIMvEXZ1M5E+nHF4SWww8a82fpMmsYyBBp0PjNWxUSiZLB3Ip2nNvMDbqd11kWzALdh7EByKnWgfzI5kGpNkXSVRMgdljW20VuHoSvAeDYeiYBcxTQBeeVCH5P1NkMgntnKG3/brvYM3sPPfzE1PPGwClRRbeZsHkL8tGUcUYqm7tDPfts9UqO+xsOb6c2hw6y2/ogzzRhnpNlSYh9bu60aN+1QKUtFOXyIdnwvfbPkd5BXtttRrTvFbIFAseKko/tJl7qjtQIlgcl4PY4T9zagevrDlbf2iGnVMwi7gSLI6GxsavUTxf7JvzzbNBZjxt4x/j/k= yugaos@AKVA9452"
       ];
     };
 
@@ -336,8 +343,22 @@
       useDefaultShell = true;
       # shell = pkgs.fish;
       openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuShthrciA4hz3g/e4Q2S1L8OOyb0BpXg3FdjAhBHq8ZWK3GD40qyjmvk45EMX+2hZBXKKjEgO2ToTnH6P0NggwfBU9XhEb/SVxJwohJs55xRERT8jTXcYAXGrZntUg79ndWUHL2NzMMSJnJPEX1M3GZIymDxmUzsaagNvRI3kja42FNHtdX49hGSSygRoqjE+ui2lbFVi6+uY8TUdeW03+BYOgOJ8AtbvwP8MDZqUbHWc7fbg1DE3n52i+Uje2xyXPRwgCKZ0Ha0OLwiezKkVlUqc2gzSIQlKZ2Oy+9AE1knbCr5LVsarERUc17ux74fNQF8P6mCbbqvsgpX0KJK4yrjXPvkFVLcqmRXG+wyYuLLIAuNSG9N6rDgelBevTIqH+zZusXJm2du7mATgpEKBjYHlyS4tuf+gJaP26A2E1Eay5xxUKawm/PY71g/nMHlifYlnbz7fexQ/ObKCntLC0PP07xA6X8einCO81Q+8y0upa4hyzMkfHN4hcknXvj0= doppler@AKVA9454
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuShthrciA4hz3g/e4Q2S1L8OOyb0BpXg3FdjAhBHq8ZWK3GD40qyjmvk45EMX+2hZBXKKjEgO2ToTnH6P0NggwfBU9XhEb/SVxJwohJs55xRERT8jTXcYAXGrZntUg79ndWUHL2NzMMSJnJPEX1M3GZIymDxmUzsaagNvRI3kja42FNHtdX49hGSSygRoqjE+ui2lbFVi6+uY8TUdeW03+BYOgOJ8AtbvwP8MDZqUbHWc7fbg1DE3n52i+Uje2xyXPRwgCKZ0Ha0OLwiezKkVlUqc2gzSIQlKZ2Oy+9AE1knbCr5LVsarERUc17ux74fNQF8P6mCbbqvsgpX0KJK4yrjXPvkFVLcqmRXG+wyYuLLIAuNSG9N6rDgelBevTIqH+zZusXJm2du7mATgpEKBjYHlyS4tuf+gJaP26A2E1Eay5xxUKawm/PY71g/nMHlifYlnbz7fexQ/ObKCntLC0PP07xA6X8einCO81Q+8y0upa4hyzMkfHN4hcknXvj0= doppler@AKVA9454"
-"
+      ];
+
+    mib = {
+      description = "Michael Bedington";
+      home = "/home/mib";
+      group = "mib";
+      extraGroups = [
+        "users"
+      ];
+      uid = 1017;
+      isNormalUser = true;
+      createHome = false;
+      useDefaultShell = true;
+      # shell = pkgs.fish;
+      openssh.authorizedKeys.keys = [
       ];
     };
     # @usr@