From fbabdb5081366e295fb10a2486fcc66e43a20ed1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 20 Jun 2017 16:19:15 +0200
Subject: brain: rename brain-pass -> brain

---
 krebs/5pkgs/simple/brain/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/brain/default.nix b/krebs/5pkgs/simple/brain/default.nix
index 079db825..e69b44f0 100644
--- a/krebs/5pkgs/simple/brain/default.nix
+++ b/krebs/5pkgs/simple/brain/default.nix
@@ -1,11 +1,11 @@
 { pass, writeOut, writeDash, ... }:
 
 writeOut "brain" {
-  "/bin/brain-pass".link = writeDash "brain-pass" ''
+  "/bin/brain".link = writeDash "brain" ''
     PASSWORD_STORE_DIR=$HOME/brain \
     exec ${pass}/bin/pass $@
   '';
-  "/bin/brain-passmenu".link = writeDash "brain-passmenu" ''
+  "/bin/brainmenu".link = writeDash "brainmenu" ''
     PASSWORD_STORE_DIR=$HOME/brain \
     exec ${pass}/bin/passmenu $@
   '';
-- 
cgit v1.2.3


From c759f783126a04db13c20a76d170b345bfa1052e Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sat, 24 Jun 2017 16:36:37 +0200
Subject: k 3 setuid: activate only if cfg is not empty

---
 krebs/3modules/setuid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix
index a17ec088..02176ec4 100644
--- a/krebs/3modules/setuid.nix
+++ b/krebs/3modules/setuid.nix
@@ -5,7 +5,7 @@ let
 
   out = {
     options.krebs.setuid = api;
-    config = imp;
+    config = mkIf (cfg != {}) imp;
   };
 
   api = mkOption {
-- 
cgit v1.2.3


From ea2cd88ed355aa58e527cac6b3dcd7e3c524e730 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sat, 24 Jun 2017 16:37:25 +0200
Subject: k 4 infest prepare: add stockholm as supported OS

---
 krebs/4lib/infest/prepare.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'krebs')

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 3f5d6643..50d521e1 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -43,6 +43,13 @@ prepare() {(
             exit
         esac
         ;;
+      stockholm)
+        case $(cat /proc/cmdline) in
+          *' root=LABEL=NIXOS_ISO '*)
+            prepare_nixos_iso "$@"
+            exit
+        esac
+        ;;
     esac
   elif test -e /etc/centos-release; then
     case $(cat /etc/centos-release) in
-- 
cgit v1.2.3