i3: update to work with gnome 3.24

This commit is contained in:
Gabriel Ebner 2017-09-02 09:41:48 +02:00
parent 5899409716
commit 8dd1984679
2 changed files with 11 additions and 3 deletions

12
i3.nix
View File

@ -84,15 +84,20 @@
session = [ { session = [ {
name = "i3wm"; name = "i3wm";
start = '' 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 $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
export XDG_CURRENT_DESKTOP=GNOME 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 & i3 &
waitPID=$! waitPID=$!
''; '';
} ]; } ];
}; };
updateDbusEnvironment = true;
windowManager = { windowManager = {
default = "i3"; default = "i3";
i3.enable = true; i3.enable = true;
@ -104,6 +109,7 @@
}; };
services.dbus.packages = with pkgs; [ dunst gnome3.gcr ]; services.dbus.packages = with pkgs; [ dunst gnome3.gcr ];
services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
# copied from gnome3 module # copied from gnome3 module
security.polkit.enable = true; security.polkit.enable = true;
@ -128,8 +134,8 @@
# Needed for themes and backgrounds # Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [ environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [
"${dconf}/lib/gio/modules" "${pkgs.lib.getLib dconf}/lib/gio/modules"
"${glib_networking}/lib/gio/modules" "${glib_networking.out}/lib/gio/modules"
"${gvfs}/lib/gio/modules" ]; "${gvfs}/lib/gio/modules" ];
} }

View File

@ -24,6 +24,8 @@
]; ];
services.xserver = { services.xserver = {
dpi = 120;
libinput.enable = true; libinput.enable = true;
config = '' config = ''
Section "InputClass" Section "InputClass"