diff --git a/README.md b/README.md
index 778b0e0..34f1ee5 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ My dotfiles managed with [home manager](https://github.com/nix-community/home-ma
 * Mimeapps
 * Catppuccin
 * Home Manager
+* Obsidian
 
 ## Screenshot
 ![Desktop screenshot](assets/screenshot.png)
diff --git a/flake.nix b/flake.nix
index aeed265..d45799e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,7 @@
         pathConfig = {
           wallpaper = "Obrazy/tapety/catppuccin";
           screenshot = "Obrazy/zrzuty/";
+          obsidian = "Dokumenty/obsidian";
         };
       };
     in
diff --git a/home.nix b/home.nix
index e4f234f..2d1992b 100644
--- a/home.nix
+++ b/home.nix
@@ -48,6 +48,7 @@
     ./modules/gui/mako.nix
     ./modules/gui/mangohud.nix
     ./modules/gui/browsers.nix
+    ./modules/gui/obsidian.nix
     # status bars
     ./modules/bars/ashell.nix
     ./modules/bars/waybar.nix
diff --git a/modules/cli/nixvim.nix b/modules/cli/nixvim.nix
index c5acb94..3b6c61f 100644
--- a/modules/cli/nixvim.nix
+++ b/modules/cli/nixvim.nix
@@ -177,6 +177,8 @@
           };
           # nix
           nil_ls.enable = true;
+          # other
+          marksman.enable = true;
         };
         keymaps = {
           lspBuf = {
diff --git a/modules/gui/obsidian-catppuccin.nix b/modules/gui/obsidian-catppuccin.nix
new file mode 100644
index 0000000..449fd49
--- /dev/null
+++ b/modules/gui/obsidian-catppuccin.nix
@@ -0,0 +1,21 @@
+{
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation {
+  pname = "obsidian-catppuccin";
+  version = "main";
+
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "obsidian";
+    rev = "main";
+    hash = "sha256-sN5k263geOtJ1mOCQGM8UdmA/71OhBI5NRwGxJwd80E=";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp theme.css manifest.json $out/
+  '';
+}
diff --git a/modules/gui/obsidian.nix b/modules/gui/obsidian.nix
new file mode 100644
index 0000000..6c343ab
--- /dev/null
+++ b/modules/gui/obsidian.nix
@@ -0,0 +1,65 @@
+{
+  isNixOS,
+  lib,
+  pkgs,
+  userConfig,
+  ...
+}:
+
+{
+  programs.obsidian = {
+    enable = true;
+    package = lib.mkIf (!isNixOS) null;
+
+    defaultSettings = {
+      app = {
+        vimMode = true;
+        alwaysUpdateLinks = true;
+        attachmentFolderPath = "media";
+        newLinkFormat = "relative";
+        newFileLocation = "current";
+        useMarkdownLinks = true;
+        showUnsupportedFiles = true;
+        pdfExportSettings = {
+          pageSize = "A4";
+          landscape = false;
+          margin = "0";
+          downscalePercent = 100;
+        };
+      };
+
+      themes = [
+        (pkgs.callPackage ./obsidian-catppuccin.nix { })
+      ];
+
+      corePlugins = [
+        "file-explorer"
+        "global-search"
+        "switcher"
+        "graph"
+        "backlink"
+        "canvas"
+        "outgoing-link"
+        "tag-pane"
+        "page-preview"
+        "note-composer"
+        "command-palette"
+        "editor-status"
+        "bookmarks"
+        "outline"
+        "word-count"
+        "bases"
+      ];
+    };
+
+    vaults = {
+      "Notatki-szkolne" = {
+        target = "${userConfig.pathConfig.obsidian}/notatki-szkolne";
+      };
+      "Studia" = {
+        target = "${userConfig.pathConfig.obsidian}/ZUT-notatki";
+      };
+    };
+  };
+
+}