summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/gui
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-06-10 21:37:49 +0200
committermakefu <github@syntax-fehler.de>2022-06-10 21:39:00 +0200
commit99ea11ac5ef62994a33616927d651c7a3b26f918 (patch)
treeb5b2bbcf66ec7deb1671b4bd533ade1e2ebe48bf /makefu/2configs/gui
parent301c1332209e2834242481b4c095f5771bb88ed6 (diff)
ma: fix 22.05 evaluation errors
Diffstat (limited to 'makefu/2configs/gui')
-rw-r--r--makefu/2configs/gui/automatic-diskmount.nix1
-rw-r--r--makefu/2configs/gui/base.nix2
-rw-r--r--makefu/2configs/gui/wbob-kiosk.nix6
3 files changed, 4 insertions, 5 deletions
diff --git a/makefu/2configs/gui/automatic-diskmount.nix b/makefu/2configs/gui/automatic-diskmount.nix
index 19933111a..ad3774be8 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 2ba7f125c..4ae816d5f 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 55df23640..c67aa7cfb 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";