Merge remote-tracking branch 'lass/master'

3 files changed, 1 insertions, 20 deletions

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index e6cf8d101..40f7eedde 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
 let
   out = {
     environment.systemPackages = [
-      vim
+      (hiPrio vim)
       pkgs.pythonPackages.flake8
     ];
 
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index e49a0442d..fd52325ae 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -18,7 +18,6 @@
     pop = pkgs.callPackage ./pop/default.nix {};
     q = pkgs.callPackage ./q {};
     rs = pkgs.callPackage ./rs/default.nix {};
-    untilport = pkgs.callPackage ./untilport/default.nix {};
     urban = pkgs.callPackage ./urban/default.nix {};
     xmonad-lass = import ./xmonad-lass.nix { inherit pkgs; };
     yt-next = pkgs.callPackage ./yt-next/default.nix {};
diff --git a/lass/5pkgs/untilport/default.nix b/lass/5pkgs/untilport/default.nix
deleted file mode 100644
index 61bcc2b89..000000000
--- a/lass/5pkgs/untilport/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeDashBin "untilport" ''
-  set -euf
-
-  usage() {
-    echo 'untiport $target $port'
-    echo 'Sleeps until the destinated port is reachable.'
-    echo 'ex: untilport google.de 80 && echo "google is now reachable"'
-  }
-
-
-  if [ $# -ne 2 ]; then
-    usage
-  else
-    until ${pkgs.netcat-openbsd}/bin/nc -z "$@"; do sleep 1; done
-  fi
-''