2015-10-24 20:31:10 +00:00
|
|
|
{ config, lib, pkgs, ... }@args:
|
|
|
|
|
|
|
|
with lib;
|
|
|
|
|
|
|
|
let
|
|
|
|
# TODO krebs.build.user
|
|
|
|
user = config.users.users.tv;
|
|
|
|
|
|
|
|
out = {
|
|
|
|
services.xserver.display = 11;
|
|
|
|
services.xserver.tty = 11;
|
|
|
|
|
|
|
|
services.xserver.synaptics = {
|
|
|
|
enable = true;
|
|
|
|
twoFingerScroll = true;
|
|
|
|
accelFactor = "0.035";
|
|
|
|
};
|
|
|
|
|
|
|
|
fonts.fonts = [
|
|
|
|
pkgs.xlibs.fontschumachermisc
|
|
|
|
];
|
|
|
|
|
|
|
|
systemd.services.urxvtd = {
|
|
|
|
wantedBy = [ "multi-user.target" ];
|
|
|
|
reloadIfChanged = true;
|
|
|
|
serviceConfig = {
|
|
|
|
ExecReload = need-reload "urxvtd.service";
|
|
|
|
ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
|
|
|
|
Restart = "always";
|
|
|
|
RestartSec = "2s";
|
|
|
|
StartLimitBurst = 0;
|
|
|
|
User = user.name;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
environment.systemPackages = [
|
2015-11-07 09:04:46 +00:00
|
|
|
pkgs.ff
|
|
|
|
pkgs.gitAndTools.qgit
|
|
|
|
pkgs.mpv
|
|
|
|
pkgs.pavucontrol
|
2015-10-24 20:31:10 +00:00
|
|
|
pkgs.slock
|
2015-11-07 09:04:46 +00:00
|
|
|
pkgs.sxiv
|
2015-11-07 18:24:25 +00:00
|
|
|
pkgs.xsel
|
2015-11-07 09:04:46 +00:00
|
|
|
pkgs.zathura
|
2015-10-24 20:31:10 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
security.setuidPrograms = [
|
|
|
|
"slock"
|
|
|
|
];
|
|
|
|
|
|
|
|
systemd.services.display-manager = mkForce {};
|
|
|
|
|
|
|
|
services.xserver.enable = true;
|
2015-10-25 01:06:37 +00:00
|
|
|
|
2015-10-24 20:31:10 +00:00
|
|
|
systemd.services.xmonad = {
|
|
|
|
wantedBy = [ "multi-user.target" ];
|
|
|
|
requires = [ "xserver.service" ];
|
2015-10-25 01:06:37 +00:00
|
|
|
environment = xmonad-environment;
|
2015-10-24 20:31:10 +00:00
|
|
|
serviceConfig = {
|
2015-10-25 01:06:37 +00:00
|
|
|
ExecStart = "${xmonad-start}/bin/xmonad";
|
|
|
|
ExecStop = "${xmonad-stop}/bin/xmonad-stop";
|
2015-10-24 20:31:10 +00:00
|
|
|
User = user.name;
|
|
|
|
WorkingDirectory = user.home;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
systemd.services.xserver = {
|
|
|
|
after = [
|
|
|
|
"systemd-udev-settle.service"
|
|
|
|
"local-fs.target"
|
|
|
|
"acpid.service"
|
|
|
|
];
|
|
|
|
reloadIfChanged = true;
|
|
|
|
environment = xserver-environment;
|
|
|
|
serviceConfig = {
|
|
|
|
ExecReload = need-reload "xserver.service";
|
|
|
|
ExecStart = "${xserver}/bin/xserver";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2015-10-25 01:06:37 +00:00
|
|
|
xmonad-environment = {
|
|
|
|
DISPLAY = ":${toString config.services.xserver.display}";
|
|
|
|
XMONAD_STATE = "/tmp/xmonad.state";
|
2015-10-25 11:21:46 +00:00
|
|
|
|
|
|
|
# XXX JSON is close enough :)
|
|
|
|
XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
|
|
|
|
"Dashboard" # we start here
|
|
|
|
"23"
|
|
|
|
"cr"
|
|
|
|
"ff"
|
|
|
|
"hack"
|
|
|
|
"im"
|
|
|
|
"mail"
|
|
|
|
"stockholm"
|
2015-10-26 10:27:24 +00:00
|
|
|
"za" "zh" "zj" "zs"
|
2015-10-25 11:21:46 +00:00
|
|
|
]);
|
2015-10-25 01:06:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
xmonad-start = pkgs.writeScriptBin "xmonad" ''
|
|
|
|
#! ${pkgs.bash}/bin/bash
|
2015-10-24 20:31:10 +00:00
|
|
|
set -efu
|
|
|
|
export PATH; PATH=${makeSearchPath "bin" [
|
|
|
|
pkgs.rxvt_unicode
|
2015-10-24 20:36:24 +00:00
|
|
|
]}:/var/setuid-wrappers
|
2015-10-24 20:31:10 +00:00
|
|
|
settle() {(
|
|
|
|
# Use PATH for a clean journal
|
|
|
|
command=''${1##*/}
|
|
|
|
PATH=''${1%/*}; export PATH
|
|
|
|
shift
|
|
|
|
until "$command" "$@"; do
|
|
|
|
${pkgs.coreutils}/bin/sleep 1
|
|
|
|
done
|
|
|
|
)&}
|
|
|
|
settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
|
|
|
|
settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args}
|
|
|
|
settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c'
|
2015-10-29 00:49:27 +00:00
|
|
|
exec ${pkgs.xmonad-tv}/bin/xmonad
|
2015-10-25 01:06:37 +00:00
|
|
|
'';
|
|
|
|
|
|
|
|
xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
|
|
|
|
#! /bin/sh
|
2015-10-29 00:49:27 +00:00
|
|
|
exec ${pkgs.xmonad-tv}/bin/xmonad --shutdown
|
2015-10-24 20:31:10 +00:00
|
|
|
'';
|
|
|
|
|
|
|
|
xserver-environment = {
|
|
|
|
XKB_BINDIR = "${pkgs.xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
|
|
|
|
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
|
|
|
|
LD_LIBRARY_PATH = concatStringsSep ":" (
|
|
|
|
[ "${pkgs.xorg.libX11}/lib" "${pkgs.xorg.libXext}/lib" ]
|
|
|
|
++ concatLists (catAttrs "libPath" config.services.xserver.drivers));
|
|
|
|
};
|
2015-10-25 01:06:37 +00:00
|
|
|
|
2015-10-24 20:31:10 +00:00
|
|
|
xserver = pkgs.writeScriptBin "xserver" ''
|
|
|
|
#! /bin/sh
|
|
|
|
set -efu
|
|
|
|
exec ${pkgs.xorg.xorgserver}/bin/X \
|
|
|
|
:${toString config.services.xserver.display} \
|
|
|
|
vt${toString config.services.xserver.tty} \
|
|
|
|
-config ${import ./xserver.conf.nix args} \
|
|
|
|
-logfile /var/log/X.${toString config.services.xserver.display}.log \
|
|
|
|
-nolisten tcp \
|
|
|
|
-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb \
|
|
|
|
'';
|
|
|
|
|
|
|
|
need-reload = s: let
|
|
|
|
pkg = pkgs.writeScriptBin "need-reload" ''
|
|
|
|
#! /bin/sh
|
|
|
|
echo "$*"
|
|
|
|
'';
|
|
|
|
in "${pkg}/bin/need-reload ${s}";
|
|
|
|
|
|
|
|
in out
|