summaryrefslogtreecommitdiffstats
path: root/tv/2configs/xserver/default.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-04-28 15:05:34 +0200
committerjeschli <jeschli@gmail.com>2019-04-28 15:05:34 +0200
commite45b3492b3961685936378a160adb225789e51d9 (patch)
treecc0480e485ab78d1f52f80ec36987b9a57e925f7 /tv/2configs/xserver/default.nix
parent97d4f9a771a9bbb1b45085569028db2d7dfbd610 (diff)
parent915e4b843790d3e71bdccea124d4832ca042e456 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r--tv/2configs/xserver/default.nix20
1 files changed, 5 insertions, 15 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 051e12ef0..012caff73 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -9,12 +9,16 @@ let
};
in {
+ imports = [
+ ./sxiv.nix
+ ./urxvt.nix
+ ];
+
environment.systemPackages = [
pkgs.ff
pkgs.font-size
pkgs.gitAndTools.qgit
pkgs.mpv
- pkgs.sxiv
pkgs.xdotool
pkgs.xsel
pkgs.zathura
@@ -73,7 +77,6 @@ in {
${pkgs.xorg.xhost}/bin/xhost -LOCAL:
} &
${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
- ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
wait
'';
@@ -147,19 +150,6 @@ in {
};
};
- systemd.services.urxvtd = {
- wantedBy = [ "graphical.target" ];
- restartIfChanged = false;
- serviceConfig = {
- SyslogIdentifier = "urxvtd";
- ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
- Restart = "always";
- RestartSec = "2s";
- StartLimitBurst = 0;
- User = cfg.user.name;
- };
- };
-
tv.slock = {
enable = true;
user = cfg.user;