X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/0f1855e30b2354cf75d714a90ec571d98adef05d..ced721374ed8d79bb05e4971e0738f0df067f408:/bugwarrior/bugwarrior.toml

diff --git a/bugwarrior/bugwarrior.toml b/bugwarrior/bugwarrior.toml
index 5a990e1..92e38f6 100644
--- a/bugwarrior/bugwarrior.toml
+++ b/bugwarrior/bugwarrior.toml
@@ -2,38 +2,57 @@
 
 [general]
 taskrc = "~/.config/task/taskrc"
-targets = ["fpp_gitlab", "fpp_gitlab_todo"]
+targets = ["fpp_gitlab_mr", "fpp_gitlab_issue", "fpp_gitlab_todo"]
 
-shorten          = false
-inline_links     = true
-annotation_links = true
+shorten      = false
+inline_links = true
 
-[fpp_gitlab]
+annotation_links    = false
+annotation_comments = false
+
+[fpp_gitlab_mr]
 service = "gitlab"
 login   = "samir.fpp"
-token   = ""
+token   = "@oracle:eval:pass fpp/gitlab.com/tokens/bugwarrior"
 host    = "gitlab.com"
 
 include_repos = ["fppnt/sgnss/springfield"]
-add_tags = ["work", "gitlab", "{{gitlabtype}}"]
+add_tags = ["gitlab", "mr"]
 
 owned                  = false
-include_issues         = true
+include_issues         = false
 include_merge_requests = true
 include_todos          = false
-default_issue_priority = "L"
 default_mr_priority    = "H"
 
+project_template     = "stm.!{{gitlabnumber}}"
+description_template = "{{gitlabtitle}}"
+
+[fpp_gitlab_issue]
+service = "gitlab"
+login   = "samir.fpp"
+token   = "@oracle:eval:pass fpp/gitlab.com/tokens/bugwarrior"
+host    = "gitlab.com"
+
+include_repos = ["fppnt/sgnss/springfield"]
+add_tags = ["gitlab", "issue"]
+
+owned                  = false
+include_issues         = true
+include_merge_requests = false
+include_todos          = false
+default_issue_priority = "L"
+
 project_template     = "stm.#{{gitlabnumber}}"
 description_template = "{{gitlabtitle}}"
 
 [fpp_gitlab_todo]
 service = "gitlab"
 login   = "samir.fpp"
-token   = ""
+token   = "@oracle:eval:pass fpp/gitlab.com/tokens/bugwarrior"
 host    = "gitlab.com"
 
-add_tags = ["work", "gitlab"]
+add_tags = ["gitlab", "todo"]
 
 owned = true
 include_issues         = false