From 1db8413f48bea139e044f5fff76de9e33c4064c3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 16 Jul 2021 21:48:21 +0200 Subject: l: use upstream xmonad config --- lass/2configs/baseX.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'lass/2configs/baseX.nix') 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 ; let user = config.krebs.build.user; - xmonad-lass = pkgs.callPackage { 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: { -- cgit v1.2.3