summaryrefslogtreecommitdiffstats
path: root/tv/2configs/xserver/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r--tv/2configs/xserver/default.nix24
1 files changed, 9 insertions, 15 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 051e12ef0..357744533 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
@@ -68,12 +72,12 @@ in {
exec ${xmonad}
'';
xmonad-ready = pkgs.writeDash "xmonad-ready" ''
+ ${pkgs.systemd}/bin/systemd-notify --ready
{
${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
${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
'';
@@ -116,6 +120,9 @@ in {
SyslogIdentifier = "xmonad";
User = cfg.user.name;
WorkingDirectory = cfg.user.home;
+
+ NotifyAccess = "all";
+ Type = "notify";
};
};
@@ -147,19 +154,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;