summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-07-20 17:24:08 +0200
committerlassulus <lassulus@lassul.us>2022-07-20 17:24:08 +0200
commit42e91b31915fd4f5e5bab5bb0045691975d223d5 (patch)
tree57d79193dcdaee3172a4f7fae2e54981c4aea731 /makefu/1systems
parent2c03c42bd62e6890f4193e3023b286a80e6d1dcd (diff)
parent89d04e250514a3dc1c8f4dd6e073cdfe6b3f4a05 (diff)
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/x/config.nix2
-rw-r--r--makefu/1systems/x/x13/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index a4aa0cbab..0377c336f 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -74,7 +74,7 @@
#}
# { systemd.services.docker.wantedBy = lib.mkForce []; }
- <stockholm/makefu/2configs/dict.nix>
+ # <stockholm/makefu/2configs/dict.nix>
# <stockholm/makefu/2configs/legacy_only.nix>
#<stockholm/makefu/3modules/netboot_server.nix>
#{
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix
index 7e9f4a6ac..d652229f9 100644
--- a/makefu/1systems/x/x13/default.nix
+++ b/makefu/1systems/x/x13/default.nix
@@ -8,7 +8,7 @@
<nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
# <stockholm/makefu/2configs/hw/tpm.nix>
<stockholm/makefu/2configs/hw/ssd.nix>
- <stockholm/makefu/2configs/hw/xmm7360.nix>
+ # <stockholm/makefu/2configs/hw/xmm7360.nix>
];
boot.zfs.requestEncryptionCredentials = true;
networking.hostId = "f8b8e0a2";