diff options
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/gum/source.nix | 1 | ||||
-rw-r--r-- | makefu/1systems/sdev/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/studio/source.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/vbob/config.nix | 5 | ||||
-rw-r--r-- | makefu/1systems/vbob/source.nix | 6 | ||||
-rw-r--r-- | makefu/1systems/wbob/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/wbob/source.nix | 6 | ||||
-rw-r--r-- | makefu/1systems/x/config.nix | 1 | ||||
-rw-r--r-- | makefu/1systems/x/source.nix | 1 |
9 files changed, 20 insertions, 6 deletions
diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix index 82d42b496..b3ce743ca 100644 --- a/makefu/1systems/gum/source.nix +++ b/makefu/1systems/gum/source.nix @@ -1,3 +1,4 @@ import <stockholm/makefu/source.nix> { name="gum"; + torrent = true; } diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index f3853a788..38c044be4 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -7,7 +7,7 @@ <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> + <stockholm/makefu/2configs/main-laptop.nix> # <secrets/extra-hosts.nix> # environment diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix index 092330a50..af0f37809 100644 --- a/makefu/1systems/studio/source.nix +++ b/makefu/1systems/studio/source.nix @@ -2,6 +2,6 @@ import <stockholm/makefu/source.nix> { name="studio"; override.musnix.git = { url = https://github.com/musnix/musnix.git; - ref = "f0ec1f3"; + ref = "d8b989f"; }; } 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"; + }; } diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index c530aaad3..d7f642360 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -20,7 +20,7 @@ in { # <stockholm/makefu/2configs/gui/wbob-kiosk.nix> <stockholm/makefu/2configs/stats/client.nix> - <stockholm/makefu/2configs/gui/studio.nix> + <stockholm/makefu/2configs/gui/studio-virtual.nix> <stockholm/makefu/2configs/audio/jack-on-pulse.nix> <stockholm/makefu/2configs/audio/realtime-audio.nix> <stockholm/makefu/2configs/vncserver.nix> diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index 419ebbe3b..af0f37809 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,3 +1,7 @@ import <stockholm/makefu/source.nix> { - name="wbob"; + name="studio"; + override.musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "d8b989f"; + }; } diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 2dd232193..80c09df1c 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,6 +19,7 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/disable_v6.nix> # Testing + # <stockholm/makefu/2configs/torrent.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix> # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> # <stockholm/makefu/2configs/deployment/dirctator.nix> diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix index 54ec3c8a9..6dc17b656 100644 --- a/makefu/1systems/x/source.nix +++ b/makefu/1systems/x/source.nix @@ -1,4 +1,5 @@ import <stockholm/makefu/source.nix> { name="x"; full = true; + # torrent = true; } |