summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-01-29 19:28:21 +0100
committerjeschli <jeschli@gmail.com>2019-01-29 19:28:21 +0100
commit423e2fd2d90eb89dd1a26b6a08deb79836c1d34c (patch)
tree7f27a0c34c9a6596e156e1b988a29a4f99a6f5f3
parent924c8fb748a92720c75750cee528ac2f4b7c5c8e (diff)
j brauerei: add jeschli-xmonad and option to choose gnome3, xfce. +emacs as service
-rw-r--r--jeschli/1systems/brauerei/config.nix32
1 files changed, 18 insertions, 14 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 6ef52e2ff..6b1e9edaa 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