summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2022-11-07 14:10:12 +0100
committerGitHub <noreply@github.com>2022-11-07 14:10:12 +0100
commit0adce209ffad8aa419d586cf9ba1acf99991674c (patch)
tree50419dd4116df847a311f0c0b624440303f873fb /pkgs/desktops
parent25528d7ae1d576b25b066be30c2ebcfa8bb28c59 (diff)
parent1528a7ca86b19830e87590113e9db15955fbffe9 (diff)
Merge pull request #200018 from bobby285271/cinnamon-gnome-terminal
Closes https://github.com/NixOS/nixpkgs/issues/200017
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix14
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
index a8d46d578996c..30caaaf6e3dfd 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"