diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index e2160258c..95198ff9e 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -10,7 +10,7 @@ let in { imports = [ - ./Xresources.nix + ./urxvt.nix ]; environment.systemPackages = [ @@ -150,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; diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/urxvt.nix similarity index 80% rename from tv/2configs/xserver/Xresources.nix rename to tv/2configs/xserver/urxvt.nix index b6c43b71b..2d504e165 100644 --- a/tv/2configs/xserver/Xresources.nix +++ b/tv/2configs/xserver/urxvt.nix @@ -1,6 +1,19 @@ with import ; -{ config, pkgs, ... }: { - +{ config, pkgs, ... }: let + cfg.user = config.krebs.build.user; +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.Xresources = { "URxvt*cutchars" = ''"\\`\"'&()*,;<=>?@[]^{|}‘’"''; "URxvt*eightBitInput" = "false"; @@ -40,7 +53,7 @@ with import ; "URxvt*perl-ext" = "default,url-select"; "URxvt*keysym.M-u" = "perl:url-select:select_next"; "URxvt*url-select.launcher" = - "/etc/profiles/per-user/${config.krebs.build.user.name}/bin/ff -new-tab"; + "/etc/profiles/per-user/${cfg.user.name}/bin/ff -new-tab"; "URxvt*url-select.underline" = "true"; "URxvt*colorUL" = "#4682B4"; "URxvt.perl-lib" = "${pkgs.urxvt_perls}/lib/urxvt/perl"; @@ -57,5 +70,4 @@ with import ; "fzmenu-urxvt*geometry" = "70x9"; "fzmenu-urxvt*internalBorder" = "1"; }; - }