diff --git a/module/sway/default.nix b/module/sway/default.nix index 7bc6782..62f12ff 100644 --- a/module/sway/default.nix +++ b/module/sway/default.nix @@ -1,6 +1,6 @@ { pkgs, wallpaper, style, util, setting, ... } @args: let mkConfig = { modules }: builtins.foldl' (acc: mod: - acc + (import mod args).text + acc + util.trimTabs((import mod args).text) ) "" modules; swayRc = mkConfig { @@ -27,9 +27,9 @@ ]; }; in { - config = util.trimTabs ('' + config = (util.trimTabs '' # Read `man 5 sway` for a complete reference. include /etc/sway/config.d/* - '' + swayRc); + '') + swayRc; } diff --git a/part/Util.nix b/part/Util.nix index b2da388..0a130a6 100644 --- a/part/Util.nix +++ b/part/Util.nix @@ -11,9 +11,7 @@ ls = path: map (f: "${path}/${f}") (builtins.attrNames (builtins.readDir path)); # Concat all files by `text` key. - catAllText = path: args: trimTabs ( - (builtins.foldl' (acc: mod: - acc + (import mod args).text - ) "" (ls path)) - ); + catAllText = path: args: builtins.foldl' (acc: mod: + acc + trimTabs ((import mod args).text) + ) "" (ls path); }