Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

taskwarrior: make .taskrc writable (#2761)

Browse source 
This is achieved by generating the Home Manager configuration
file as `~/.config/task/home-manager-taskrc`, and including that
file into ~/.config/task/taskrc.

Fixes #2360

Co-authored-by: mainrs <5113257+mainrs@users.noreply.github.com>
Co-authored-by: Nicolas Berbiche <nicolas@normie.dev>
This commit is contained in:
x10an14 2022-04-07 19:29:53 +02:00 committed by GitHub
parent 3604a20b67
commit e361373b5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/programs/taskwarrior.nix
View file

@ -24,6 +24,8 @@ let
formatPair = key: value: formatPair = key: value:
if isAttrs value then formatSet key value else formatLine key value; if isAttrs value then formatSet key value else formatLine key value;
homeConf = "${config.xdg.configHome}/task/home-manager-taskrc";
userConf = "${config.xdg.configHome}/task/taskrc";
in { in {
options = { options = {
programs.taskwarrior = { programs.taskwarrior = {
@ -88,7 +90,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.taskwarrior ]; home.packages = [ pkgs.taskwarrior ];
xdg.configFile."task/taskrc".text = '' home.file."${homeConf}".text = ''
data.location=${cfg.dataLocation} data.location=${cfg.dataLocation}
${optionalString (cfg.colorTheme != null) (if isString cfg.colorTheme then ${optionalString (cfg.colorTheme != null) (if isString cfg.colorTheme then
"include ${cfg.colorTheme}.theme" "include ${cfg.colorTheme}.theme"
@ -99,5 +101,25 @@ in {
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
home.activation.regenDotTaskRc = hm.dag.entryAfter [ "writeBoundary" ] ''
$VERBOSE_ECHO "Ensuring generated taskwarrior config included in taskrc"
if [[ ! -s "${userConf}" ]]; then
# Ensure file's existence
if [[ -v DRY_RUN ]]; then
$DRY_RUN_CMD echo "include ${homeConf}" ">" "${userConf}"
else
echo "include ${homeConf}" > "${userConf}"
fi
elif ! ${pkgs.gnugrep}/bin/grep -qF "include ${homeConf}" ${
escapeShellArg userConf
}; then
# Add include statement for home-manager generated config
$DRY_RUN_CMD ${pkgs.gnused}/bin/sed -i '1i include ${homeConf}' ${
escapeShellArg userConf
}
fi
'';
}; };
} }

6
tests/modules/programs/taskwarrior/taskwarrior.nix
View file

@ -21,9 +21,9 @@ with lib;
test.stubs.taskwarrior = { }; test.stubs.taskwarrior = { };
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/task/taskrc assertFileExists home-files/.config/task/home-manager-taskrc
assertFileContent home-files/.config/task/taskrc ${ assertFileContent home-files/.config/task/home-manager-taskrc ${
pkgs.writeText "taskwarrior.expected" '' pkgs.writeText "taskwarrior.home-conf.expected" ''
data.location=/some/data/location data.location=/some/data/location
include dark-violets-256.theme include dark-violets-256.theme