From 577f1a83debcf15c46122c1ad76575505f69ec5a Mon Sep 17 00:00:00 2001
From: Infra <infra@sincerity.network>
Date: Mon, 3 Oct 2022 04:45:56 +0000
Subject: [PATCH] changes to hopefully make things work

---
 flake.nix               |  2 +-
 nixos/book-stack.nix    |  7 ++++---
 nixos/configuration.nix | 11 ++++++++---
 nixos/mumble.nix        | 18 ++++++++++++++++++
 nixos/vault-warden.nix  |  2 +-
 5 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 nixos/mumble.nix

diff --git a/flake.nix b/flake.nix
index 3e94d51..7480813 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,7 +60,7 @@
           modules = (builtins.attrValues nixosModules) ++ [
             # > Our main nixos configuration file <
             ./nixos/configuration.nix
-            # bonfire.nixosModules.bonfire
+            bonfire.nixosModules.bonfire
           ];
         };
         test = nixpkgs.lib.nixosSystem {
diff --git a/nixos/book-stack.nix b/nixos/book-stack.nix
index b7542e2..f50cb37 100644
--- a/nixos/book-stack.nix
+++ b/nixos/book-stack.nix
@@ -3,8 +3,9 @@
 {
   services.bookstack = {
     enable = true;
-    hostname = "wiki.mutualaid.work";
+    hostname = "wiki.sincerity.network";
     # appKeyFile = "/run/secrets/bookstack-app-key";
+    appKeyFile = "/home/infra/app-key-file"; # TODO use agenix
     nginx = {
       serverName = "wiki.mutualaid.work";
       listenAddresses = [ "0.0.0.0" ];
@@ -15,9 +16,9 @@
     # Probably will need more configuration and testing
     # mail = {
     #   host = "migadu.com"; 
-    #   user = "infra@mutualaid.work";
+    #   user = "infra@sincerity.network";
     #   port = ???;
-    #   from = "bookstack@mutualaid.work";
+    #   from = "bookstack@sincerity.network";
     #   driver = "smtp";
     # };
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f97bb93..9a5b698 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -8,7 +8,8 @@
     ./hardware-configuration.nix
     ./vault-warden.nix
     ./book-stack.nix
-    # ./bonfire.nix
+    ./bonfire.nix
+    ./mumble.nix
   ];
 
   nix = {
@@ -19,9 +20,7 @@
     # This will additionally add your inputs to the system's legacy channels
     # Making legacy nix commands consistent as well, awesome!
     nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-  };
 
-  nix = {
     settings = {
       # Enable flakes and new 'nix' command
       experimental-features = "nix-command flakes";
@@ -30,6 +29,11 @@
     };
   };
 
+  environment.systemPackages = [
+    git
+    vim
+  ];
+
   # Remove if you wish to disable unfree packages for your system
   nixpkgs.config.allowUnfree = true;
 
@@ -44,6 +48,7 @@
       extraGroups = [ "wheel" ];
     };
   };
+  security.sudo.wheelNeedsPassword = false;
 
   # This setups a SSH server. Very important if you're setting up a headless system.
   # Feel free to remove if you don't need it.
diff --git a/nixos/mumble.nix b/nixos/mumble.nix
new file mode 100644
index 0000000..893c7ce
--- /dev/null
+++ b/nixos/mumble.nix
@@ -0,0 +1,18 @@
+{pkgs, ... }:
+{
+  services.murmur = {
+    enable = true;
+    hostname = "talk.sincerity.network";
+    registerHostname = "talk.sincerity.network";
+    registerUrl = "talk.sincerity.network";
+    registerName = "Sincerity Network Mumble";
+  };
+
+  services.nginx = {
+    enable = true;
+    useACME = true;
+    forceSSL = true;
+    virtualHosts."talk.sincerity.network".proxyPass = "http://localhost:64738/";
+  };
+    
+}
diff --git a/nixos/vault-warden.nix b/nixos/vault-warden.nix
index 22b123f..88009bb 100644
--- a/nixos/vault-warden.nix
+++ b/nixos/vault-warden.nix
@@ -4,7 +4,7 @@
   services.vaultwarden = {
     enable = true;
     config = {
-      domain = "https://vault.mutualaid.work:8443";
+      domain = "https://vault.sincerity.network:8443";
       signupsAllowed = false;
       rocketPort = 8222;
       rocketLog = "critical";