1 files changed, 46 insertions, 12 deletions
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 5f977251f..4e5558a1f 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -1,23 +1,57 @@
 { config, lib, pkgs, ... }:
-
+##
+# of course this name is a lie - it prepares a GUI environment close to my
+# current configuration.
+#
+# autologin with mainUser into awesome
+##
+#
 with lib;
+let
+  mainUser = config.krebs.build.user.name;
+in
 {
   imports = [ ];
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
+  services.xserver = {
+    enable = true;
+    layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "ctrl:nocaps";
+
+    windowManager = {
+      awesome.enable = true;
+      awesome.luaModules = [ pkgs.luaPackages.vicious ];
+      default = "awesome";
+    };
+
+    displayManager.auto.enable = true;
+    displayManager.auto.user = mainUser;
+    desktopManager.xterm.enable = false;
+  };
+
+## FONTS
+# TODO: somewhere else?
 
-# use awesome, direct boot into
-  services.xserver.displayManager.auto.enable =true;
-  services.xserver.displayManager.auto.user =config.krebs.users.makefu;
-  services.xserver.windowManager.awesome.enable = true;
+  i18n.consoleFont = "Lat2-Terminus16";
 
-  security.setuidPrograms = [ "slock" ];
+  fonts = {
+    enableCoreFonts = true;
+    enableFontDir = true;
+    enableGhostscriptFonts = false;
+    fonts = [ pkgs.terminus_font ];
+  };
 
-# use pulseaudio
-  environment.systemPackages = [ pkgs.slock ];
+  environment.systemPackages = with pkgs;[
+    xlockmore
+    rxvt_unicode-with-plugins
+    vlc
+    firefox
+    chromium
+  ];
+  # TODO: use mainUser
+  users.extraUsers.makefu.extraGroups = [ "audio" ];
   hardware.pulseaudio = {
     enable = true;
-    systemWide = true;
+  #  systemWide = true;
   };
-
 }