From 2a56863919b2a409bc53240de1054fe69fdc8f1c Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Thu, 1 Jun 2023 13:39:06 +0800
Subject: [PATCH] migrate vaultwarden to bitwarden unified

---
 .gitignore                                       |  1 +
 nixos/lavender/containers/bitwarden/default.nix  | 16 ++++++++++++++++
 nixos/lavender/containers/default.nix            |  2 +-
 .../lavender/containers/vaultwarden/default.nix  | 16 ----------------
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 nixos/lavender/containers/bitwarden/default.nix
 delete mode 100644 nixos/lavender/containers/vaultwarden/default.nix

diff --git a/.gitignore b/.gitignore
index a991725..5a967cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 result
 **/dist-newstyle
+**/settings.env
diff --git a/nixos/lavender/containers/bitwarden/default.nix b/nixos/lavender/containers/bitwarden/default.nix
new file mode 100644
index 0000000..aa0700b
--- /dev/null
+++ b/nixos/lavender/containers/bitwarden/default.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  # Bitwarden
+  virtualisation.oci-containers.containers."bitwarden" = {
+    autoStart = true;
+    image = "bitwarden/self-host:beta";
+    volumes = [
+      "/srv/containers/bitwarden:/etc/bitwarden"
+    ];
+    ports = [ "8484:8080" ];
+    environmentFiles = [
+      ./settings.env
+    ];
+  };
+}
diff --git a/nixos/lavender/containers/default.nix b/nixos/lavender/containers/default.nix
index afc0228..59152ea 100644
--- a/nixos/lavender/containers/default.nix
+++ b/nixos/lavender/containers/default.nix
@@ -20,7 +20,7 @@
 
     # Documents & Files
     ./qbittorrent
-    ./vaultwarden
+    ./bitwarden
 
     # Game servers
     ./minecraft
diff --git a/nixos/lavender/containers/vaultwarden/default.nix b/nixos/lavender/containers/vaultwarden/default.nix
deleted file mode 100644
index 70bd303..0000000
--- a/nixos/lavender/containers/vaultwarden/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  # Vaultwarden
-  virtualisation.oci-containers.containers."vaultwarden" = {
-    autoStart = true;
-    image = "vaultwarden/server:latest";
-    volumes = [
-      "/srv/containers/vaultwarden:/data"
-    ];
-    ports = [ "8484:80" ];
-    environment = {
-      DOMAIN = "https://vault.kanto.dev";
-    };
-  };
-}