From e48a8c8beacbdd51580839b362b4bd90ce264277 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 25 Apr 2019 03:32:35 +0200 Subject: tv xmonad: Type = notify --- tv/2configs/xserver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 012caff7..35774453 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"; }; }; -- cgit v1.2.3 From 1b17a8dd03c57c2b02263c2ec471fe2ef61312e8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 25 Apr 2019 03:33:18 +0200 Subject: tv Xresources: start after xmonad --- tv/3modules/Xresources.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix index 983b8bc2..ce7ac9ac 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}"; }; -- cgit v1.2.3 From 2124814a04c4052f73c935927931c85812421c43 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 28 Apr 2019 14:35:10 +0200 Subject: krops: 1.11.1 -> 1.14.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 5b8fb8dc..ee41207d 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 5b8fb8dc0ee14672d7fd533bd98635b8725dbb29 +Subproject commit ee41207df1ce718e0b154ed8047384118a0133a4 -- cgit v1.2.3 From c7d02cb595f59fd6f4cd471eb44aa3e1b2c13dd7 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 20:25:53 +0200 Subject: ssh-audit: init at 1.7.0 --- krebs/5pkgs/simple/ssh-audit.nix | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 krebs/5pkgs/simple/ssh-audit.nix diff --git a/krebs/5pkgs/simple/ssh-audit.nix b/krebs/5pkgs/simple/ssh-audit.nix new file mode 100644 index 00000000..7d2e6fb3 --- /dev/null +++ b/krebs/5pkgs/simple/ssh-audit.nix @@ -0,0 +1,55 @@ +{ fetchFromGitHub, python3Packages, stdenv }: + +python3Packages.buildPythonPackage rec { + inherit (meta) version; + + pname = "ssh-audit"; + + src = fetchFromGitHub { + owner = "arthepsy"; + repo = pname; + rev = "refs/tags/v${meta.version}"; + sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms"; + }; + + checkInputs = [ + python3Packages.pytest + python3Packages.pytestcov + ]; + + checkPhase = '' + py.test --cov-report= --cov=ssh-audit -v test + ''; + + postPatch = '' + printf %s "$setupPy" > setup.py + mkdir scripts + cp ssh-audit.py scripts/ssh-audit + mkdir ssh-audit + cp ssh-audit.py ssh-audit/__init__.py + ''; + + setupPy = /* py */ '' + from distutils.core import setup + setup( + author='arthepsy', + description='${meta.description}', + license='${meta.license.spdxId}', + name='${pname}', + packages=['ssh-audit'], + scripts=['scripts/ssh-audit'], + url='${meta.homepage}', + version='${version}', + ) + ''; + + meta = { + description = "tool for ssh server auditing"; + homepage = "https://github.com/arthepsy/ssh-audit"; + license = stdenv.lib.licenses.mit; + maintainers = [ + stdenv.lib.maintainers.tv + ]; + version = "1.7.0"; + }; +} -- cgit v1.2.3 From 451b61ef0da49e12cb514e4f565b69b4bf343152 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 20:30:01 +0200 Subject: tv urlwatch: add ssh-audit --- tv/2configs/urlwatch.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 7467e8e6..40dc7d23 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -42,6 +42,9 @@ in { # ref , services.openssh.knownHosts.github* (json https://api.github.com/meta) + # ref + (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) -- cgit v1.2.3 From df6007c2eb3c6fab9106c3fc591fded7221b1708 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 21:50:07 +0200 Subject: treewide: nixpkgsVersion -> version --- krebs/5pkgs/haskell/blessings.nix | 2 +- krebs/5pkgs/haskell/email-header.nix | 2 +- tv/5pkgs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix index c35706eb..7abebba5 100644 --- a/krebs/5pkgs/haskell/blessings.nix +++ b/krebs/5pkgs/haskell/blessings.nix @@ -14,7 +14,7 @@ with import ; version = "2.2.0"; sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; }; - }.${versions.majorMinor nixpkgsVersion}; + }.${versions.majorMinor version}; in mkDerivation { pname = "blessings"; diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index 6689f1d2..fe4bb839 100644 --- a/krebs/5pkgs/haskell/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix @@ -20,7 +20,7 @@ with import ; rev = "refs/tags/v${cfg.version}"; sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x"; }; - }.${versions.majorMinor nixpkgsVersion}; + }.${versions.majorMinor version}; in mkDerivation { pname = "email-header"; diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 8f960dd7..2f6b67e7 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 ]); -- cgit v1.2.3