diff --git a/docs/md/modules.md b/docs/md/modules.md
index 544add5..4f3b526 100644
--- a/docs/md/modules.md
+++ b/docs/md/modules.md
@@ -206,6 +206,7 @@ bash ~/Dotfiles/setup/install-modules.sh
 | `toot` | toot (AUR) | Mastodon CLI client |
 | `xournal` | xournalpp | Note-taking and PDF annotator |
 | `rnote` | Rnote (Flatpak) | Handwriting and note-taking with stylus support |
+| `obsidian` | Obsidian (Flatpak) | Knowledge base and Markdown note-taking |
 
 ### System Utilities
 
diff --git a/setup/generate-answerfile.sh b/setup/generate-answerfile.sh
index a40170c..53a3f9c 100644
--- a/setup/generate-answerfile.sh
+++ b/setup/generate-answerfile.sh
@@ -257,6 +257,7 @@ if [[ "$AF_RUN_TUI" == "true" ]]; then
         "onlyoffice"      "OnlyOffice        office suite (AUR)"                    off \
         "xournal"         "Xournal++         note-taking & PDF annotator"            off \
         "rnote"           "Rnote             handwriting & note-taking (Flatpak)"    off \
+        "obsidian"        "Obsidian          knowledge base & Markdown notes (Flatpak)" off \
         "gimp"            "GIMP              GNU image manipulation program"          off \
         "inkscape"        "Inkscape          vector graphics editor"                  off \
         "krita"           "Krita             digital painting application"            off \
diff --git a/setup/modules/optional-Modules/apps/obsidian.sh b/setup/modules/optional-Modules/apps/obsidian.sh
new file mode 100755
index 0000000..334584a
--- /dev/null
+++ b/setup/modules/optional-Modules/apps/obsidian.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -euo pipefail
+source "$(dirname "${BASH_SOURCE[0]}")/../../lib/logging.sh"
+
+log "Installing Obsidian (Flatpak)..."
+ensure_flatpak
+flatpak install -y flathub md.obsidian.Obsidian
+apply_flatpak_theme "md.obsidian.Obsidian"
+
+log "Obsidian installed."
diff --git a/setup/tui-install.sh b/setup/tui-install.sh
index d7b8b34..1bbb613 100755
--- a/setup/tui-install.sh
+++ b/setup/tui-install.sh
@@ -224,6 +224,7 @@ count_steps() {
     [[ "$a" == *"qemu"*             ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"xournal"*          ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"rnote"*            ]] && TOTAL=$(( TOTAL + 1 ))
+    [[ "$a" == *"obsidian"*         ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"gimp"*             ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"inkscape"*         ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"krita"*            ]] && TOTAL=$(( TOTAL + 1 ))
@@ -480,6 +481,7 @@ else
         "onlyoffice"      "OnlyOffice        office suite (AUR)"                   off \
         "xournal"         "Xournal++         note-taking & PDF annotator"           off \
         "rnote"           "Rnote             handwriting & note-taking (Flatpak)"   off \
+        "obsidian"        "Obsidian          knowledge base & Markdown notes (Flatpak)" off \
         "gimp"            "GIMP              GNU image manipulation program"         off \
         "inkscape"        "Inkscape          vector graphics editor"                 off \
         "krita"           "Krita             digital painting application"           off \
@@ -592,6 +594,7 @@ if ! $ANSWERFILE_MODE; then
         [[ "$SELECTED_APPS" == *"onlyoffice"*     ]] && SUMMARY+="  ✦ OnlyOffice\n"
         [[ "$SELECTED_APPS" == *"xournal"*        ]] && SUMMARY+="  ✦ Xournal++\n"
         [[ "$SELECTED_APPS" == *"rnote"*          ]] && SUMMARY+="  ✦ Rnote\n"
+        [[ "$SELECTED_APPS" == *"obsidian"*       ]] && SUMMARY+="  ✦ Obsidian\n"
         [[ "$SELECTED_APPS" == *"gimp"*           ]] && SUMMARY+="  ✦ GIMP\n"
         [[ "$SELECTED_APPS" == *"inkscape"*       ]] && SUMMARY+="  ✦ Inkscape\n"
         [[ "$SELECTED_APPS" == *"krita"*          ]] && SUMMARY+="  ✦ Krita\n"
@@ -712,6 +715,7 @@ fi
 [[ "$SELECTED_APPS" == *"onlyoffice"*     ]] && run_module "OnlyOffice"        "$APPS/onlyoffice.sh"
 [[ "$SELECTED_APPS" == *"xournal"*        ]] && run_module "Xournal++"         "$APPS/xournal.sh"
 [[ "$SELECTED_APPS" == *"rnote"*          ]] && run_module "Rnote"             "$APPS/rnote.sh"
+[[ "$SELECTED_APPS" == *"obsidian"*       ]] && run_module "Obsidian"          "$APPS/obsidian.sh"
 [[ "$SELECTED_APPS" == *"gimp"*           ]] && run_module "GIMP"              "$APPS/gimp.sh"
 [[ "$SELECTED_APPS" == *"inkscape"*       ]] && run_module "Inkscape"          "$APPS/inkscape.sh"
 [[ "$SELECTED_APPS" == *"krita"*          ]] && run_module "Krita"             "$APPS/krita.sh"