summaryrefslogtreecommitdiffstats
path: root/lass/2configs/baseX.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2021-07-29 13:27:27 +0200
committertv <tv@krebsco.de>2021-07-29 13:27:27 +0200
commitdfc3a69a141927a2ef9a13129496d1a84de8efeb (patch)
tree54e24720d18bfccbb638e10ab8076a5b9763addf /lass/2configs/baseX.nix
parent34c7d727afd14a82330dd6e53dee3591f01a5462 (diff)
parent1380200b30f2fd1dfce55a2ba28dc256fef951c6 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r--lass/2configs/baseX.nix27
1 files changed, 5 insertions, 22 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index e92ddbcca..655e7912f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -2,7 +2,6 @@
with import <stockholm/lib>;
let
user = config.krebs.build.user;
- xmonad-lass = pkgs.callPackage <stockholm/lass/5pkgs/custom/xmonad-lass> { inherit config; };
in {
imports = [
./mpv.nix
@@ -19,6 +18,7 @@ in {
security.rtkit.enable = true;
sound.enableOSSEmulation = false;
}
+ ./xmonad.nix
{
krebs.per-user.lass.packages = [
pkgs.sshuttle
@@ -120,30 +120,13 @@ in {
xkbVariant = "altgr-intl";
xkbOptions = "caps:escape";
libinput.enable = true;
- displayManager.lightdm.enable = true;
- displayManager.defaultSession = "none+xmonad";
- windowManager.session = [{
- name = "xmonad";
- start = ''
+ displayManager = {
+ lightdm.enable = true;
+ defaultSession = "none+xmonad";
+ sessionCommands = ''
${pkgs.xorg.xhost}/bin/xhost +LOCAL:
- ${pkgs.systemd}/bin/systemctl --user start xmonad
- exec ${pkgs.coreutils}/bin/sleep infinity
'';
- }];
- };
-
- systemd.user.services.xmonad = {
- environment = {
- DISPLAY = ":${toString config.services.xserver.display}";
- RXVT_SOCKET = "%t/urxvtd-socket";
- XMONAD_DATA_DIR = "/tmp";
- };
- serviceConfig = {
- SyslogIdentifier = "xmonad";
- ExecStart = "${xmonad-lass}/bin/xmonad";
- ExecStop = "${xmonad-lass}/bin/xmonad --shutdown";
};
- restartIfChanged = false;
};
nixpkgs.config.packageOverrides = super: {