diff options
| author | jeschli <jeschli@gmail.com> | 2019-05-14 19:02:02 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-05-14 19:02:02 +0200 |
| commit | e869a8a82ad32aacf235b846c4d14a1791745c56 (patch) | |
| tree | 1ff8687992a78a39513acd1c6da13adc794d0abc /tv | |
| parent | 3899d0195c6077174e2d416c490dfae8783acee5 (diff) | |
| parent | e9f96d7757f48000c6c4a4c1317bf4debab16a27 (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/urlwatch.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/xserver/default.nix | 4 | ||||
| -rw-r--r-- | tv/3modules/Xresources.nix | 3 | ||||
| -rw-r--r-- | tv/5pkgs/default.nix | 2 |
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 ]); |