diff options
| author | lassulus <git@lassul.us> | 2023-09-04 10:56:33 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-09-04 10:56:33 +0200 |
| commit | df62e24584a38d680018bfcab18821d12b0b1d13 (patch) | |
| tree | 84906536fcdaf4857ed6b491dd50aad15106ea70 /krebs/5pkgs | |
| parent | 591680e58f94e2fc6a65378c0baf190c2f2a5b68 (diff) | |
| parent | da3c1f05f595ac6919f26e994094d5513936a06e (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/haskell/desktop-pager.nix (renamed from krebs/5pkgs/haskell/pager.nix) | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebszones/default.nix | 13 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/pager.nix | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/krebs/5pkgs/haskell/pager.nix b/krebs/5pkgs/haskell/desktop-pager.nix index 36709788..1a4f94db 100644 --- a/krebs/5pkgs/haskell/pager.nix +++ b/krebs/5pkgs/haskell/desktop-pager.nix @@ -4,7 +4,7 @@ , utf8-string, X11 }: mkDerivation { - pname = "pager"; + pname = "desktop-pager"; version = "1.0.0"; src = fetchgit { url = "https://cgit.krebsco.de/pager"; diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix deleted file mode 100644 index 32608e7f..00000000 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -pkgs.writeDashBin "krebszones" '' - set -efu - export OVH_ZONE_CONFIG=''${OVH_ZONE_CONFIG:-$HOME/.secrets/krebs/ovh-zone.conf} - case $* in - import) - set -- import /etc/zones/krebsco.de krebsco.de - echo "+ krebszones $*" >&2 - ;; - esac - exec ${pkgs.ovh-zone}/bin/ovh-zone "$@" -'' diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix index 952b5ee1..adc2cc67 100644 --- a/krebs/5pkgs/simple/pager.nix +++ b/krebs/5pkgs/simple/pager.nix @@ -33,7 +33,7 @@ pkgs.symlinkJoin { -ti vt340 \ -xrm '*geometry: 32x10' \ -xrm '*internalBorder: 2' \ - -e ${pkgs.haskellPackages.pager}/bin/pager "$@" + -e ${pkgs.haskellPackages.desktop-pager}/bin/pager "$@" '') pkgs.haskellPackages.pager ]; |