Skip to content

taskwarrior: make .taskrc writable (attempt nr. 2) #2761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berbiche merged 3 commits into from
Apr 7, 2022
Merged

taskwarrior: make .taskrc writable (attempt nr. 2) #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f1c437
taskwarrior: make .taskrc writable
mainrs Feb 3, 2022
882053e
taskwarrior: use escapeShellArg in activation script
berbiche Apr 7, 2022
4988748
taskwarrior: format file
berbiche Apr 7, 2022
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
24 changes: 23 additions & 1 deletion modules/programs/taskwarrior.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ let
formatPair = 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 {
options = {
programs.taskwarrior = {
Expand Down Expand Up @@ -88,7 +90,7 @@ in {
config = mkIf cfg.enable {
home.packages = [ pkgs.taskwarrior ];

xdg.configFile."task/taskrc".text = ''
home.file."${homeConf}".text = ''
data.location=${cfg.dataLocation}
${optionalString (cfg.colorTheme != null) (if isString cfg.colorTheme then
"include ${cfg.colorTheme}.theme"
Expand All @@ -99,5 +101,25 @@ in {

${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 changes: 3 additions & 3 deletions tests/modules/programs/taskwarrior/taskwarrior.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ with lib;
test.stubs.taskwarrior = { };

nmt.script = ''
assertFileExists home-files/.config/task/taskrc
assertFileContent home-files/.config/task/taskrc ${
pkgs.writeText "taskwarrior.expected" ''
assertFileExists home-files/.config/task/home-manager-taskrc
assertFileContent home-files/.config/task/home-manager-taskrc ${
pkgs.writeText "taskwarrior.home-conf.expected" ''
data.location=/some/data/location
include dark-violets-256.theme

Expand Down