flake.nix

@@ -130,12 +130,7 @@
                 landingpage = landingpage.packages.${system}.plain;
                 kmonad = kmonad.packages.${system}.kmonad;
                 tasksh = taskshell.packages.${system}.tasksh;
-                inherit (self.packages.${system})
-                  otpmenu
-                  taskwarrior-hooks
-                  nsxiv
-                  bugwarrior
-                  ;
+                inherit (self.packages.${system}) otpmenu taskwarrior-hooks nsxiv;
               })
             ];
           };

homes/palo/taskwarrior.nix

@@ -60,11 +60,29 @@ in
         default = { };
       };
 
-      config = mkIf config.gui.enable {
+      config = {
         home.file.".config/bugwarrior/bugwarrior.toml".source =
           (pkgs.formats.toml { }).generate "bugwarriorrc.toml"
             config.bugwarrior.config;
-        home.packages = [ pkgs.bugwarrior ];
+        # 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
+            ];
+          }))
+        ];
       };
 
     }
@@ -74,15 +92,15 @@ in
 
     home.packages = [
 
-      pkgs.timewarrior
-
       taskwarrior
+      taskwarrior-tui
+
+      pkgs.timewarrior
       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")
 

machines/chungus/configuration.nix

@@ -45,10 +45,10 @@
     ./sync-syncoid.nix
 
     ./service-atuin.nix
-    ./service-forgejo.nix
     ./service-paperless.nix
-    ./service-s3.nix
-    ./service-vault.nix
+    ./services-forgejo.nix
+    ./services-s3.nix
+    ./services-vault.nix
 
     ./zerotier-controller.nix
 

nix/packages/default.nix

@@ -1,38 +1,13 @@
-{ inputs, ... }:
-{
-
+_: {
   perSystem =
-    { pkgs, system, ... }:
+    { pkgs, ... }:
     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 = "2024-08-27";
-        src = pkgs.fetchFromGitHub {
-          owner = "ralphbean";
-          repo = "bugwarrior";
-          rev = "25e99834ef79e0a8c7141943810e0aa5152d6710";
-          sha256 = "sha256-JPmFP6i/7Ji5LyrKT9WCngWqMyrM00rEXV8QVLwxx1A=";
-        };
-        propagatedBuildInputs = old.propagatedBuildInputs ++ [
-          legacy_2311.python3Packages.pydantic
-          legacy_2311.python3Packages.tomli
-          legacy_2311.python3Packages.email-validator
-          legacy_2311.python3Packages.packaging
-        ];
-      });
-
     };
 }