diff --git a/flake.lock b/flake.lock index 01c4cb9..d85a7df 100644 --- a/flake.lock +++ b/flake.lock @@ -2115,17 +2115,16 @@ ] }, "locked": { - "lastModified": 1709576611, - "narHash": "sha256-vkcNo9pDhKObEU1xKDHcUUWKQbuYIi5051/5s/l6Iig=", + "lastModified": 1696432959, + "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", "owner": "snowfallorg", "repo": "lib", - "rev": "5082cdac87c5fd99ef2ee5989d9f73888bc5ed14", + "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", "type": "github" }, "original": { "owner": "snowfallorg", "repo": "lib", - "rev": "5082cdac87c5fd99ef2ee5989d9f73888bc5ed14", "type": "github" } }, @@ -2397,11 +2396,11 @@ }, "unstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d1fe82..531fdd3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; snowfall-lib = { - url = "github:snowfallorg/lib?rev=5082cdac87c5fd99ef2ee5989d9f73888bc5ed14"; + url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -56,10 +56,30 @@ allowUnfree = true; }; - homes.modules = with inputs; [ + homes.users."harald@sgx-nixos".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 diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index a6f6750..ab786c7 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -89,6 +89,7 @@ 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 c776203..0afa72d 100644 --- a/systems/x86_64-linux/sgx/hardware-configuration.nix +++ b/systems/x86_64-linux/sgx/hardware-configuration.nix @@ -16,8 +16,6 @@ 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 ce95bfa..0b8ffac 100644 --- a/systems/x86_64-linux/x1/hardware-configuration.nix +++ b/systems/x86_64-linux/x1/hardware-configuration.nix @@ -21,8 +21,6 @@ boot.extraModulePackages = [ ]; - services.btrfs.autoScrub.enable = true; - fileSystems."/" = { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";