diff --git a/.github/ISSUE_TEMPLATE/1-issue.md b/.github/ISSUE_TEMPLATE/1-issue.md
deleted file mode 100644
index d7f1cf9c7..000000000
--- a/.github/ISSUE_TEMPLATE/1-issue.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Issue
-about: for reporting any issue
-title: "[Issue]"
-labels: ''
-assignees: ''
-
----
-
-- I have read the Usage and Troubleshooting pages of the wiki: https://end-4.github.io/dots-hyprland-wiki/en/i-i/04troubleshooting/
-- I have made sure that both my config and system packages are up to date
-- Linux distro:
-
----
-## The issue
-
-
-
-
-
-Logs
-
-
-
-
-
-
-```plain
-Paste logs here
-```
-
-
diff --git a/.github/ISSUE_TEMPLATE/3-test.yml b/.github/ISSUE_TEMPLATE/1-issue.yml
similarity index 62%
rename from .github/ISSUE_TEMPLATE/3-test.yml
rename to .github/ISSUE_TEMPLATE/1-issue.yml
index 844678eca..d92440524 100644
--- a/.github/ISSUE_TEMPLATE/3-test.yml
+++ b/.github/ISSUE_TEMPLATE/1-issue.yml
@@ -1,17 +1,22 @@
-name: Issue.
+name: Issue
description: for reporting any issue
title: "[Issue] "
labels: ["ISSUE"]
body:
+ - type: markdown
+ attributes:
+ value: |
+ **Tip:**
+ If your issue is not a feature request, and it does not fit into the following form, for example "how can I edit some widget", please use [discussions](https://github.com/end-4/dots-hyprland/discussions) instead.
- type: checkboxes
attributes:
label: Before you submit
options:
- label: I have read the [Troubleshooting](https://end-4.github.io/dots-hyprland-wiki/en/i-i/04troubleshooting/) and [Usage](https://end-4.github.io/dots-hyprland-wiki/en/i-i/02usage/) pages.
required: true
- - label: I've updated to the latest version following the [guidance](https://end-4.github.io/dots-hyprland-wiki/en/i-i/01setup/#updating).
+ - label: I've successfully updated to the latest version following the [guidance](https://end-4.github.io/dots-hyprland-wiki/en/i-i/01setup/#updating).
required: false # Not required cuz user may have failed to do so
- - label: I've had the system packages up to date.
+ - label: I've successfully updated the system packages to the latest.
required: false # Not required cuz user may have failed to do so
- type: textarea
@@ -34,6 +39,13 @@ body:
- type: textarea
attributes:
label: The issue
- value: "\n\n\nLogs
\n\n```\n\n```\n\n "
+ value: "\n\n\nClick to toggle folding
\n\n```\n\n\n```\n\n "
validations:
required: true
+
+ - type: checkboxes
+ attributes:
+ label: Last check
+ options:
+ - label: I agree that it's usually impossible for others to help me without my logs.
+ required: true
diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md
deleted file mode 100644
index 171110a3c..000000000
--- a/.github/ISSUE_TEMPLATE/2-feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature] "
-labels: ''
-assignees: ''
-
----
-
-
-
-**What would you like to be added?**
-
-
-**How will it help**
-
-
-**Extra info**
-
diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.yml b/.github/ISSUE_TEMPLATE/2-feature_request.yml
new file mode 100644
index 000000000..b3a5a20d0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature_request.yml
@@ -0,0 +1,23 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "[Feature] "
+labels: ["FEATURE"]
+body:
+ - type: markdown
+ attributes:
+ value: "NOTE: Please write in **English**."
+
+ - type: textarea
+ attributes:
+ label: "What would you like to be added?"
+ description: "Can be a suggestion for an existing feature. You can suggest a widget, minor user interaction changes.. whatever."
+
+ - type: textarea
+ attributes:
+ label: "How will it help?"
+ description: "It's helpful to include examples (like in your use case)."
+
+ - type: textarea
+ attributes:
+ label: "Extra info"
+ description: "If you want a new widget, a pic of the inspiration (if available) would be awesome."
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..3ba13e0ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.gitignore b/.gitignore
index aa05448d7..cff2e699c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
.config/ags/scss/_musicmaterial.scss
.config/ags/scss/_musicwal.scss
.config/ags/scss/_material.scss
-/diagnose.log
+/diagnose.result
/cache
# Ignore Python cache files
__pycache__/
diff --git a/diagnose b/diagnose
index 047ae2e15..567bc77f1 100755
--- a/diagnose
+++ b/diagnose
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
#
-# This script is for quickly generate helpful logs
+# This script is for quickly generate helpful info
#
cd "$(dirname "$0")";export base="$(pwd)"
-logfile=diagnose.log;rm $logfile
+output_file=diagnose.result;rm $output_file
export LANG=C;export LC_ALL=C
-x() { ii_exec "$@" 2>&1 | tee -a $logfile ; }
-e() { ii_box "$@" | tee -a $logfile ; }
+x() { ii_exec "$@" 2>&1 | tee -a $output_file ; }
+e() { ii_box "$@" | tee -a $output_file ; }
ii_box() {
length=$(echo "$1" | wc -L);total_width=$((length + 2))
#line=$(printf "═%.0s" $(seq 1 $total_width))
@@ -70,4 +70,4 @@ x ags --version
e "Checking python venv"
-e "Finished. Output saved as \"dianose.log\"."
+e "Finished. Output saved as \"$output_file\"."