From 7f27ccd07c30a1ef680ac43cb23e026c5682e2f6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 5 Sep 2024 09:21:16 +0700
Subject: [PATCH] :truck: extract bugwarrior to packages

---
 flake.nix                  |  7 ++++++-
 homes/palo/taskwarrior.nix | 27 +++++----------------------
 nix/packages/default.nix   | 29 +++++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index b5473a5..21f98c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -130,7 +130,12 @@
                 landingpage = landingpage.packages.${system}.plain;
                 kmonad = kmonad.packages.${system}.kmonad;
                 tasksh = taskshell.packages.${system}.tasksh;
-                inherit (self.packages.${system}) otpmenu taskwarrior-hooks nsxiv;
+                inherit (self.packages.${system})
+                  otpmenu
+                  taskwarrior-hooks
+                  nsxiv
+                  bugwarrior
+                  ;
               })
             ];
           };
diff --git a/homes/palo/taskwarrior.nix b/homes/palo/taskwarrior.nix
index fafd4a1..13c0598 100644
--- a/homes/palo/taskwarrior.nix
+++ b/homes/palo/taskwarrior.nix
@@ -47,6 +47,7 @@ let
 
   taskwarrior = pkgs.taskwarrior3;
 
+
 in
 
 {
@@ -64,25 +65,7 @@ in
         home.file.".config/bugwarrior/bugwarrior.toml".source =
           (pkgs.formats.toml { }).generate "bugwarriorrc.toml"
             config.bugwarrior.config;
-        # todo : before deleting this, put it in logseq
-
-        home.packages = [
-          (pkgs.legacy_2311.python3Packages.bugwarrior.overrideAttrs (old: {
-            version = "develop";
-            src = pkgs.fetchFromGitHub {
-              owner = "ralphbean";
-              repo = "bugwarrior";
-              rev = "6554e70c199cc766a2b5e4e4fe22e4e46d64bba1";
-              sha256 = "sha256-cKhL8FBH7wxCxXrybVRLfCHQTCxursFqtBDl3e1UUXs=";
-            };
-            propagatedBuildInputs = old.propagatedBuildInputs ++ [
-              pkgs.legacy_2311.python3Packages.pydantic
-              pkgs.legacy_2311.python3Packages.tomli
-              pkgs.legacy_2311.python3Packages.email-validator
-              pkgs.legacy_2311.python3Packages.packaging
-            ];
-          }))
-        ];
+        home.packages = [ pkgs.bugwarrior ];
       };
 
     }
@@ -92,15 +75,15 @@ in
 
     home.packages = [
 
-      taskwarrior
-      taskwarrior-tui
-
       pkgs.timewarrior
+
+      taskwarrior
       pkgs.tasksh
       pkgs.taskwarrior-hooks
       (pkgs.writeShellScriptBin "tsak" ''${taskwarrior}/bin/task "$@"'')
 
       pkgs.vit
+      taskwarrior-tui
       (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active")
       (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo")
 
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
index 1d8a33b..23fee15 100644
--- a/nix/packages/default.nix
+++ b/nix/packages/default.nix
@@ -1,13 +1,38 @@
-_: {
+{ inputs, ... }:
+{
+
   perSystem =
-    { pkgs, ... }:
+    { pkgs, system, ... }:
     with pkgs;
+    let
+      legacy_2311 = import inputs.nixpkgs-legacy_2311 { inherit system; };
+    in
     {
       packages.pkl = callPackage ./pkl { };
       packages.otpmenu = callPackage ./otpmenu { };
       #packages.sononym = callPackage ./sononym { };
       #packages.sononym-crawler = callPackage ./sononym-crawler { };
       packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
+
+      # overrides
+      # ---------
       packages.nsxiv = (pkgs.nsxiv.override { conf = builtins.readFile ./nsxiv/config.def.h; });
+
+      packages.bugwarrior = legacy_2311.python3Packages.bugwarrior.overrideAttrs (old: {
+        version = "develop";
+        src = pkgs.fetchFromGitHub {
+          owner = "ralphbean";
+          repo = "bugwarrior";
+          rev = "6554e70c199cc766a2b5e4e4fe22e4e46d64bba1";
+          sha256 = "sha256-cKhL8FBH7wxCxXrybVRLfCHQTCxursFqtBDl3e1UUXs=";
+        };
+        propagatedBuildInputs = old.propagatedBuildInputs ++ [
+          legacy_2311.python3Packages.pydantic
+          legacy_2311.python3Packages.tomli
+          legacy_2311.python3Packages.email-validator
+          legacy_2311.python3Packages.packaging
+        ];
+      });
+
     };
 }