bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix odin config

Browse source
This commit is contained in:
Filippo Berto 2022-05-31 13:21:39 +02:00
parent 7dbae6094e
commit a692b53f91
4 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

62
flake.nix
View file

@ -2,10 +2,11 @@
description = "Thor system configuration";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
home-manager = {
url = "github:nix-community/home-manager/release-21.11";
url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -94,14 +95,14 @@
./loki/configuration.nix
];
# odinStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system;
# modules = odinBaseModules ++ [
# home-manager.nixosModules.home-manager
# homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/odin.nix; }
# ] ++ extraModules;
# };
odinStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./home_manager/odin.nix; }
] ++ extraModules;
};
odinUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
@ -112,14 +113,14 @@
] ++ extraModules;
};
# thorStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system;
# modules = thorBaseModules ++ [
# home-manager.nixosModules.home-manager
# homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/thor.nix; }
# ] ++ extraModules;
# };
thorStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./home_manager/thor.nix; }
] ++ extraModules;
};
thorUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
@ -139,6 +140,15 @@
] ++ extraModules;
};
lokiStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = lokiBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./home_manager/loki.nix; }
] ++ extraModules;
};
in
{
packages.${system} = unstablePkgs;
@ -146,21 +156,21 @@
nixosConfigurations = rec {
thor = thor-unstable;
# thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix];
thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix];
thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ];
# thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ];
odin = odin-intel-unstable;
odin-stable = odin-intel-stable;
odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
# odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix];
# odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix];
odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
loki = loki-unstable;
loki-unstable = lokiUnstable [];
loki-stable = lokiStable [];
loki-unstable = lokiUnstable [ ];
};
};
}