diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish
index 7614e7ad..3435d391 100644
--- a/.config/fish/conf.d/abbr.fish
+++ b/.config/fish/conf.d/abbr.fish
@@ -15,4 +15,4 @@ abbr -a justg just -g
 abbr -a --command git pushf push --force-with-lease
 abbr -a lsgit eza -a --tree --git-ignore --long --icons --header
 abbr -a blu systemctl --user restart blueman-applet.service
-abbr -a hniri hx /home/fic/.config/niri/config.kdl
+abbr -a hniri hx /home/fic/.config/niri/main.kdl
diff --git a/.config/niri/config.kdl##template b/.config/niri/config.kdl##template
index 87c9db91..bc84561c 100644
--- a/.config/niri/config.kdl##template
+++ b/.config/niri/config.kdl##template
@@ -1,5 +1,7 @@
-// WARNING: Do not edit config.kdl
-// It was generated by processing {{ yadm.source }}
+{% include "warning.txt" %}
+
+// Host {{ yadm.hostname }} specific config:
+
 {% if yadm.hostname == "dpad" %}
 output "eDP-1" {
     scale 1.5
@@ -8,7 +10,6 @@ output "DP-1" {
     mode "3840x2160"
     scale 2
 }
-{% include "main.kdl" %}
 {% else %}
 // BenQ
 output "DP-1" {
@@ -22,5 +23,8 @@ output "HDMI-A-1" {
 workspace "music" {
     open-on-output "Dell"
 }
-{% include "main.kdl" %}
 {% endif %}
+
+// main.kdl standard config:
+
+{% include "main.kdl" %}
diff --git a/.config/niri/main.kdl b/.config/niri/main.kdl
index a6156894..33ef162f 100644
--- a/.config/niri/main.kdl
+++ b/.config/niri/main.kdl
@@ -1,10 +1,3 @@
-// This config is in the KDL format: https://kdl.dev
-// "/-" comments out the following node.
-// Check the wiki for a full description of the configuration:
-// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
-// Input device configuration.
-// Find the full list of options on the wiki:
-// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
 input {
     keyboard {
         xkb {
diff --git a/.config/niri/warning.txt b/.config/niri/warning.txt
new file mode 100644
index 00000000..252da877
--- /dev/null
+++ b/.config/niri/warning.txt
@@ -0,0 +1,5 @@
+// WARNING: Do not edit config.kdl!
+// It was generated by processing {{ yadm.source }},
+// and your changes will be overwritten.
+// Edit the template, and main.kdl instead!
+