summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-05-28 09:12:57 +0200
committermakefu <github@syntax-fehler.de>2019-05-28 09:12:57 +0200
commit952aeb6c14ecee07b65c7afdf65992216055c9d6 (patch)
tree038079c0d476286358f9a5f3ebaee60f6b49ebf5 /tv
parentf541eae020a229b99afe531139be246f8aecb695 (diff)
parentbe12b8a41370f50b413376717a5db38edfebd828 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/urlwatch.nix3
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/3modules/Xresources.nix3
-rw-r--r--tv/5pkgs/default.nix2
4 files changed, 9 insertions, 3 deletions
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 7467e8e67..40dc7d237 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -42,6 +42,9 @@ in {
# ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github*
(json https://api.github.com/meta)
+ # ref <nixpkgs/pkgs/tools/security/ssh-audit>
+ (json https://api.github.com/repos/arthepsy/ssh-audit/tags)
+
# 2014-12-20 ref src/nixpkgs/pkgs/tools/networking/tlsdate/default.nix
(json https://api.github.com/repos/ioerror/tlsdate/tags)
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 012caff73..357744533 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -72,6 +72,7 @@ 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:
@@ -119,6 +120,9 @@ in {
SyslogIdentifier = "xmonad";
User = cfg.user.name;
WorkingDirectory = cfg.user.home;
+
+ NotifyAccess = "all";
+ Type = "notify";
};
};
diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix
index 983b8bc2e..ce7ac9ac2 100644
--- a/tv/3modules/Xresources.nix
+++ b/tv/3modules/Xresources.nix
@@ -21,8 +21,7 @@ in {
});
systemd.services.${if cfg.enable then "Xresources" else null} = {
wantedBy = [ "graphical.target" ];
- after = [ "xserver.service" ];
- requires = [ "xserver.service" ];
+ after = [ "xmonad.service" ];
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
};
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 8f960dd79..2f6b67e73 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -45,7 +45,7 @@ foldl' mergeAttrs {}
self.callPackage ./compat/18.03/pass {
pass-otp = self.callPackage ./compat/18.03/pass-otp {};
};
- }.${versions.majorMinor nixpkgsVersion} or
+ }.${versions.majorMinor version} or
super.pass.withExtensions (ext: [
ext.pass-otp
]);