diff options
| author | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
| commit | b3786c3a74fce6a742649c37ab2ad1255f5864bf (patch) | |
| tree | a5453da91d868781b2339722a4e7bf588993ac09 /makefu/1systems/x | |
| parent | e6f67aa910f78ecf75f3a47a0794497148c60c2b (diff) | |
| parent | 53855cd2d0dadb159215c5ed12e6d0be02dca98b (diff) | |
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/x/source.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/default.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/zfs.nix | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3edfcecc1..a4aa0cbab 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -13,7 +13,7 @@ # ./x230 # Common Hardware Components - + <nix-ld/modules/nix-ld.nix> # <stockholm/makefu/2configs/hw/mceusb.nix> # <stockholm/makefu/2configs/hw/rtl8812au.nix> <stockholm/makefu/2configs/hw/network-manager.nix> diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix index 050fd39f7..05b74a014 100644 --- a/makefu/1systems/x/source.nix +++ b/makefu/1systems/x/source.nix @@ -7,5 +7,6 @@ mic92 = true; clever_kexec = true; home-manager = true; + nix-ld = true; # torrent = true; } diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index 9a407a575..7e9f4a6ac 100644 --- a/makefu/1systems/x/x13/default.nix +++ b/makefu/1systems/x/x13/default.nix @@ -28,6 +28,7 @@ environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; + services.fwupd.enable = true; programs.light.enable = true; diff --git a/makefu/1systems/x/x13/zfs.nix b/makefu/1systems/x/x13/zfs.nix index d6b99df41..ba341ef50 100644 --- a/makefu/1systems/x/x13/zfs.nix +++ b/makefu/1systems/x/x13/zfs.nix @@ -29,5 +29,6 @@ fsType = "zfs"; }; - swapDevices = [ ]; + swapDevices = [ ]; + services.zfs.autoScrub.enable = true; } |