3 files changed, 4 insertions, 5 deletions
diff --git a/makefu/2configs/gui/automatic-diskmount.nix b/makefu/2configs/gui/automatic-diskmount.nix
index 19933111..ad3774be 100644
--- a/makefu/2configs/gui/automatic-diskmount.nix
+++ b/makefu/2configs/gui/automatic-diskmount.nix
@@ -12,7 +12,6 @@ with import <stockholm/lib>; #genid
   users.users.makefu.packages = with pkgs;[
     gvfs pcmanfm lxmenu-data
   ];
-  environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
 
 ## allow users in group "storage" to mount disk
 # https://github.com/coldfix/udiskie/wiki/Permissions
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 2ba7f125..4ae816d5 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -36,7 +36,7 @@ in
       user = mainUser;
     };
   };
-  environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
+  environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
   # lid switch is handled via button presses
   services.logind.lidSwitch = lib.mkDefault "ignore";
   makefu.awesome.enable = true;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 55df2364..c67aa7cf 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -23,8 +23,8 @@
     displayManager.defaultSession = "gnome";
     desktopManager.gnome.enable = true;
     displayManager.sessionCommands = ''
-        ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
-        ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
+        ${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms
+        ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
       '';
     # xrandrHeads = [ "HDMI1" "HDMI2" ];
     # prevent screen from turning off, disable dpms
@@ -38,7 +38,7 @@
     after = [ "display-manager.service" ];
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
-      ExecStart = "${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms";
+      ExecStart = "${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms";
       RemainAfterExit = "yes";
       TimeoutSec = "5s";
       RestartSec="5s";