Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-01 19:18:28 -04:00
Code Packages Releases Activity

Add optional=true to niri configs (#2776)

Browse Source 
* nix: update flake.lock

* nix/niri: use optional=true in includes

* nix: fix tests

* niri: update embedded config to add optional=true
This commit is contained in:
Lucas
2026-07-07 22:40:43 -03:00
committed by GitHub
parent 93168ee073
commit 56712f46fa
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/internal/config/embedded/niri.kdl
+6 -6
View File
@@ -265,9 +265,9 @@ recent-windows {
} }
// Include dms files // Include dms files
include "dms/colors.kdl" include optional=true "dms/colors.kdl"
include "dms/layout.kdl" include optional=true "dms/layout.kdl"
include "dms/alttab.kdl" include optional=true "dms/alttab.kdl"
include "dms/binds.kdl" include optional=true "dms/binds.kdl"
include "dms/outputs.kdl" include optional=true "dms/outputs.kdl"
include "dms/cursor.kdl" include optional=true "dms/cursor.kdl"
distro/nix/niri.nix
+1 -1
View File
@@ -93,7 +93,7 @@ in {
text = lib.pipe cfg'.filesToInclude [ text = lib.pipe cfg'.filesToInclude [
(map (filename: "dms/${filename}")) (map (filename: "dms/${filename}"))
withOriginalConfig withOriginalConfig
(map (filename: "include \"${filename}.kdl\"")) (map (filename: "include optional=true \"${filename}.kdl\""))
(files: files ++ fixes) (files: files ++ fixes)
(builtins.concatStringsSep "\n") (builtins.concatStringsSep "\n")
]; ];
distro/nix/tests/home-manager-module.nix
+2 -2
View File
@@ -6,8 +6,8 @@
let let
homeManagerNixosModule = homeManagerNixosModule =
(fetchTarball { (fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/53ebbdc405acc04acd9bb73ccca462b51ddb8c6d.tar.gz";
sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc="; sha256 = "1cqmfgwb3jac2zzv82bwvgypxff1z30xkz9j6qcinkmqf58j3k3b";
}) })
+ "/nixos"; + "/nixos";
in in
distro/nix/tests/niri-home-module.nix
+4 -4
View File
@@ -6,8 +6,8 @@
let let
homeManagerNixosModule = homeManagerNixosModule =
(fetchTarball { (fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/53ebbdc405acc04acd9bb73ccca462b51ddb8c6d.tar.gz";
sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc="; sha256 = "1cqmfgwb3jac2zzv82bwvgypxff1z30xkz9j6qcinkmqf58j3k3b";
}) })
+ "/nixos"; + "/nixos";
@@ -76,8 +76,8 @@ pkgs.testers.runNixOSTest {
machine.wait_for_unit("multi-user.target") machine.wait_for_unit("multi-user.target")
machine.succeed("su -- danklinux -c 'test -f ~/.config/niri/config.kdl'") 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 optional=true \\\"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 \\\"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 \"spawn-at-startup\" ~/.config/niri/hm.kdl'")
machine.succeed("su -- danklinux -c 'grep -F \"\\\"dms\\\" \\\"run\\\"\" ~/.config/niri/hm.kdl'") machine.succeed("su -- danklinux -c 'grep -F \"\\\"dms\\\" \\\"run\\\"\" ~/.config/niri/hm.kdl'")
''; '';
flake.lock
Generated
+3 -3
View File
@@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1778443072, "lastModified": 1783224372,
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "rev": "d407951447dcd00442e97087bf374aad70c04cea",
"type": "github" "type": "github"
}, },
"original": { "original": {