From 1528a7ca86b19830e87590113e9db15955fbffe9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 7 Nov 2022 14:25:27 +0800
Subject: [PATCH] cinnamon.cinnamon-gsettings-overrides: Override
 gnome-terminal settings with Fedora's default

This fixes issues caused by vanilla gnome-terminal and mint-artwork:

- Grey text and black background, this makes text almost unreadable.
- Only one 'New Terminal' button in menu which means you cannot open tab and open window in the same menu.
---
 .../cinnamon-gsettings-overrides/default.nix       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
index a8d46d578996..30caaaf6e3df 100644
--- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
@@ -2,6 +2,7 @@
 , runCommand
 , nixos-artwork
 , glib
+, gnome
 , gtk3
 , gsettings-desktop-schemas
 , extraGSettingsOverrides ? ""
@@ -35,9 +36,20 @@ let
     cinnamon-session
     cinnamon-settings-daemon
     cinnamon-common
+    gnome.gnome-terminal
     gtk3
   ] ++ extraGSettingsOverridePackages;
 
+  gsettingsOverrides = ''
+    # Use Fedora's default to make text readable and
+    # restore ununified menu.
+    # https://github.com/NixOS/nixpkgs/issues/200017
+    [org.gnome.Terminal.Legacy.Settings]
+    theme-variant='dark'
+    unified-menu=false
+
+    ${extraGSettingsOverrides}
+  '';
 in
 
 # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
@@ -53,7 +65,7 @@ runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; }
     chmod -R a+w "$data_dir"
 
     cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF
-    ${extraGSettingsOverrides}
+    ${gsettingsOverrides}
     EOF
 
     ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"