Merge branch 'master' into 0.7.0-dev

3 files changed, 64 insertions, 9 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md

index 03400390..19dfc26b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,27 @@
-<!--
-If you want to request a feature or ask a question, feel free to remove all the irrelevant text.
--->
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+### Describe the bug
+A clear and concise description of what the bug is.
+
+### To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+### Expected behavior
+A clear and concise description of what you expected to happen.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
 
 ### System:
 
@@ -11,12 +32,6 @@ If you want to request a feature or ask a question, feel free to remove all the
 - C++ compiler: <!-- if you compiled it yourself -->
 - Desktop Environment: <!-- for Linux -->
 
-### Actual behavior
-
-### Expected behavior
-
-### Steps to reproduce
-
 ### Logs
 <!-- If applicable -->
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644

index 00000000..11fc491e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md

index 115c0c77..db522f70 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,12 @@ can be found in the [Github releases](https://github.com/Nheko-Reborn/nheko/rele
 pacaur -S nheko # nheko-git
 ```
 
+#### Debian (10 and above)
+
+```bash
+sudo apt install nheko
+```
+
 #### Fedora
 ```bash
 sudo dnf install nheko
@@ -81,8 +87,15 @@ sudo apk add nheko
 flatpak install flathub io.github.NhekoReborn.Nheko
 ```
 
+#### Guix
+
+```
+guix install nheko
+```
+
 #### macOS (10.14 and above)
 
+
 with [macports](https://www.macports.org/) :
 
 ```sh
@@ -186,8 +199,15 @@ sudo apt install cmake gcc make automake liblmdb-dev libsodium-dev \
     qml-module-qtgraphicaleffects qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts
 ```
 
+##### Guix
+
+```bash
+guix environment nheko
+```
+
 ##### macOS (Xcode 10.2 or later)
 
+
 ```bash
 brew update
 brew install qt5 lmdb cmake llvm libsodium spdlog boost cmark