From 8dd19846799b111ce9240df37db7b443b3073aa4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Sep 2017 09:41:48 +0200
Subject: [PATCH] i3: update to work with gnome 3.24

---
 i3.nix       | 12 +++++++++---
 petalius.nix |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/i3.nix b/i3.nix
index 263d08c..4d48096 100644
--- a/i3.nix
+++ b/i3.nix
@@ -84,15 +84,20 @@
       session = [ {
         name = "i3wm";
         start = ''
+          export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
           export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
           export XDG_CURRENT_DESKTOP=GNOME
-          ${pkgs.gnome3.gnome_settings_daemon}/libexec/gnome-settings-daemon-localeexec &
+          for m in xsettings; do
+            ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m &
+          done
           i3 &
           waitPID=$!
         '';
       } ];
     };
 
+    updateDbusEnvironment = true;
+
     windowManager = {
       default = "i3";
       i3.enable = true;
@@ -104,6 +109,7 @@
   };
 
   services.dbus.packages = with pkgs; [ dunst gnome3.gcr ];
+  services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
 
   # copied from gnome3 module
   security.polkit.enable = true;
@@ -128,8 +134,8 @@
   # Needed for themes and backgrounds
   environment.pathsToLink = [ "/share" ];
   environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [
-    "${dconf}/lib/gio/modules"
-    "${glib_networking}/lib/gio/modules"
+    "${pkgs.lib.getLib dconf}/lib/gio/modules"
+    "${glib_networking.out}/lib/gio/modules"
     "${gvfs}/lib/gio/modules" ];
 
 }
diff --git a/petalius.nix b/petalius.nix
index a358016..11cbbe5 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -24,6 +24,8 @@
   ];
 
   services.xserver = {
+    dpi = 120;
+
     libinput.enable = true;
     config = ''
       Section "InputClass"