From 56712f46fa7e7c9c4baf3a87277db4d190604a26 Mon Sep 17 00:00:00 2001
From: Lucas <luckshiba@protonmail.com>
Date: Tue, 7 Jul 2026 22:40:43 -0300
Subject: [PATCH] Add optional=true to niri configs (#2776)

* nix: update flake.lock

* nix/niri: use optional=true in includes

* nix: fix tests

* niri: update embedded config to add optional=true
---
 core/internal/config/embedded/niri.kdl   | 12 ++++++------
 distro/nix/niri.nix                      |  2 +-
 distro/nix/tests/home-manager-module.nix |  4 ++--
 distro/nix/tests/niri-home-module.nix    |  8 ++++----
 flake.lock                               |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/internal/config/embedded/niri.kdl b/core/internal/config/embedded/niri.kdl
index 13d08594d..f56f478aa 100644
--- a/core/internal/config/embedded/niri.kdl
+++ b/core/internal/config/embedded/niri.kdl
@@ -265,9 +265,9 @@ recent-windows {
 }
 
 // Include dms files
-include "dms/colors.kdl"
-include "dms/layout.kdl"
-include "dms/alttab.kdl"
-include "dms/binds.kdl"
-include "dms/outputs.kdl"
-include "dms/cursor.kdl"
+include optional=true "dms/colors.kdl"
+include optional=true "dms/layout.kdl"
+include optional=true "dms/alttab.kdl"
+include optional=true "dms/binds.kdl"
+include optional=true "dms/outputs.kdl"
+include optional=true "dms/cursor.kdl"
diff --git a/distro/nix/niri.nix b/distro/nix/niri.nix
index 04f491da1..12b3ed510 100644
--- a/distro/nix/niri.nix
+++ b/distro/nix/niri.nix
@@ -93,7 +93,7 @@ in {
           text = lib.pipe cfg'.filesToInclude [
             (map (filename: "dms/${filename}"))
             withOriginalConfig
-            (map (filename: "include \"${filename}.kdl\""))
+            (map (filename: "include optional=true \"${filename}.kdl\""))
             (files: files ++ fixes)
             (builtins.concatStringsSep "\n")
           ];
diff --git a/distro/nix/tests/home-manager-module.nix b/distro/nix/tests/home-manager-module.nix
index b0ca912b7..877b504e8 100644
--- a/distro/nix/tests/home-manager-module.nix
+++ b/distro/nix/tests/home-manager-module.nix
@@ -6,8 +6,8 @@
 let
   homeManagerNixosModule =
     (fetchTarball {
-      url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz";
-      sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=";
+      url = "https://github.com/nix-community/home-manager/archive/53ebbdc405acc04acd9bb73ccca462b51ddb8c6d.tar.gz";
+      sha256 = "1cqmfgwb3jac2zzv82bwvgypxff1z30xkz9j6qcinkmqf58j3k3b";
     })
     + "/nixos";
 in
diff --git a/distro/nix/tests/niri-home-module.nix b/distro/nix/tests/niri-home-module.nix
index e283a5444..c07246f20 100644
--- a/distro/nix/tests/niri-home-module.nix
+++ b/distro/nix/tests/niri-home-module.nix
@@ -6,8 +6,8 @@
 let
   homeManagerNixosModule =
     (fetchTarball {
-      url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz";
-      sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=";
+      url = "https://github.com/nix-community/home-manager/archive/53ebbdc405acc04acd9bb73ccca462b51ddb8c6d.tar.gz";
+      sha256 = "1cqmfgwb3jac2zzv82bwvgypxff1z30xkz9j6qcinkmqf58j3k3b";
     })
     + "/nixos";
 
@@ -76,8 +76,8 @@ pkgs.testers.runNixOSTest {
     machine.wait_for_unit("multi-user.target")
 
     machine.succeed("su -- danklinux -c 'test -f ~/.config/niri/config.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"include \\\"dms/binds.kdl\\\"\" ~/.config/niri/config.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"include \\\"hm.kdl\\\"\" ~/.config/niri/config.kdl'")
+    machine.succeed("su -- danklinux -c 'grep -F \"include optional=true \\\"dms/binds.kdl\\\"\" ~/.config/niri/config.kdl'")
+    machine.succeed("su -- danklinux -c 'grep -F \"include optional=true \\\"hm.kdl\\\"\" ~/.config/niri/config.kdl'")
     machine.succeed("su -- danklinux -c 'grep -F \"spawn-at-startup\" ~/.config/niri/hm.kdl'")
     machine.succeed("su -- danklinux -c 'grep -F \"\\\"dms\\\" \\\"run\\\"\" ~/.config/niri/hm.kdl'")
   '';
diff --git a/flake.lock b/flake.lock
index 9d94fd293..19963e812 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
         "type": "github"
       },
       "original": {