From ceb92dafd7da57cf0bb640795053cae11fdced70 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Tue, 26 Jul 2022 22:13:09 +0200
Subject: [PATCH] Release 1.6.0 this time with correct packaging

---
 .github/workflows/push.yml |  8 +-------
 CHANGELOG.md               | 19 +++++++++++++++++++
 CMakeLists.txt             |  6 ++++++
 README.md                  | 19 ++-----------------
 4 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8517fd562..bee9cdb13 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -24,13 +24,7 @@ jobs:
       - name: configure project
         # We reuse the build binary only for the releases.
         # We set tweak version to off, because it is wrong, as git tag will happen after this step. Releases don't have a tweak, so this is ok.
-        run: >
-          cmake
-          -DSET_TWEAK=Off
-          -DBUILD_TESTS=On
-          -DCMAKE_INSTALL_PREFIX="usr"
-          -DCMAKE_INSTALL_SYSCONFDIR="etc"
-          .
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
 
       - name: build project
         run: cmake --build . -j$(nproc) --target package
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..1443d3728
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,19 @@
+# 1.6.0
+
+Features:
+* Detect QT on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [QT]
+* Alacritty font detection
+* Load `/etc/fastfetch/config.conf` before user config
+* Disk: print one decimal point if size < 100GB
+* `--title-fqdn` option, to print fully qualified domain name instead of host name in title
+ 
+Logos:
+* updated old NixOS logo
+
+Bugfixes:
+* Correctly detect GTK on DEs that store their settings in dconf
+* Correctly detect NixOS packages
+* Mutter WM detected once again
+* Show full NixOS version in OS output
+* Don't segfault if an invalid structure is given
+* WSL doesn't output GPU anymore, as the name is always meaningless
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40625856f..02caccc66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,6 +493,10 @@ endif()
 # install target #
 ##################
 
+if(NOT CMAKE_INSTALL_SYSCONFDIR)
+    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
+endif()
+
 include(GNUInstallDirs)
 
 install(
@@ -527,6 +531,8 @@ install(
 ##################
 
 set(CPACK_GENERATOR "DEB;RPM;TGZ;ZIP")
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+set(CPACK_SET_DESTDIR ON)
 
 set(CPACK_PACKAGE_CONTACT "Linus Dierheimer <Linus@Dierheimer.de>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Neofetch clone written in C")
diff --git a/README.md b/README.md
index dee01cd77..d4c321447 100644
--- a/README.md
+++ b/README.md
@@ -98,23 +98,8 @@ If pkg-config fails to find the headers for a library listed in [dependencies](#
 
 ### Manual
 
-#### Build DEB / RPM package:
-```bash
-cmake .. \
-    -DCMAKE_INSTALL_PREFIX="usr" \
-    -DCMAKE_INSTALL_SYSCONFDIR="etc"
-
-cmake --build . --target package
-```
-
-#### Install directly:
-```bash
-cmake .. \
-    -DCMAKE_INSTALL_PREFIX="usr/local" \
-    -DCMAKE_INSTALL_SYSCONFDIR="etc"
-
-sudo cmake --install .
-```
+* DEB / RPM package: `cmake --build . --target package`
+* Install directly: `cmake --install . --prefix /usr/local`
 
 ## FAQ