From 24d50e62c28dc3afb38ba00a59d84c346db03207 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 10 Apr 2025 11:23:52 -0400
Subject: [PATCH] feat: get rid of obsidian
---
.../cluster/modules/caddy/default.nix | 2 -
configurations/nos/modules/default.nix | 1 -
.../nos/modules/obsidian-livesync/.gitignore | 1 -
.../nos/modules/obsidian-livesync/default.nix | 57 -------------------
.../desktop/environment/modules/packages.nix | 10 ----
5 files changed, 71 deletions(-)
delete mode 100644 configurations/nos/modules/obsidian-livesync/.gitignore
delete mode 100644 configurations/nos/modules/obsidian-livesync/default.nix
diff --git a/configurations/cluster/modules/caddy/default.nix b/configurations/cluster/modules/caddy/default.nix
index 945e391d..710a0877 100644
--- a/configurations/cluster/modules/caddy/default.nix
+++ b/configurations/cluster/modules/caddy/default.nix
@@ -89,8 +89,6 @@ in {
"Immich" = mkPublicReverseProxy "photos" "${nosIP}:2283" {};
- "ObsidianLiveSync" = mkPublicReverseProxy "livesync" "${nosIP}:5984" {};
-
"Binary Cache" = mkPublicReverseProxy "cache" "${serviviIP}:5000" {};
# Private
diff --git a/configurations/nos/modules/default.nix b/configurations/nos/modules/default.nix
index c664e478..2941fca1 100644
--- a/configurations/nos/modules/default.nix
+++ b/configurations/nos/modules/default.nix
@@ -6,7 +6,6 @@
./jellyfin
./llm
./mergerfs
- # ./obsidian-livesync
./qbittorrent
./snapraid
./subtitles
diff --git a/configurations/nos/modules/obsidian-livesync/.gitignore b/configurations/nos/modules/obsidian-livesync/.gitignore
deleted file mode 100644
index 41af1f79..00000000
--- a/configurations/nos/modules/obsidian-livesync/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-setup.sh
diff --git a/configurations/nos/modules/obsidian-livesync/default.nix b/configurations/nos/modules/obsidian-livesync/default.nix
deleted file mode 100644
index 81937104..00000000
--- a/configurations/nos/modules/obsidian-livesync/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{config, ...}: {
- # The secret that is placed here must take the following form in the
- # unencrypted yaml for this to work as it's appended directly to the couchdb.ini
- # configuration via systemd Env statements. The username and password are the
- # user/pass in your livesync config in obsidian
-
- # obsidian: |
- # [admins]
- # yourusernamehere = yourpasswordhere
-
- sops.secrets.obsidian-livesync = {
- owner = config.services.couchdb.user;
- group = config.services.couchdb.group;
- mode = "440";
- };
-
- services.couchdb = {
- enable = true;
-
- bindAddress = "0.0.0.0";
- port = 5984;
-
- configFile = config.sops.secrets.obsidian-livesync.path;
-
- # https://github.com/vrtmrz/obsidian-livesync/blob/main/docs/setup_own_server.md#configure
- extraConfig = {
- chttpd = {
- enable_cors = true;
- max_http_request_size = "4294967296";
- require_valid_user = true;
- };
-
- chttpd_auth = {
- authentication_redirect = "/_utils/session.html";
- require_valid_user = true;
- };
-
- cors = {
- credentials = true;
- headers = "accept, authorization, content-type, origin, referer";
- max_age = "3600";
- methods = "GET,PUT,POST,HEAD,DELETE";
- origins = "app://obsidian.md, capacitor://localhost, http://localhost";
- };
-
- couchdb = {
- max_document_size = "50000000";
- single_node = true;
- };
-
- httpd = {
- WWW-Authenticate = "Basic realm=\"couchdb\"";
- enable_cors = true;
- };
- };
- };
-}
diff --git a/modules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix
index f69d5bb4..cd037ef2 100644
--- a/modules/desktop/environment/modules/packages.nix
+++ b/modules/desktop/environment/modules/packages.nix
@@ -207,16 +207,6 @@ in {
});
};
- # force XWayland for stylus input
- obsidian = pkgs.obsidian.overrideAttrs {
- postFixup = ''
- wrapProgram $out/bin/obsidian \
- --set XDG_SESSION_TYPE "x11" \
- --unset NIXOS_OZONE_WL \
- --unset WAYLAND_DISPLAY
- '';
- };
-
# tools
inherit
(pkgs)