From f15cd0f08750a9346c0434b9767031ef86a0a62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 30 Sep 2021 18:19:44 +0200 Subject: [PATCH] gtk: add final newline to bookmarks to avoid conflicts --- modules/misc/gtk.nix | 4 ++-- tests/modules/misc/gtk/gtk-basic-config-expected.conf | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index db0a8e7a3..9bf2f3c7c 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -167,7 +167,7 @@ in { ++ optionalPackage cfg.iconTheme; home.file.${cfg2.configLocation}.text = - concatStringsSep "\n" (mapAttrsToList formatGtk2Option ini) + "\n" + concatMapStrings (l: l + "\n") (mapAttrsToList formatGtk2Option ini) + cfg2.extraConfig; home.sessionVariables.GTK2_RC_FILES = cfg2.configLocation; @@ -178,7 +178,7 @@ in { xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss; xdg.configFile."gtk-3.0/bookmarks" = mkIf (cfg3.bookmarks != [ ]) { - text = concatStringsSep "\n" cfg3.bookmarks; + text = concatMapStrings (l: l + "\n") cfg3.bookmarks; }; dconf.settings."org/gnome/desktop/interface" = dconfIni; diff --git a/tests/modules/misc/gtk/gtk-basic-config-expected.conf b/tests/modules/misc/gtk/gtk-basic-config-expected.conf index 3970b6e91..2e4c1c368 100644 --- a/tests/modules/misc/gtk/gtk-basic-config-expected.conf +++ b/tests/modules/misc/gtk/gtk-basic-config-expected.conf @@ -1,2 +1 @@ - gtk-can-change-accels = 1 \ No newline at end of file