summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-04-23 15:34:00 +0200
committerlassulus <lassulus@lassul.us>2020-04-23 15:34:00 +0200
commit0fbf9144d4bf93840faa49c7743e3273337bed0f (patch)
tree69097d6c7277925e7dac5023dec2ebd85a2ee49f /makefu/2configs
parent702e55e38c0a34a63e381069c7492efeffef1509 (diff)
parent525f575f42934ec6f5d734731e19fbd5f1cdff23 (diff)
Merge remote-tracking branch 'gum/20.03'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/deployment/owncloud.nix2
-rw-r--r--makefu/2configs/gui/base.nix11
-rw-r--r--makefu/2configs/gui/wbob-kiosk.nix9
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
};