From 399ff42d7330c5a1a9a34485656a3afafb596a57 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:42:35 -0400
Subject: [PATCH 1/3] nixos/pantheon: set GTK_CSD

Causes various issues when not set
* https://github.com/elementary/files/issues/971
* https://github.com/elementary/default-settings/pull/103
* https://github.com/cassidyjames/ideogram/issues/26

However this can cause certain problems in gala
* https://github.com/elementary/gala/issues/244
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e27a479adad..46a15b723e1 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -102,6 +102,9 @@ 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
       fi
     '';
 

From d745487c1efe124687c3d787c09bcc2ab8303a28 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:43:48 -0400
Subject: [PATCH 2/3] nixos/pantheon: use filechooser module

Setting GTK_CSD=1 works around the issue
we were having with this [0]

[0]: https://github.com/elementary/files/issues/971
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 46a15b723e1..8e1272f3c92 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -105,6 +105,7 @@ in
 
           # Settings from elementary-default-settings
           export GTK_CSD=1
+          export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
       fi
     '';
 

From 1d0a54f4b0766119c2ff21799455ca9fe84f36f9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:44:01 -0400
Subject: [PATCH 3/3] pantheon.elementary-files: multi outputs

---
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ad4cfa86c27..7f284672653 100644
--- 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;