From 6c826001614f78bac48d751a1c03c62bb98b8f05 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 18 Mar 2022 16:01:57 +0100 Subject: git-hooks irc-announce: add verbose blacklist --- krebs/5pkgs/simple/git-hooks/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix index c9dcc7541..13fe7aa67 100644 --- a/krebs/5pkgs/simple/git-hooks/default.nix +++ b/krebs/5pkgs/simple/git-hooks/default.nix @@ -96,7 +96,12 @@ with stockholm.lib; #$host $GIT_SSH_REPO $ref $link add_message $(pink push) $link $(gray "($receive_mode)") - ${optionalString verbose /* sh */ '' + ${optionalString (verbose == false || typeOf verbose == "set") /* sh */ '' + ${optionalString (verbose.exclude or [] != []) /* sh */ '' + case $ref in (${concatStringsSep "|" verbose.exclude}) + continue + esac + ''} add_message "$( git log \ --format="$(orange %h) %s $(gray '(%ar)')" \ -- cgit v1.2.3 From 1fc622cd0835882d4d565f216af72e2881815b7b Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 22 Mar 2022 19:34:57 +0100 Subject: qrscan: use new one shot scanning mode --- krebs/5pkgs/simple/qrscan.nix | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/simple/qrscan.nix b/krebs/5pkgs/simple/qrscan.nix index 7d99dcee7..df9a98053 100644 --- a/krebs/5pkgs/simple/qrscan.nix +++ b/krebs/5pkgs/simple/qrscan.nix @@ -1,27 +1,7 @@ -{ coreutils, gnused, writeDashBin, zbar }: +{ pkgs }: -writeDashBin "qrscan" '' +pkgs.writeDashBin "qrscan" '' set -efu - tmpdir=$(${coreutils}/bin/mktemp --tmpdir -d qrscan.XXXXXXXX) - codefile=$tmpdir/code - - cleanup() { - ${coreutils}/bin/rm "$codefile" - ${coreutils}/bin/rmdir "$tmpdir" - } - - ${coreutils}/bin/mkfifo "$codefile" - - ${zbar}/bin/zbarcam > "$codefile" & - zbarcampid=$! - - exec < "$codefile" - while read -r code; do - code=$(printf %s "$code" | ${gnused}/bin/sed -n 's/^QR-Code://p') - if test -n "$code"; then - ${coreutils}/bin/kill "$zbarcampid" - echo "$code" - fi - done + ${pkgs.zbar}/bin/zbarcam -1 | ${pkgs.gnused}/bin/sed -n 's/^QR-Code://p' '' -- cgit v1.2.3 From ba8a0d000ae7b731f7961a8af47b811a881b73a7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 23 Mar 2022 15:05:42 +0100 Subject: netcat-openbsd -> libressl.nc --- krebs/5pkgs/simple/untilport/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/simple/untilport/default.nix b/krebs/5pkgs/simple/untilport/default.nix index 61bcc2b89..2930fd1eb 100644 --- a/krebs/5pkgs/simple/untilport/default.nix +++ b/krebs/5pkgs/simple/untilport/default.nix @@ -13,6 +13,6 @@ pkgs.writeDashBin "untilport" '' if [ $# -ne 2 ]; then usage else - until ${pkgs.netcat-openbsd}/bin/nc -z "$@"; do sleep 1; done + until ${pkgs.libressl.nc}/bin/nc -z "$@"; do sleep 1; done fi '' -- cgit v1.2.3 From 8d3688ecfd4a0f1a8908a0cb471e7b7792d9b54b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Mar 2022 13:47:56 +0100 Subject: git-hooks irc-announce: verbose == true, not false --- krebs/5pkgs/simple/git-hooks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix index 13fe7aa67..3ec43739c 100644 --- a/krebs/5pkgs/simple/git-hooks/default.nix +++ b/krebs/5pkgs/simple/git-hooks/default.nix @@ -96,7 +96,7 @@ with stockholm.lib; #$host $GIT_SSH_REPO $ref $link add_message $(pink push) $link $(gray "($receive_mode)") - ${optionalString (verbose == false || typeOf verbose == "set") /* sh */ '' + ${optionalString (verbose == true || typeOf verbose == "set") /* sh */ '' ${optionalString (verbose.exclude or [] != []) /* sh */ '' case $ref in (${concatStringsSep "|" verbose.exclude}) continue -- cgit v1.2.3 From 1407ad3502a7dd46d6e432b7ccc013bc80341bb1 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 5 Apr 2022 22:16:29 +0200 Subject: pager: init at 1.0.0 --- krebs/5pkgs/haskell/pager.nix | 23 +++++++++++++++++++++++ krebs/5pkgs/simple/pager.nix | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 krebs/5pkgs/haskell/pager.nix create mode 100644 krebs/5pkgs/simple/pager.nix (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/haskell/pager.nix b/krebs/5pkgs/haskell/pager.nix new file mode 100644 index 000000000..3c9f80466 --- /dev/null +++ b/krebs/5pkgs/haskell/pager.nix @@ -0,0 +1,23 @@ +{ mkDerivation, base, blessings, bytestring, containers +, data-default, hack, lib, optparse-applicative, probability +, scanner, speculate, split, terminal-size, text, unix, X11 +, fetchgit +}: +mkDerivation { + pname = "pager"; + version = "1.0.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/pager"; + sha256 = "1kqd27faxinkwpxancyk0xl6n7ljlc8iqhnnq85l76bk4qi9b45i"; + rev = "f4cdf79bd4a75e9eafe68b9a908f4cc68682b7ef"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base blessings bytestring containers data-default hack + optparse-applicative probability scanner speculate split + terminal-size text unix X11 + ]; + license = lib.licenses.mit; +} diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix new file mode 100644 index 000000000..f156f7414 --- /dev/null +++ b/krebs/5pkgs/simple/pager.nix @@ -0,0 +1,34 @@ +{ pkgs }: + +pkgs.writeDashBin "pager" '' + # usage: pager {view,shift,shiftview} + # + # Environment variables + # + # PAGER_NAME (default: Pager) + # The environment variables specifies the application name under which + # resources are to be obtained. PAGER_NAME should not contain “.” or “*” + # characters. + # + set -efu + + pidfile=$XDG_RUNTIME_DIR/pager.lock + name=''${PAGER_NAME-Pager} + + if test -e "$pidfile" && + ${pkgs.procps}/bin/pgrep --pidfile="$pidfile" >/dev/null + then + ${pkgs.procps}/bin/pkill --pidfile="$pidfile" + ${pkgs.coreutils}/bin/rm "$pidfile" + exit + fi + + echo $$ > "$pidfile" + + exec ${pkgs.xterm}/bin/xterm \ + -name "$name" \ + -ti vt340 \ + -xrm 'Pager*geometry: 32x10' \ + -xrm 'Pager*internalBorder: 2' \ + -e ${pkgs.haskellPackages.pager}/bin/pager "$@" +'' -- cgit v1.2.3 From 941476b492f54890a161d7564736b05f083001ed Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 5 Apr 2022 23:06:12 +0200 Subject: pager: add default fg and bg colors --- krebs/5pkgs/simple/pager.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix index f156f7414..ed740490d 100644 --- a/krebs/5pkgs/simple/pager.nix +++ b/krebs/5pkgs/simple/pager.nix @@ -30,5 +30,7 @@ pkgs.writeDashBin "pager" '' -ti vt340 \ -xrm 'Pager*geometry: 32x10' \ -xrm 'Pager*internalBorder: 2' \ + -xrm 'Pager*background: #050505' \ + -xrm 'Pager*foreground: #d0d7d0' \ -e ${pkgs.haskellPackages.pager}/bin/pager "$@" '' -- cgit v1.2.3 From 379f216fc701a6fde36f716e1708e9b8b0aaa8ba Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 6 Apr 2022 14:48:13 +0200 Subject: hack: 1.0.0 -> 1.0.1 --- krebs/5pkgs/haskell/hack.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/haskell/hack.nix b/krebs/5pkgs/haskell/hack.nix index 37ef94e46..df3343818 100644 --- a/krebs/5pkgs/haskell/hack.nix +++ b/krebs/5pkgs/haskell/hack.nix @@ -3,11 +3,11 @@ }: mkDerivation { pname = "hack"; - version = "1.0.0"; + version = "1.0.1"; src = fetchgit { url = "https://cgit.krebsco.de/hack"; - sha256 = "0hi6frpnxbg3h6s7gd48ri57jc226qycy4rnhmpzpq195xf8y3pf"; - rev = "cb004b2e5f0fce6cea8d54e60558a1c1904dbe39"; + sha256 = "0ry5ikn89ij512qvk1xhdhfz4s8a6b9yawgx6lxgnw5jkiyjd7ka"; + rev = "f3ea150aca5cc86878fa10bc5b1f0918fc154e2a"; fetchSubmodules = true; }; isLibrary = true; -- cgit v1.2.3 From 0e9cc04c196445c4e07ee4e1f331a3984a0066dd Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 6 Apr 2022 15:32:06 +0200 Subject: xmonad-stockholm: 1.3.0 -> 1.3.1 --- krebs/5pkgs/haskell/xmonad-stockholm.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix index 751f26749..5fe348799 100644 --- a/krebs/5pkgs/haskell/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix @@ -1,15 +1,18 @@ -{ mkDerivation, base, containers, fetchgit, filepath, lib, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib +{ mkDerivation, base, containers, directory, fetchgit, filepath +, lib, unix, X11, X11-xft, X11-xshape, xmonad, xmonad-contrib }: -mkDerivation rec { +mkDerivation { pname = "xmonad-stockholm"; - version = "1.3.0"; + version = "1.3.1"; src = fetchgit { - url = http://cgit.ni.krebsco.de/xmonad-stockholm; - rev = "refs/tags/v1.3.0"; - sha256 = "1np5126wn67y0a1r60rnkq828s0w9zjnvai4b8zy3yc02xlkrjm9"; + url = "https://cgit.krebsco.de/xmonad-stockholm"; + sha256 = "1x5fjjrdgswv7fjnnmwvv2zicdszmkrsh564m7za4y54zg57wsx2"; + rev = "3cd58b7d415d320e67516be952be8d30c020bd81"; + fetchSubmodules = true; }; libraryHaskellDepends = [ - base containers filepath unix X11 X11-xft X11-xshape xmonad xmonad-contrib + base containers directory filepath unix X11 X11-xft X11-xshape + xmonad xmonad-contrib ]; license = lib.licenses.mit; } -- cgit v1.2.3 From 59056a2e404544b418bf7be0cfb087ac292761fc Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 6 Apr 2022 15:32:06 +0200 Subject: xmonad-stockholm: 1.3.0 -> 1.3.1 --- krebs/5pkgs/haskell/xmonad-stockholm.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix index 751f26749..c43dbe271 100644 --- a/krebs/5pkgs/haskell/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix @@ -1,15 +1,18 @@ -{ mkDerivation, base, containers, fetchgit, filepath, lib, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib +{ mkDerivation, base, containers, directory, fetchgit, filepath +, lib, unix, X11, X11-xft, X11-xshape, xmonad, xmonad-contrib }: -mkDerivation rec { +mkDerivation { pname = "xmonad-stockholm"; - version = "1.3.0"; + version = "1.3.1"; src = fetchgit { - url = http://cgit.ni.krebsco.de/xmonad-stockholm; - rev = "refs/tags/v1.3.0"; - sha256 = "1np5126wn67y0a1r60rnkq828s0w9zjnvai4b8zy3yc02xlkrjm9"; + url = "https://cgit.krebsco.de/xmonad-stockholm"; + sha256 = "1m4kkppy143jvjzhy5aawh8q6sglpnqhiajxbdcr42j02ibf3vvq"; + rev = "89bae8aad73db8fe9e11da7d515f0b236e7fea51"; + fetchSubmodules = true; }; libraryHaskellDepends = [ - base containers filepath unix X11 X11-xft X11-xshape xmonad xmonad-contrib + base containers directory filepath unix X11 X11-xft X11-xshape + xmonad xmonad-contrib ]; license = lib.licenses.mit; } -- cgit v1.2.3