From 2afbdbee1db02d510ebf3c5ca51abfbf3bf02a50 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 13 May 2019 18:59:06 -0700
Subject: move lithium to biz as hidor-kahih

---
 depo/nutin-madaj/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'depo/nutin-madaj')

diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix
index ffb2909..0b8f8d5 100644
--- a/depo/nutin-madaj/default.nix
+++ b/depo/nutin-madaj/default.nix
@@ -15,10 +15,8 @@ let
     url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz";
     sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx";
   };
-  benKey =  "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiNB0iF9ClawNEizBtdYucqp1tAXXRbqvlPS6PFRrtiwSl+SJD29BCLgA5rLxcmFhBHZ/iId/En7GPFEzI/gMu071J7pUI4OcW0UVZju3GNc6ZEz/a6AD2u79JiXEDHfPEdmMqAe36kkaK0KJWSQP3xsFRwJ+8F8HHbSwoCLL+GJhBgAWHQLGfKesNrDacNljNDU3CgkEnDmu8QKuSzH2k1vrr69q2u2iMSAdiStDBAWEjN5nCVrm2XB2vmFLMtXpX2n8JI+znOGzRRDc8dNXejQeDMZGyV6jfVidEIX7vdgSydGjTRKcCLVAsKY3z0gYBZ8u8EUNujgcFBnnAvytj ben@neb";
   ibbPort = "3000";
   fathomPort = "3030";
-
 in
 import "${nixpkgs}/nixos" {
   system = "x86_64-linux";
@@ -27,6 +25,9 @@ import "${nixpkgs}/nixos" {
       ./hardware-configuration.nix
       ./networking.nix
 
+      # common infra
+      ../users.nix
+
       # configured modules
       ./git.nix
       ./mail.nix
@@ -48,15 +49,6 @@ import "${nixpkgs}/nixos" {
 
     networking.firewall.allowedTCPPorts = [ 22 80 443 ];
 
-    virtualisation = {
-      libvirtd.enable = true;
-      docker.enable = true;
-      virtualbox.guest.enable = true;
-      virtualbox.host.enable = true;
-      virtualbox.host.headless = false;
-      virtualbox.host.addNetworkInterface = true;
-    };
-
     # our custom apps
     services = {
       ibb = {
@@ -90,6 +82,6 @@ import "${nixpkgs}/nixos" {
     networking.hostName = "simatime";
     networking.firewall.allowPing = true;
     services.openssh.enable = true;
-    users.users.root.openssh.authorizedKeys.keys = [ benKey ];
+    users.users.root.openssh.authorizedKeys.keys = [(builtins.readFile ../../keys/ben.pub)];
   };
 }
-- 
cgit v1.2.3