summaryrefslogtreecommitdiffstats
path: root/lass/2configs/baseX.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-03-13 18:52:07 +0100
committerjeschli <jeschli@gmail.com>2018-03-13 18:55:44 +0100
commit6267aa42509a4f56dc95dfc2db7773c33ca12522 (patch)
tree3d9bcb9e7424ebdd04bf8ddcaf96f11626ea351b /lass/2configs/baseX.nix
parente7ac3fc703929cd503bc6a01cad449a5b2c328f2 (diff)
parent02f67eed443ba552d775d1a0ab7860d439f7552b (diff)
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r--lass/2configs/baseX.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 2b7a5c924..ed179ded6 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -2,6 +2,7 @@
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
@@ -84,7 +85,6 @@ in {
powertop
push
rxvt_unicode_with-plugins
- screengrab
slock
sxiv
timewarrior
@@ -99,6 +99,7 @@ in {
zathura
cabal2nix
+ xephyrify
];
fonts.fonts = with pkgs; [
@@ -129,7 +130,6 @@ in {
};
systemd.user.services.xmonad = {
- #wantedBy = [ "graphical-session.target" ];
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
RXVT_SOCKET = "%t/urxvtd-socket";
@@ -137,8 +137,8 @@ in {
};
serviceConfig = {
SyslogIdentifier = "xmonad";
- ExecStart = "${pkgs.xmonad-lass}/bin/xmonad";
- ExecStop = "${pkgs.xmonad-lass}/bin/xmonad --shutdown";
+ ExecStart = "${xmonad-lass}/bin/xmonad";
+ ExecStop = "${xmonad-lass}/bin/xmonad --shutdown";
};
restartIfChanged = false;
};