From 77f1ad0a6771fdfcdb99cb67eed611e50619bf86 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 15 Mar 2022 17:51:12 +0100 Subject: [PATCH] add a common-x86 module --- flake.nix | 4 ++-- modules/common-x86/default.nix | 16 ++++++++++++++++ modules/common/default.nix | 7 ------- 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 modules/common-x86/default.nix diff --git a/flake.nix b/flake.nix index 7650c75..f09e5e0 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,7 @@ configurationNix # Common configuration - ./modules/common + ./modules/common-x86 home-manager.nixosModules.home-manager { @@ -79,7 +79,7 @@ configurationNix # Common configuration - ./modules/common + ./modules/common-x86 home-manager.nixosModules.home-manager { diff --git a/modules/common-x86/default.nix b/modules/common-x86/default.nix new file mode 100644 index 0000000..22bea90 --- /dev/null +++ b/modules/common-x86/default.nix @@ -0,0 +1,16 @@ +{ inputs, custom, pkgs, ... }: +{ + imports = [ + "${inputs.self}/modules/common" + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + hardware = { + cpu.intel.updateMicrocode = true; + }; +} + diff --git a/modules/common/default.nix b/modules/common/default.nix index d33dd54..77c57b6 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -4,12 +4,6 @@ "${inputs.self}/modules/cli" ]; - # Use the systemd-boot EFI boot loader. - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - # The rough location location = { latitude = 46.948; @@ -26,7 +20,6 @@ }; hardware = { - cpu.intel.updateMicrocode = true; enableRedistributableFirmware = true; };