From b63abdfb56e57332fe0415e0879d497a8bd8ba06 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Fri, 23 Feb 2024 12:55:06 +0100 Subject: [PATCH] obsidian notes --- modules/nur-and-unstable.nix | 3 ++- modules/obsidian.nix | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/nur-and-unstable.nix b/modules/nur-and-unstable.nix index a5ae8b5..0835091 100644 --- a/modules/nur-and-unstable.nix +++ b/modules/nur-and-unstable.nix @@ -20,11 +20,12 @@ # https://github.com/NixOS/nixpkgs/issues/69347#issuecomment-534573461 config = { - # Required for unstable.obsidian (see obsidan.nix) allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + # Required for unstable.obsidian (see obsidan.nix) "obsidian" ]; permittedInsecurePackages = [ + # Required for unstable.obsidian (see obsidan.nix) "electron-25.9.0" ]; diff --git a/modules/obsidian.nix b/modules/obsidian.nix index b3dba97..1c675d5 100644 --- a/modules/obsidian.nix +++ b/modules/obsidian.nix @@ -1,11 +1,5 @@ { config, pkgs, lib, ... }: { - # TODO. - # As of 01.01.2024, the Electron version of Obsidian does not find some GL libraries. - # Temporary workaround (https://github.com/NixOS/nixpkgs/issues/268490#issuecomment-1817991394): - # export LD_LIBRARY_PATH=$(nix --extra-experimental-features nix-command --extra-experimental-features flakes build --print-out-paths --no-link nixpkgs#libGL)/lib - # obsidian - # TODO: if on wayland and scaling != 1, start obsidian with the following command. # Sharp fonts. # obsidian --enable-features=UseOzonePlatform --ozone-platform=x11 @@ -16,9 +10,6 @@ # "obsidian" # ]; - # TODO go back to stable nixpkgs. - # - As of 2024-01-01, obsidian did not start on Wayland - # - As of 2024-02-03, obsidian is using an insecure Electron version. users.users.yoda = { packages = with pkgs; [ unstable.obsidian # Markdown notes