summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/vbob
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-17 08:02:01 +0200
committerlassulus <lassulus@lassul.us>2017-07-17 08:02:01 +0200
commitae5fef979de5f0c5c8c1e78f56ddc1f8b4caf5b2 (patch)
tree2aea66950046fd3a6bce059e19ce0536a3e8331f /makefu/1systems/vbob
parent2d6447d9669ba74780a57dd4ddcdb19110bd4928 (diff)
parenta3f6c2e49d37eb8d629cac1e8365d5b90a2ccd3c (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/vbob')
-rw-r--r--makefu/1systems/vbob/config.nix5
-rw-r--r--makefu/1systems/vbob/source.nix6
2 files changed, 9 insertions, 2 deletions
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index 933fcf047..f71634501 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -7,7 +7,10 @@
<stockholm/makefu>
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
- <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
+ # base gui
+ <stockholm/makefu/2configs/main-laptop.nix>
+
+ # security
<stockholm/makefu/2configs/sshd-totp.nix>
# Tools
diff --git a/makefu/1systems/vbob/source.nix b/makefu/1systems/vbob/source.nix
index 96c3f368c..af0f37809 100644
--- a/makefu/1systems/vbob/source.nix
+++ b/makefu/1systems/vbob/source.nix
@@ -1,3 +1,7 @@
import <stockholm/makefu/source.nix> {
- name="vbob";
+ name="studio";
+ override.musnix.git = {
+ url = https://github.com/musnix/musnix.git;
+ ref = "d8b989f";
+ };
}