From b729daba56e2b85759e8c8e08471f21c5c2d0fed Mon Sep 17 00:00:00 2001
From: natto1784 <singh.amneesh1784@gmail.com>
Date: Tue, 1 Feb 2022 21:52:39 +0530
Subject: [PATCH] Satori: clear up services

---
 hosts/satori/networking.nix |  2 +-
 hosts/satori/services.nix   | 48 +++----------------------------------
 hosts/satori/stuff.nix      |  2 +-
 3 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/hosts/satori/networking.nix b/hosts/satori/networking.nix
index 50629b9..716a73d 100644
--- a/hosts/satori/networking.nix
+++ b/hosts/satori/networking.nix
@@ -22,7 +22,7 @@
     wireguard.interfaces.wg0 = {
       ips = [ "10.55.0.3/32" ];
       listenPort = 17840;
-      privateKeyFile = "/var/wg";
+      privateKeyFile = "/var/secrets/wg.key";
       peers = [
         {
           #Oracle VM1
diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix
index c0892a2..f827f5e 100644
--- a/hosts/satori/services.nix
+++ b/hosts/satori/services.nix
@@ -2,43 +2,6 @@
 
 {
   services = {
- /*   openvpn.servers = {
-      satori = {
-        config = ''
-          remote weirdnatto.in
-          dev tun
-          ifconfig 10.55.0.3 10.55.0.1
-          secret /var/secrets/openvpn.key
-        '';
-      };
-    };*/
-    vault-agent = {
-      enable = false;
-      settings = {
-        vault = {
-          address = "https://10.55.0.2:8800";
-          client_cert = "/var/certs/cert.pem";
-          client_key = "/var/certs/key.pem";
-        };
-        auto_auth = {
-          method = [
-            {
-              "cert" = {
-                name = "Satori";
-              };
-            }
-          ];
-        };
-        template = [
-          {
-            source = pkgs.writeText "openvpn.tpl" ''
-              {{ with secret "kv/openvpn" }}{{ .Data.data.secret }}{{ end }}
-            '';
-            destination = "/var/secrets/openvpn.key";
-          }
-        ];
-      };
-    };
     tor.enable = true;
     logmein-hamachi.enable = true;
     openssh = {
@@ -49,24 +12,19 @@
     udev.extraRules = ''
       ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
     '';
-    mysql = {
-      enable = true;
-      package = pkgs.mysql;
-    };
   };
   systemd.services = {
     tor.wantedBy = lib.mkForce [ ];
-    mysql.wantedBy = lib.mkForce [ ];
     logmein-hamachi.wantedBy = lib.mkForce [ ];
     openssh.wantedBy = lib.mkForce [ ];
     #printing.wantedBy = lib.mkForce [];
     #vault.wantedBy = lib.mkForce [];
   };
   security.pki.certificateFiles = [ ../../cert.pem ];
-  /* virtualisation.libvirtd = {
+  virtualisation.libvirtd = {
     enable = true;
     onBoot = "ignore";
     onShutdown = "shutdown";
-    qemuRunAsRoot = false;
-    };*/
+    qemu.runAsRoot = true;
+  };
 }
diff --git a/hosts/satori/stuff.nix b/hosts/satori/stuff.nix
index c21d235..e85580c 100644
--- a/hosts/satori/stuff.nix
+++ b/hosts/satori/stuff.nix
@@ -31,13 +31,13 @@
   };
   fonts.fonts = with pkgs; [
     fira-mono
-    noto-fonts-cjk
     lohit-fonts.devanagari
     lohit-fonts.gurmukhi
     nerdfonts
     font-awesome
     monoid
     office-code-pro
+    noto-fonts-cjk
   ];
   users.users.natto = {
     isNormalUser = true;