diff options
| author | lassulus <lassulus@lassul.us> | 2018-11-28 18:55:08 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-11-28 18:55:08 +0100 |
| commit | 35ac49f0bb4c49cd6365c12207e38e91f4a74db6 (patch) | |
| tree | 3d4c2548e1a5a97f2572431b53bc28f8f22c6d99 /tv/2configs/xserver | |
| parent | 81aeaeb52f0a9e155b2f6ddab5c2e4312bcd807d (diff) | |
| parent | 066140ec0e24bd0f58931c7abe268bdb91181038 (diff) | |
Merge remote-tracking branch 'ni/master' into ci
Diffstat (limited to 'tv/2configs/xserver')
| -rw-r--r-- | tv/2configs/xserver/Xresources.nix | 5 | ||||
| -rw-r--r-- | tv/2configs/xserver/default.nix | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix index 1d40444..d032efc 100644 --- a/tv/2configs/xserver/Xresources.nix +++ b/tv/2configs/xserver/Xresources.nix @@ -50,4 +50,9 @@ pkgs.writeText "Xresources" /* xdefaults */ '' root-urxvt*foreground: #e0c0c0 root-urxvt*BorderColor: #400000 root-urxvt*color0: #800000 + + fzmenu-urxvt*background: rgb:42/23/42 + fzmenu-urxvt*externalBorder: 1 + fzmenu-urxvt*geometry: 70x9 + fzmenu-urxvt*internalBorder: 1 '' diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index dbfa804..199ffca 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; }; |