From 7e77e6a637bba4a6efd4d046d68d477f6c19fe96 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
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/base.nix')

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 5b46c7e2d..854fbfa52 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 525f575f42934ec6f5d734731e19fbd5f1cdff23 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 10:31:29 +0200
Subject: ma gui: update with refactored xserver options

---
 makefu/2configs/gui/base.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'makefu/2configs/gui/base.nix')

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;
-- 
cgit v1.2.3


From aeb7d5e972cd69f4de9c20bcbd0e1d91312b74b6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
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/base.nix')

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 8aee1bdc3..9c1d560a0 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