diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix
index 87995ad..e53b228 100644
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@@ -68,17 +68,19 @@ in {
         ${pkgs.khal}/bin/ikhal
       '')
 
+      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)
+      #(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 c9bd2aa..9e73a68 100644
--- a/system/desktop/home-manager.nix
+++ b/system/desktop/home-manager.nix
@@ -42,11 +42,11 @@ in {
 
     home.file.".config/bugwarrior/bugwarriorrc".text = ''
       [general]
-      targets = my-github,nixos-github
+      targets = terranix
       static_fields = priority
       log.level = INFO
 
-      [my-github]
+      [terranix]
       service = github
       github.login = mrVanDalo
       github.token = @oracle:eval:${pkgs.pass}/bin/pass development/github/mrVanDalo/bugwarriorAccessToken
@@ -54,23 +54,11 @@ in {
       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.project_name = terranix
+      github.involved_issues = True
+      github.query = org:terranix is:open
       github.include_user_issues = False
-
-      [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 org:xmonad
     '';
 
     home.file.".zshrc".text = ''