From 7e77e6a637bba4a6efd4d046d68d477f6c19fe96 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 21 Apr 2020 21:33:55 +0200 Subject: ma gui/base: use lightdm, enable corefonts via fonts.fonts --- makefu/2configs/gui/base.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 5b46c7e2..854fbfa5 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -32,8 +32,11 @@ in default = "awesome"; }; - displayManager.auto.enable = true; - displayManager.auto.user = mainUser; + displayManager.lightdm = { + enable = true; + autoLogin.enable = true; + autoLogin.user = mainUser; + }; desktopManager.xterm.enable = false; }; environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ]; @@ -43,10 +46,9 @@ in i18n.consoleFont = "Lat2-Terminus16"; fonts = { - enableCoreFonts = true; enableFontDir = true; enableGhostscriptFonts = true; - fonts = [ pkgs.terminus_font ]; + fonts = [ pkgs.terminus_font pkgs.corefonts ]; }; users.users.${mainUser} = { -- cgit v1.2.3 From 95aff447719270f0816ac6d2db3a003c585ac0a4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 08:11:00 +0200 Subject: ma urxvtd: rxvt_unicode_with-plugins -> rxvt_unicode-with-plugins --- makefu/2configs/gui/urxvtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/urxvtd.nix b/makefu/2configs/gui/urxvtd.nix index 286b87ab..cb6c2584 100644 --- a/makefu/2configs/gui/urxvtd.nix +++ b/makefu/2configs/gui/urxvtd.nix @@ -10,7 +10,7 @@ in { serviceConfig = { SyslogIdentifier = "urxvtd"; ExecReload = "${pkgs.coreutils}/bin/echo NOP"; - ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd"; + ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd"; Restart = "always"; RestartSec = "2s"; StartLimitBurst = 0; -- cgit v1.2.3 From 2a84f65e4acb0c389136dd29f706696c5e4ba6e0 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 08:44:48 +0200 Subject: ma wbob-kiosk: set default session to xfce --- makefu/2configs/gui/wbob-kiosk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix index 6da1a37e..5d409b8d 100644 --- a/makefu/2configs/gui/wbob-kiosk.nix +++ b/makefu/2configs/gui/wbob-kiosk.nix @@ -12,7 +12,7 @@ windowManager = lib.mkForce { awesome.enable = false; - default = "none"; + default = "xfce"; }; desktopManager.xfce = { extraSessionCommands = '' -- cgit v1.2.3 From 525f575f42934ec6f5d734731e19fbd5f1cdff23 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 23 Apr 2020 10:31:29 +0200 Subject: ma gui: update with refactored xserver options --- makefu/2configs/gui/base.nix | 11 +++-------- makefu/2configs/gui/wbob-kiosk.nix | 9 ++++----- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 854fbfa5..8aee1bdc 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 5d409b8d..1a5e6d04 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 }; -- cgit v1.2.3 From aeb7d5e972cd69f4de9c20bcbd0e1d91312b74b6 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 23 Apr 2020 15:36:05 +0200 Subject: ma gui/base: awesome -> none+awesome --- makefu/2configs/gui/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 8aee1bdc..9c1d560a 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -30,7 +30,7 @@ in awesome.noArgb = true; awesome.luaModules = [ pkgs.luaPackages.vicious ]; }; - displayManager.defaultSession = lib.mkDefault "awesome"; + displayManager.defaultSession = lib.mkDefault "none+awesome"; displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; }; desktopManager.xterm.enable = false; }; -- cgit v1.2.3