diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d6c2226
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+# Sisyphus work session data
+.sisyphus/
+
+# Editor files
+*~
+.*.swp
+.*.swo
+.*.swx
+
+# Build artifacts
+result
+result-*
+.direnv/
+
+# IDE
+.vscode/
+.idea/
+*.iml
+
+# OS
+.DS_Store
+Thumbs.db
diff --git a/flake.lock b/flake.lock
index 18f7129..cff0e2a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -391,11 +391,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1770267143,
-        "narHash": "sha256-0OU8YtW5pcHWsJzXk/j4AqyETQheFP8f3iy9IvYHcQI=",
+        "lastModified": 1770276510,
+        "narHash": "sha256-1z3GzjNxm2QREjQC579bD6oFAwkLBjJIUt5al08n2oo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2376c3f3637809395fe1b6617d8d45c4fbf388d8",
+        "rev": "feb0a690655b2ef4c35843eb88c4ba415e1e8c61",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1770181073,
-        "narHash": "sha256-ksTL7P9QC1WfZasNlaAdLOzqD8x5EPyods69YBqxSfk=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bf922a59c5c9998a6584645f7d0de689512e444c",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {
@@ -525,11 +525,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770267663,
-        "narHash": "sha256-l6n+TOy5+p+0glk+CJcE52crJKLdbfUqJGqphgynSt4=",
+        "lastModified": 1770270187,
+        "narHash": "sha256-+vK4PsLWiDZ9IO8FdBI9bmZp62Py3DPV1aa+iEueR6w=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7ed94565fde6e13c9184360f916bb508d66dd021",
+        "rev": "27c438bb3ed9d4c6f4a25c689b3fb2a855a646a9",
         "type": "github"
       },
       "original": {
diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix
index f59282f..efa8367 100644
--- a/home/features/desktop/default.nix
+++ b/home/features/desktop/default.nix
@@ -10,6 +10,7 @@
     ./gaming.nix
     ./hyprland.nix
     ./media.nix
+    ./obsidian.nix
     ./office.nix
     ./rofi.nix
     ./theme.nix
diff --git a/home/features/desktop/obsidian.nix b/home/features/desktop/obsidian.nix
new file mode 100644
index 0000000..c03b766
--- /dev/null
+++ b/home/features/desktop/obsidian.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.features.desktop.obsidian;
+in {
+  options.features.desktop.obsidian.enable =
+    mkEnableOption "enable Obsidian knowledge base";
+
+  config = mkIf cfg.enable {
+    programs.obsidian.enable = true;
+
+    xdg.mimeApps = {
+      enable = true;
+      associations.added = {
+        "text/markdown" = ["obsidian.desktop"];
+      };
+      defaultApplications = {
+        "text/markdown" = ["obsidian.desktop"];
+      };
+    };
+  };
+}
diff --git a/home/m3tam3re/m3-ares.nix b/home/m3tam3re/m3-ares.nix
index c85836f..9b21377 100644
--- a/home/m3tam3re/m3-ares.nix
+++ b/home/m3tam3re/m3-ares.nix
@@ -53,6 +53,7 @@ with lib; {
           gaming.enable = true;
           hyprland.enable = true;
           media.enable = true;
+          obsidian.enable = true;
           office.enable = true;
           rofi.enable = true;
           fonts.enable = true;
diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix
index 224d7ef..53bda0f 100644
--- a/home/m3tam3re/m3-kratos.nix
+++ b/home/m3tam3re/m3-kratos.nix
@@ -52,6 +52,7 @@ with lib; {
           gaming.enable = true;
           hyprland.enable = true;
           media.enable = true;
+          obsidian.enable = true;
           office.enable = true;
           rofi.enable = true;
           fonts.enable = true;