Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion home-manager/services/obsidian/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ in
# Only enable on kyber (gateway host) - desktops already get pkgs.obsidian
# directly via home-manager/packages/default.nix.
lib.mkIf host.isKyber {
home.packages = [ obsidianHeadless ];
home.packages = [
obsidianHeadless
pkgs.dejavu_fonts
pkgs.fontconfig
];

systemd.user.services.obsidian = {
Unit = {
Expand All @@ -37,6 +41,11 @@ lib.mkIf host.isKyber {
};
Service = {
Type = "simple";
ExecStartPre = "${pkgs.writeShellScript "obsidian-pre" ''
rm -f ${config.xdg.configHome}/obsidian/SingletonLock
rm -f ${config.xdg.configHome}/obsidian/SingletonSocket
rm -f ${config.xdg.configHome}/obsidian/SingletonCookie
''}";
Comment on lines +44 to +48

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The ExecStartPre script will fail if the directory ${config.xdg.configHome}/obsidian does not exist (e.g., on a fresh installation or after a manual cleanup). This is because pkgs.writeShellScript enables set -e by default, and rm -f returns a non-zero exit code if a component of the path (the parent directory) is missing. Adding mkdir -p ensures the directory exists, and quoting the paths handles potential spaces in the configuration directory path.

      ExecStartPre = "${pkgs.writeShellScript "obsidian-pre" ''
        mkdir -p "${config.xdg.configHome}/obsidian"
        rm -f "${config.xdg.configHome}/obsidian/SingletonLock"
        rm -f "${config.xdg.configHome}/obsidian/SingletonSocket"
        rm -f "${config.xdg.configHome}/obsidian/SingletonCookie"
      ''}";

ExecStart = "${obsidianHeadless}/bin/obsidian";
Restart = "always";
RestartSec = 10;
Expand Down
2 changes: 1 addition & 1 deletion home-manager/services/obsidian/obsidian-headless.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
exec @xvfbRun@/bin/xvfb-run -a @obsidian@/bin/obsidian --no-sandbox --disable-gpu --vault @homeDir@/ghq/github.com/shunkakinoki/wiki "$@"
exec @xvfbRun@/bin/xvfb-run -a -s "-screen 0 1280x1024x24" @obsidian@/bin/obsidian --no-sandbox --disable-gpu --disable-features=FontationsFontIndexer --vault @homeDir@/ghq/github.com/shunkakinoki/wiki "$@"
Loading