From b6acf6a941633fec0f361f40b994ae353e6cdd07 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Mar 2024 16:51:36 +0100 Subject: [PATCH 1/2] move btrfs.autoScrub.enable to hardware-configuration.nix Signed-off-by: Harald Hoyer --- modules/nixos/services/base/default.nix | 1 - systems/x86_64-linux/sgx/hardware-configuration.nix | 2 ++ systems/x86_64-linux/x1/hardware-configuration.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index ab786c7..a6f6750 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -89,7 +89,6 @@ in # powerManagement.cpuFreqGovernor = "ondemand"; services = { - btrfs.autoScrub.enable = true; dbus.implementation = "broker"; dbus.packages = [ pkgs.gcr ]; fwupd.enable = true; diff --git a/systems/x86_64-linux/sgx/hardware-configuration.nix b/systems/x86_64-linux/sgx/hardware-configuration.nix index 0afa72d..c776203 100644 --- a/systems/x86_64-linux/sgx/hardware-configuration.nix +++ b/systems/x86_64-linux/sgx/hardware-configuration.nix @@ -16,6 +16,8 @@ boot.blacklistedKernelModules = [ "iwlwifi" "snd_hda_intel" "hdaudio" "btintel" "bluetooth" ]; boot.extraModprobeConfig = "options kvm_intel nested=1"; + services.btrfs.autoScrub.enable = true; + fileSystems."/" = { device = "/dev/disk/by-uuid/7aa17b01-785e-41c6-9723-79195af906c6"; diff --git a/systems/x86_64-linux/x1/hardware-configuration.nix b/systems/x86_64-linux/x1/hardware-configuration.nix index 0b8ffac..ce95bfa 100644 --- a/systems/x86_64-linux/x1/hardware-configuration.nix +++ b/systems/x86_64-linux/x1/hardware-configuration.nix @@ -21,6 +21,8 @@ boot.extraModulePackages = [ ]; + services.btrfs.autoScrub.enable = true; + fileSystems."/" = { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955"; From 9e19f0673a62de892c9eae49f15639482979ca4a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Mar 2024 17:05:47 +0100 Subject: [PATCH 2/2] Use snowfall-lib pre-v3 Signed-off-by: Harald Hoyer --- flake.lock | 13 +++++++------ flake.nix | 24 ++---------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index d85a7df..01c4cb9 100644 --- a/flake.lock +++ b/flake.lock @@ -2115,16 +2115,17 @@ ] }, "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", + "lastModified": 1709576611, + "narHash": "sha256-vkcNo9pDhKObEU1xKDHcUUWKQbuYIi5051/5s/l6Iig=", "owner": "snowfallorg", "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", + "rev": "5082cdac87c5fd99ef2ee5989d9f73888bc5ed14", "type": "github" }, "original": { "owner": "snowfallorg", "repo": "lib", + "rev": "5082cdac87c5fd99ef2ee5989d9f73888bc5ed14", "type": "github" } }, @@ -2396,11 +2397,11 @@ }, "unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 531fdd3..2d1fe82 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; snowfall-lib = { - url = "github:snowfallorg/lib"; + url = "github:snowfallorg/lib?rev=5082cdac87c5fd99ef2ee5989d9f73888bc5ed14"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -56,30 +56,10 @@ allowUnfree = true; }; - homes.users."harald@sgx-nixos".modules = with inputs; [ + homes.modules = with inputs; [ neovim-flake.homeManagerModules.default ]; - homes.users."harald@x1".modules = with inputs; [ - neovim-flake.homeManagerModules.default - ]; - - homes.users."harald@sgx".modules = with inputs; [ - neovim-flake.homeManagerModules.default - ]; - - homes.users."harald@mpro.fritz.box".modules = with inputs; [ - neovim-flake.homeManagerModules.default - ]; - - homes.users."harald@sgx-azure".modules = with inputs; [ - neovim-flake.homeManagerModules.default - ]; - - # homes.modules = with inputs; [ - # neovim-flake.homeManagerModules.default - # ]; - systems.modules.nixos = with inputs; [ lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager