j brauerei: add jeschli-xmonad and option to choose gnome3, xfce. +emacs as service

1 files changed, 18 insertions, 14 deletions

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 6ef52e2f..6b1e9eda 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }:
+let
+  xmonad-jeschli = pkgs.callPackage <stockholm/jeschli/5pkgs/simple/xmonad-jeschli> { inherit config; };
+in
 {
   imports = [
     <stockholm/jeschli>
     ./hardware-configuration.nix
     <stockholm/jeschli/2configs/urxvt.nix>
-    <stockholm/jeschli/2configs/emacs.nix>
-    <stockholm/jeschli/2configs/xdg.nix>
-    <stockholm/jeschli/2configs/xserver>
     <stockholm/jeschli/2configs/steam.nix>
     <stockholm/jeschli/2configs/virtualbox.nix>
   ];
@@ -126,25 +126,29 @@
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
+  services.emacs.enable = true;
 
   virtualisation.docker.enable = true;
 
   services.xserver = {
-    desktopManager.session = lib.mkForce [];
-    displayManager.lightdm.enable = lib.mkForce false;
-    displayManager.job.execCmd = lib.mkForce "derp";
-
     enable = true;
-    display = lib.mkForce 11;
-    tty = lib.mkForce 11;
 
-    dpi = 144;
+    desktopManager = {
+      xfce.enable = true;
+      gnome3.enable = true;
+    };
 
-    synaptics = {
-      enable = true;
-      twoFingerScroll = true;
-      accelFactor = "0.035";
+    windowManager = {
+      session = [{
+        name = "xmonad";
+        start = ''
+          ${xmonad-jeschli}/bin/xmonad &
+          waitPID=$!
+        '';
+        }
+      ];
     };
+
   };
 
   users.extraUsers.jeschli = { # TODO: define as krebs.users