From 9601fd454d14fe3229fc281e3f26397ce2d9c457 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 24 May 2024 10:54:21 +0200 Subject: [PATCH] move taskwarrior to home-manager --- flake.lock | 8 +- nixos/components/gui/default.nix | 1 - nixos/homes/palo/default.nix | 3 +- nixos/homes/palo/packages/development.nix | 1 + .../gui => homes/palo}/taskwarrior.nix | 76 ++++++++++--------- nixos/machines/cherry/configuration.nix | 4 +- nixos/machines/cream/configuration.nix | 5 +- 7 files changed, 51 insertions(+), 47 deletions(-) rename nixos/{components/gui => homes/palo}/taskwarrior.nix (51%) diff --git a/flake.lock b/flake.lock index e9c9207..f77868e 100644 --- a/flake.lock +++ b/flake.lock @@ -1352,11 +1352,11 @@ }, "private_assets": { "locked": { - "lastModified": 1715197334, - "narHash": "sha256-8rVZd6msm8rvU49XdAmj0rN/ZRBo/tk72RI+k49PitI=", + "lastModified": 1716540670, + "narHash": "sha256-l51flTaxl5I5WgVMc511W4kbmLGr6Fq8ZD7p1BYqCWM=", "ref": "main", - "rev": "0ec2e8c4fbc36151811f5b9e68f59cdccc5a26eb", - "revCount": 21, + "rev": "1dfb86abb2177269ebd2a74f01959fe0e2a50e8b", + "revCount": 22, "type": "git", "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git" }, diff --git a/nixos/components/gui/default.nix b/nixos/components/gui/default.nix index 3c4c18e..ec14126 100644 --- a/nixos/components/gui/default.nix +++ b/nixos/components/gui/default.nix @@ -17,7 +17,6 @@ with lib; ./pass.nix ./steam.nix ./suspend.nix - ./taskwarrior.nix ./vscode.nix ./wayland.nix ./xorg diff --git a/nixos/homes/palo/default.nix b/nixos/homes/palo/default.nix index 4328b46..3ddc39c 100644 --- a/nixos/homes/palo/default.nix +++ b/nixos/homes/palo/default.nix @@ -6,14 +6,15 @@ ./editor.nix ./git.nix ./gpg.nix + ./hyperland.nix ./i3.nix ./packages ./ssh.nix ./stylix.nix + ./taskwarrior.nix ./tmux.nix ./yubikey.nix ./zellij.nix - ./hyperland.nix ]; home.stateVersion = "22.11"; diff --git a/nixos/homes/palo/packages/development.nix b/nixos/homes/palo/packages/development.nix index a5138b8..b173f15 100644 --- a/nixos/homes/palo/packages/development.nix +++ b/nixos/homes/palo/packages/development.nix @@ -84,6 +84,7 @@ with lib; gojq jq ijq + miller # nomad unstable.nomad diff --git a/nixos/components/gui/taskwarrior.nix b/nixos/homes/palo/taskwarrior.nix similarity index 51% rename from nixos/components/gui/taskwarrior.nix rename to nixos/homes/palo/taskwarrior.nix index bceabc8..af0000f 100644 --- a/nixos/components/gui/taskwarrior.nix +++ b/nixos/homes/palo/taskwarrior.nix @@ -30,38 +30,61 @@ let in { - options.components.gui.taskwarrior.enable = mkOption { - type = bool; - default = config.components.gui.enable; - }; - options.components.gui.taskwarrior.config = mkMagicMergeOption { - type = attrs; - default = { }; - }; + # bugwarrior (a bit fiddly) + imports = [{ + options.bugwarrior.config = mkMagicMergeOption { + type = attrs; + default = { }; + }; - config = mkIf (config.components.gui.taskwarrior.enable) { + config = { + home.file.".config/bugwarrior/bugwarrior.toml".source = (pkgs.formats.toml { }).generate "bugwarriorrc.toml" config.bugwarrior.config; + # todo : before deleting this, put it in logseq - environment.systemPackages = with pkgs; [ + home.packages = [ + (pkgs.python3Packages.bugwarrior.overrideAttrs (old: { + version = "develop"; + src = pkgs.fetchFromGitHub { + owner = "ralphbean"; + repo = "bugwarrior"; + rev = "eb19a702a698f9c8c3ce2a1fe41f35872d9ae398"; + sha256 = "sha256-Geon+ddE58WJ10L4unotzvmZj1Ye0yjZHVQgrR2YWgE="; + }; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.python3Packages.pydantic + pkgs.python3Packages.tomli + pkgs.python3Packages.email-validator + pkgs.python3Packages.packaging + ]; + })) + ]; + + }; + + }]; + + home.packages = with pkgs; + [ taskwarrior taskwarrior-tui timewarrior - miller tasksh + taskwarrior-hooks (pkgs.writeShellScriptBin "tsak" ''${pkgs.taskwarrior}/bin/task "$@"'') + unstable.vit + (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active") + (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo") + (pkgs.writers.writeBashBin "calendar" '' ${pkgs.taskwarrior}/bin/task calendar ${pkgs.taskwarrior}/bin/task calendar_report '') - unstable.vit - (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active") - (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo") - - taskwarrior-hooks + # todo : belongs to calendar.nix vdirsyncer khal (pkgs.writers.writeBashBin "kalendar" '' @@ -69,28 +92,7 @@ in ${pkgs.khal}/bin/ikhal '') - # todo : before deleting this, put it in logseq - (python3Packages.bugwarrior.overrideAttrs (old: { - version = "develop"; - src = pkgs.fetchFromGitHub { - owner = "ralphbean"; - repo = "bugwarrior"; - rev = "eb19a702a698f9c8c3ce2a1fe41f35872d9ae398"; - sha256 = "sha256-Geon+ddE58WJ10L4unotzvmZj1Ye0yjZHVQgrR2YWgE="; - }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - python3Packages.pydantic - python3Packages.tomli - python3Packages.email-validator - python3Packages.packaging - ]; - })) ]; - #home-manager.users.mainUser.home.file.".config/bugwarrior/bugwarriorrc".source = ./bugwarriorc.ini; - #home-manager.users.mainUser.home.file.".config/bugwarrior/bugwarriorrc".source = (pkgs.formats.toml { }).generate "bugwarriorrc.toml" config.components.gui.taskwarrior.config; - home-manager.users.mainUser.home.file.".config/bugwarrior/bugwarrior.toml".source = (pkgs.formats.toml { }).generate "bugwarriorrc.toml" config.components.gui.taskwarrior.config; - - }; } diff --git a/nixos/machines/cherry/configuration.nix b/nixos/machines/cherry/configuration.nix index 4e16fa5..5999481 100644 --- a/nixos/machines/cherry/configuration.nix +++ b/nixos/machines/cherry/configuration.nix @@ -35,11 +35,11 @@ components.monitor.opentelemetry.exporter.endpoint = "10.100.0.1:4317"; # orbi #components.monitor.opentelemetry.exporter.debug = "logs"; - home-manager.users.mainUser.home.sessionPath = [ "$HOME/.timewarrior/scripts" ]; sops.secrets.yubikey_u2fAuthFile = { }; - components.gui.taskwarrior.config = { + home-manager.users.mainUser.home.sessionPath = [ "$HOME/.timewarrior/scripts" ]; + home-manager.users.mainUser.bugwarrior.config = { general = { targets = [ "terranix" "my_github" ]; log_level = "INFO"; diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index 4ae1b77..3109662 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -43,11 +43,12 @@ components.monitor.opentelemetry.exporter.endpoint = "10.100.0.1:4317"; # orbi components.monitor.exporters.zfs.enable = false; - home-manager.users.mainUser.home.sessionPath = [ "$HOME/.timewarrior/scripts" ]; sops.secrets.yubikey_u2fAuthFile = { }; - components.gui.taskwarrior.config = { + + home-manager.users.mainUser.home.sessionPath = [ "$HOME/.timewarrior/scripts" ]; + home-manager.users.mainUser.bugwarrior.config = { general = { targets = [ "terranix" "my_github" ]; log_level = "INFO";