From e13232d55c070a9ea86fb139f7e1917a797d5fa3 Mon Sep 17 00:00:00 2001 From: billimek Date: Wed, 6 Mar 2024 16:10:54 -0500 Subject: [PATCH] fix(hosts/nas/default.nix): Comment out broken auto-upgrade.nix due to git-secrets issue Commenting out the auto-upgrade.nix import due to a git-secrets issue. This prevents the build from breaking. fix(hosts/nas/hardware-configuration.nix): Add comment to revisit ksm.enable due to br0 not coming up Added a comment to revisit enabling 'ksm' (kernel same-page merging) as 'br0' did not come up last time it was tried. --- hosts/nas/default.nix | 3 ++- hosts/nas/hardware-configuration.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix index 3e86aa6..223cf07 100644 --- a/hosts/nas/default.nix +++ b/hosts/nas/default.nix @@ -9,7 +9,8 @@ ./hardware-configuration.nix ./networking.nix ../common/nixos - ../common/nixos/auto-upgrade.nix + # this breaks because of git-secrets + #../common/nixos/auto-upgrade.nix ../common/nixos/users/nix ../common/optional/avahi.nix ../common/optional/fish.nix diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix index ad9a5a6..4e78953 100644 --- a/hosts/nas/hardware-configuration.nix +++ b/hosts/nas/hardware-configuration.nix @@ -26,6 +26,9 @@ timeout = 10; }; + # TODO: revisit this; last time I tried this, br0 didn't come up + #hardware.ksm.enable = true; # enable kernel same-page merging + fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4";