This commit is contained in:
Filippo Berto 2022-12-18 12:25:02 +01:00
parent ad69610e89
commit b60906c687
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED

View file

@ -138,9 +138,7 @@
nixosConfigurations = { nixosConfigurations = {
thor = nixpkgs.lib.nixosSystem rec { thor = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = commonModules ++ [
commonModules
++ [
{ nixpkgs.config = config // { cudaSupport = true; }; } { nixpkgs.config = config // { cudaSupport = true; }; }
./thor/hardware-configuration.nix ./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
@ -177,10 +175,7 @@
rec { rec {
odin-nvidia = nixpkgs.lib.nixosSystem rec { odin-nvidia = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = commonModules ++ odinCommonModules ++ [
commonModules
++ odinCommonModules
++ [
{ nixpkgs.config = config // { cudaSupport = true; }; } { nixpkgs.config = config // { cudaSupport = true; }; }
./odin/configuration-nvidia.nix ./odin/configuration-nvidia.nix
]; ];
@ -188,10 +183,7 @@
odin-intel = nixpkgs.lib.nixosSystem rec { odin-intel = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = commonModules ++ odinCommonModules ++ [
commonModules
++ odinCommonModules
++ [
./odin/configuration-intel.nix ./odin/configuration-intel.nix
]; ];
}; };
@ -204,9 +196,7 @@
# nixosConfigurations = rec { # nixosConfigurations = rec {
# freya = nixpkgs.lib.nixosSystem rec { # freya = nixpkgs.lib.nixosSystem rec {
# system = "aarch64-linux"; # system = "aarch64-linux";
# modules = # modules = commonModules ++ [
# commonModules
# ++ [
# nixos-hardware.nixosModules.raspberry-pi-4 # nixos-hardware.nixosModules.raspberry-pi-4
# ./freya/hardware-configuration.nix # ./freya/hardware-configuration.nix
# ./freya/configuration.nix # ./freya/configuration.nix
@ -220,9 +210,7 @@
# nixosConfigurations = rec { # nixosConfigurations = rec {
# baldur = nixpkgs.lib.nixosSystem rec { # baldur = nixpkgs.lib.nixosSystem rec {
# system = "x86_64-linux"; # system = "x86_64-linux";
# modules = # modules = commonModules ++ [
# commonModules
# ++ [
# # nixos-hardware.nixosModules.common-cpu-amd # # nixos-hardware.nixosModules.common-cpu-amd
# # nixos-hardware.nixosModules.common-pc-ssd # # nixos-hardware.nixosModules.common-pc-ssd
# ./baldur/hardware-configuration.nix # ./baldur/hardware-configuration.nix
@ -237,9 +225,7 @@
nixosConfigurations = rec { nixosConfigurations = rec {
loki = nixpkgs.lib.nixosSystem rec { loki = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = commonModules ++ [
commonModules
++ [
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./loki/hardware-configuration.nix ./loki/hardware-configuration.nix