diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix
index c578536..1827f9a 100644
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@@ -36,8 +36,18 @@ in {
 
       python # needed for hooks
 
-      # funktioiert irgendwie nicht
-      # python3Packages.bugwarrior
+      # bugwarrior
+      (let
+        mypython = let
+          packageOverrides = self: super: {
+            bugwarrior = super.bugwarrior.overridePythonAttrs (old: {
+              propagatedBuildInputs = old.propagatedBuildInputs
+                ++ [ super.setuptools ];
+            });
+          };
+        in pkgs.python3.override { inherit packageOverrides; };
+      in mypython.pkgs.bugwarrior)
+
     ];
 
   };
diff --git a/system/desktop/home-manager.nix b/system/desktop/home-manager.nix
index ca561df..4f62bce 100644
--- a/system/desktop/home-manager.nix
+++ b/system/desktop/home-manager.nix
@@ -36,28 +36,39 @@ in {
 
   home-manager.users.mainUser = {
 
-    home.file.".config/bugwarrior/bugwarriorrc".text = lib.generators.toINI{} {
-      general = {
-        # todo : make this a list of strings and generate a comma separated list (as one string)
-        target = "my-github";
-      };
-      my-github = {
-        service = "github";
-        # todo : make this a attrset
-        "github.login" = "mrVanDalo";
-        "github.token" = "@oracle:eval:${pkgs.pass}/bin/pass development/github/mrVanDalo/bugwarriorAccessToken";
-        "github.username" = "mrVanDalo";
+    home.file.".config/bugwarrior/bugwarriorrc".text =
+      ''
+        [general]
+        targets = my-github,nixos-github
+        static_fields = priority
+        log.level = INFO
 
-        # Instead of fetching issues and pull requests based on {{username}}’s owned repositories, you may instead get those that {{username}} is involved in. This includes all issues and pull requests where the user is the author, the assignee, mentioned in, or has commented on. To do so, add the following configuration option:
-        "github.involved_issues" = "True";
+        [my-github]
+        service = github
+        github.login = mrVanDalo
+        github.token = @oracle:eval:${pkgs.pass}/bin/pass development/github/mrVanDalo/bugwarriorAccessToken
+        github.username = mrVanDalo
+        github.default_priority =
+        github.description_template = {{githubtitle}} {{githuburl}}
+        github.add_tags = github
+        github.involved_issues = False
+        github.exclude_repos = azubi,stepp0r
+        github.include_user_repos = True
+        github.include_user_issues = False
 
-        # By default, issues from all repos belonging to github.username are included. To turn this off, set:
-        # "github.include_user_repos" = False
-
-        # noisy_repository is the repository you would not like issues created for:
-        #"github.exclude_repos" = noisy_repository
-      };
-    };
+        [nixos-github]
+        service = github
+        github.login = mrVanDalo
+        github.token = @oracle:eval:${pkgs.pass}/bin/pass development/github/mrVanDalo/bugwarriorAccessToken
+        github.username = mrVanDalo
+        github.default_priority =
+        github.description_template = {{githubtitle}} {{githuburl}}
+        github.add_tags = github
+        github.involved_issues = False
+        github.include_user_repos = False
+        github.include_user_issues = False
+        github.query = involves:mrVanDalo is:open org:NixOS org:krebs
+      '';
 
     home.file.".zshrc".text = ''
       # a fix for https://github.com/NixOS/nixpkgs/issues/27587