summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-18 16:12:54 +0200
committertv <tv@krebsco.de>2017-06-18 16:12:54 +0200
commitfaea33e1cb18010ac60f677ac2c18e813e284cc7 (patch)
tree5ab4189768992e16aa2ed9bc4a509157b544bba6 /lass
parent9f75e81c5f91aa4236f86c29437de190503ad586 (diff)
parentbf62457ec2655ba4d6ef24c1eb801a80cb7b96bf (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/mors.nix3
-rw-r--r--lass/2configs/buildbot-standalone.nix2
-rw-r--r--lass/2configs/krebs-pass.nix21
-rw-r--r--lass/2configs/nixpkgs.nix2
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";
};
}