From 218503b691d25d7df00644e775f4aab1e464d516 Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Sat, 22 Apr 2023 15:01:44 +0530 Subject: [PATCH] zellij: use xdg.configHome on darwin --- modules/programs/zellij.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix index ec4cd8e34..37cd010e0 100644 --- a/modules/programs/zellij.nix +++ b/modules/programs/zellij.nix @@ -7,11 +7,6 @@ let cfg = config.programs.zellij; yamlFormat = pkgs.formats.yaml { }; - configDir = if pkgs.stdenv.isDarwin then - "Library/Application Support/org.Zellij-Contributors.Zellij" - else - "${config.xdg.configHome}/zellij"; - in { meta.maintainers = [ hm.maintainers.mainrs ]; @@ -51,12 +46,12 @@ in { # Zellij switched from yaml to KDL in version 0.32.0: # https://github.com/zellij-org/zellij/releases/tag/v0.32.0 - home.file."${configDir}/config.yaml" = mkIf + xdg.configFile."zellij/config.yaml" = mkIf (cfg.settings != { } && (versionOlder cfg.package.version "0.32.0")) { source = yamlFormat.generate "zellij.yaml" cfg.settings; }; - home.file."${configDir}/config.kdl" = mkIf + xdg.configFile."zellij/config.kdl" = mkIf (cfg.settings != { } && (versionAtLeast cfg.package.version "0.32.0")) { text = lib.hm.generators.toKDL { } cfg.settings; };