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,21 +138,19 @@
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; }; }
++ [ ./thor/hardware-configuration.nix
{ nixpkgs.config = config // { cudaSupport = true; }; } nixos-hardware.nixosModules.common-cpu-amd
./thor/hardware-configuration.nix nixos-hardware.nixosModules.common-pc-ssd
nixos-hardware.nixosModules.common-cpu-amd ./thor/configuration.nix
nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
./nixos_modules/pro_audio.nix ./nixos_modules/pro_audio.nix
./nixos_modules/sesar.nix ./nixos_modules/sesar.nix
./nixos_modules/pentablet.nix ./nixos_modules/pentablet.nix
{ home-manager.users.bertof = import ./thor/hm.nix; } { home-manager.users.bertof = import ./thor/hm.nix; }
]; ];
}; };
}; };
}; };
@ -177,23 +175,17 @@
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 { nixpkgs.config = config // { cudaSupport = true; }; }
++ odinCommonModules ./odin/configuration-nvidia.nix
++ [ ];
{ nixpkgs.config = config // { cudaSupport = true; }; }
./odin/configuration-nvidia.nix
];
}; };
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 ./odin/configuration-intel.nix
++ odinCommonModules ];
++ [
./odin/configuration-intel.nix
];
}; };
odin = odin-intel; odin = odin-intel;
@ -204,14 +196,12 @@
# 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
# ++ [ # ./freya/hardware-configuration.nix
# nixos-hardware.nixosModules.raspberry-pi-4 # ./freya/configuration.nix
# ./freya/hardware-configuration.nix # { home-manager.users.bertof = import ./freya/hm.nix; }
# ./freya/configuration.nix # ];
# { home-manager.users.bertof = import ./freya/hm.nix; }
# ];
# }; # };
# }; # };
# }; # };
@ -220,15 +210,13 @@
# 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-pc-ssd
# # nixos-hardware.nixosModules.common-cpu-amd # ./baldur/hardware-configuration.nix
# # nixos-hardware.nixosModules.common-pc-ssd # ./baldur/configuration.nix
# ./baldur/hardware-configuration.nix # { home-manager.users.bertof = import ./baldur/hm.nix; }
# ./baldur/configuration.nix # ];
# { home-manager.users.bertof = import ./baldur/hm.nix; }
# ];
# }; # };
# }; # };
# }; # };
@ -237,15 +225,13 @@
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-pc-ssd
nixos-hardware.nixosModules.common-cpu-intel ./loki/hardware-configuration.nix
nixos-hardware.nixosModules.common-pc-ssd ./loki/configuration.nix
./loki/hardware-configuration.nix { home-manager.users.bertof = import ./loki/hm.nix; }
./loki/configuration.nix ];
{ home-manager.users.bertof = import ./loki/hm.nix; }
];
}; };
}; };
}; };