Merge pull request #66047 from worldofpeace/pantheon/envars

nixos/pantheon: set GTK_CSD
2019-08-05 12:13:15 -04:00
parent 66d33844bd 1d0a54f4b0
commit 08ea10ad40
2 changed files with 6 additions and 0 deletions
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -102,6 +102,10 @@ in
          # Makes qt applications look less alien
          export QT_QPA_PLATFORMTHEME=gtk3
          export QT_STYLE_OVERRIDE=adwaita
+
+          # Settings from elementary-default-settings
+          export GTK_CSD=1
+          export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
      fi
    '';

--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {

  name = "elementary-${pname}-${version}";

+  outputs = [ "out" "dev" ];
+
  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;