diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-29 00:38:22 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-29 00:38:22 +0200 |
| commit | 5ff77c7c64fe8eb94004a77718e70cfa14a3c9c4 (patch) | |
| tree | b9ceba038f1e54fe68dd3ff94b551535554cd0fa /makefu/1systems/tsp | |
| parent | c575f32d56b53ecbc1bcf28342f4eff683b7818c (diff) | |
| parent | 17497235e84985f9b2ec4acda47f15a9fe68453e (diff) | |
Merge remote-tracking branch 'gum/master' into HEAD
Diffstat (limited to 'makefu/1systems/tsp')
| -rw-r--r-- | makefu/1systems/tsp/config.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index 7169638d..75a11d3a 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -10,7 +10,8 @@ <stockholm/makefu/2configs/gui/base.nix> <stockholm/makefu/2configs/fs/sda-crypto-root.nix> # hardware specifics are in here - <stockholm/makefu/2configs/hw/tp-x200.nix #< imports tp-x2x0.nix> + # imports tp-x2x0.nix + <stockholm/makefu/2configs/hw/tp-x200.nix> <stockholm/makefu/2configs/disable_v6.nix> <stockholm/makefu/2configs/rad1o.nix> |