summaryrefslogtreecommitdiffstats
path: root/tv/2configs/xserver/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-11-28 18:55:08 +0100
committerlassulus <lassulus@lassul.us>2018-11-28 18:55:08 +0100
commita69175a719b34222c8fb734478f04190a50d70e8 (patch)
tree765b2521aab1ab789ff56ce1550c7dcce881b3ac /tv/2configs/xserver/default.nix
parentf69a078f90d3cddfd5d3146ce39fbd294a14fb57 (diff)
parentd1f81ace7241cf751f8a02c102b02bc1c8ad6c07 (diff)
Merge remote-tracking branch 'ni/master' into ci
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r--tv/2configs/xserver/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index dbfa804d2..199ffcaf8 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -63,6 +63,11 @@ in {
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
+ FZMENU_FZF_DEFAULT_OPTS = toString [
+ "--color=dark,border:126,bg+:090"
+ "--inline-info"
+ ];
+
XMONAD_CACHE_DIR = cfg.cacheDir;
XMONAD_CONFIG_DIR = cfg.configDir;
XMONAD_DATA_DIR = cfg.dataDir;
@@ -95,8 +100,8 @@ in {
"\${XMONAD_CONFIG_DIR}"
"\${XMONAD_DATA_DIR}"
]}";
- ExecStart = "${pkgs.xmonad-tv}/bin/xmonad";
- ExecStop = "${pkgs.xmonad-tv}/bin/xmonad --shutdown";
+ ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem}";
+ ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem} --shutdown $MAINPID";
User = cfg.user.name;
WorkingDirectory = cfg.user.home;
};