Merge remote-tracking branch 'gum/20.03'

3 files changed, 8 insertions, 14 deletions

diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index 753fc963b..1cfda6fc5 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -15,7 +15,7 @@ with lib;
 
 let
   # TODO: copy-paste from lass/2/websites/util.nix
-  nextcloud = nextcloud18;
+  nextcloud = pkgs.nextcloud18;
   serveCloud = domains:
     let
       domain = head domains;
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 854fbfa52..8aee1bdc3 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -29,21 +29,16 @@ in
       awesome.enable = true;
       awesome.noArgb = true;
       awesome.luaModules = [ pkgs.luaPackages.vicious ];
-      default = "awesome";
-    };
-
-    displayManager.lightdm = {
-      enable = true;
-      autoLogin.enable = true;
-      autoLogin.user = mainUser;
     };
+    displayManager.defaultSession = lib.mkDefault "awesome";
+    displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; };
     desktopManager.xterm.enable = false;
   };
   environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
   # lid switch is handled via button presses
   services.logind.lidSwitch = lib.mkDefault "ignore";
   makefu.awesome.enable = true;
-  i18n.consoleFont = "Lat2-Terminus16";
+  console.font = "Lat2-Terminus16";
 
   fonts = {
     enableFontDir = true;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 5d409b8df..1a5e6d04f 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -12,16 +12,15 @@
 
     windowManager = lib.mkForce {
       awesome.enable = false;
-      default = "xfce";
     };
     desktopManager.xfce = {
-      extraSessionCommands = ''
+      enable = true;
+    };
+    displayManager.defaultSession = "xfce";
+    displayManager.sessionCommands = ''
         ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
         ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
       '';
-      enable = true;
-    };
-
     # xrandrHeads = [ "HDMI1" "HDMI2" ];
     # prevent screen from turning off, disable dpms
   };