diff options
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | hosts/c-pc/home.nix | 8 | ||||
| -rw-r--r-- | snowfall/homes/x86_64-linux/c/default.nix | 1 | ||||
| -rw-r--r-- | snowfall/modules/home/apps/obsidian/default.nix | 24 |
4 files changed, 26 insertions, 8 deletions
@@ -39,6 +39,7 @@ channels-config.allowUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) [ "discord" + "obsidian" ]; }; } diff --git a/hosts/c-pc/home.nix b/hosts/c-pc/home.nix index 0296bae..23c1973 100644 --- a/hosts/c-pc/home.nix +++ b/hosts/c-pc/home.nix @@ -23,8 +23,6 @@ ".irssi" - ".config/Obsidian" - ".config/jellyfin" ".local/share/jellyfin" ".cache/jellyfin" @@ -39,10 +37,6 @@ zoxide.enable = true; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "obsidian" - ]; - home.packages = with pkgs; [ pfetch @@ -50,8 +44,6 @@ mkvtoolnix - obsidian - #TODO: latest update broke # jetbrains.idea-community ]; diff --git a/snowfall/homes/x86_64-linux/c/default.nix b/snowfall/homes/x86_64-linux/c/default.nix index 635d436..834091e 100644 --- a/snowfall/homes/x86_64-linux/c/default.nix +++ b/snowfall/homes/x86_64-linux/c/default.nix @@ -19,6 +19,7 @@ with lib; with lib.${namespace}; { qbittorrent.enable = true; nicotine.enable = true; anki.enable = true; + obsidian.enable = true; prismlauncher.extra.rusherhack.enable = true; }; diff --git a/snowfall/modules/home/apps/obsidian/default.nix b/snowfall/modules/home/apps/obsidian/default.nix new file mode 100644 index 0000000..0815ab6 --- /dev/null +++ b/snowfall/modules/home/apps/obsidian/default.nix @@ -0,0 +1,24 @@ +{ options, config, lib, pkgs, namespace, ... }: + +#NOTE: mkSimpleApp doesnt work for obsidian +# Best guess is that the unfree predicate doesnt apply to /lib +with lib; with lib.${namespace}; let + cfg = config.${namespace}.apps.obsidian; + impermanence = config.${namespace}.impermanence; +in { + options.${namespace}.apps.obsidian = with types; { + enable = mkEnableOption "obsidian"; + }; + + config = mkIf cfg.enable { + home.packages = with pkgs; [ + obsidian + ]; + + home.persistence.${impermanence.location} = { + directories = [ + ".config/Obsidian" + ]; + }; + }; +} |