Merge remote-tracking branch 'prism/master'

4 files changed, 3 insertions, 25 deletions

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index dd3777c64..6790c0aea 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -21,7 +21,6 @@ with import <stockholm/lib>;
     ../2configs/fetchWallpaper.nix
     #../2configs/c-base.nix
     ../2configs/mail.nix
-    ../2configs/krebs-pass.nix
     ../2configs/repo-sync.nix
     ../2configs/ircd.nix
     ../2configs/logf.nix
@@ -76,7 +75,7 @@ with import <stockholm/lib>;
     }
     {
       environment.systemPackages = [
-        pkgs.krebszones
+        pkgs.ovh-zone
       ];
     }
     {
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 227152482..5edd1075d 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -178,11 +178,11 @@ in {
           "haskellPackages.scanner",
           "haskellPackages.xmonad-stockholm",
           "krebspaste",
-          "krebszones",
           "logf",
           "much",
           "newsbot-js",
           "noVNC",
+          "ovh-zone",
           "passwdqc-utils",
           "populate",
           "posix-array",
diff --git a/lass/2configs/krebs-pass.nix b/lass/2configs/krebs-pass.nix
deleted file mode 100644
index a605bc84b..000000000
--- a/lass/2configs/krebs-pass.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-
-let
-
-  #TODO: tab-completion
-  krebs-pass = pkgs.writeDashBin "krebs-pass" ''
-    PASSWORD_STORE_DIR=$HOME/.krebs-pass \
-    exec ${pkgs.pass}/bin/pass $@
-  '';
-
-  krebs-passmenu = pkgs.writeDashBin "krebs-passmenu" ''
-    PASSWORD_STORE_DIR=$HOME/.krebs-pass \
-    exec ${pkgs.pass}/bin/passmenu $@
-  '';
-
-in {
-  krebs.per-user.lass.packages = [
-    krebs-pass
-    krebs-passmenu
-  ];
-}
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index a3916a2ea..1c68d58d5 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "f8dfdd7";
+    ref = "0a4db15";
   };
 }