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

Modules unification

Browse source
This commit is contained in:
Filippo Berto 2022-04-21 19:44:46 +02:00
parent 7be25d3226
commit 35e4fe5582
2 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
flake.nix
View file

@ -68,6 +68,7 @@
}; };
pkgs = import nixpkgs nixpkgsSettings; pkgs = import nixpkgs nixpkgsSettings;
unstablePkgs = import nixpkgs nixpkgsSettings; unstablePkgs = import nixpkgs nixpkgsSettings;
odinBaseModules = [ odinBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
./odin/hardware-configuration.nix ./odin/hardware-configuration.nix
@ -81,24 +82,40 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# home-manager.nixpkgs.overlays = overlays; # home-manager.nixpkgs.overlays = overlays;
home-manager.users.bertof = import ./odin.nix; home-manager.users.bertof = import ./odin.nix;
# home-manager.users.bertof.home.packages = [ unstable.hello ];
} }
]; ];
odinStableBaseModules = odinBaseModules ++ [
home-manager.nixosModules.home-manager
];
odinUnstableBaseModules = odinBaseModules ++ [
home-manager-unstable.nixosModules.home-manager
];
thorBaseModules = [ thorBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
./thor/hardware-configuration.nix ./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
home-manager-unstable.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# home-manager.nixpkgs.overlays = overlays; # home-manager.nixpkgs.overlays = overlays;
home-manager.users.bertof = import ./thor.nix; home-manager.users.bertof = import ./thor.nix;
# home-manager.users.bertof.home.packages = [ unstable.hello ];
} }
./thor/configuration.nix
]; ];
thorStableBaseModules = thorBaseModules ++ [
home-manager.nixosModules.home-manager
];
thorUnstableBaseModules = thorBaseModules ++ [
home-manager-unstable.nixosModules.home-manager
];
in in
{ {
exports = { exports = {
@ -107,41 +124,48 @@
nixosConfigurations = rec { nixosConfigurations = rec {
thor = unstable.lib.nixosSystem { thor = thor-unstable;
thor-stable = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ]; modules = thorStableBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
};
thor-unstable = unstable.lib.nixosSystem {
inherit system;
modules = thorUnstableBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
}; };
thor-big-data = unstable.lib.nixosSystem { thor-big-data = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; modules = thorUnstableBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
}; };
odin = odin-nvidia-big-data-unstable; odin = odin-nvidia-big-data-unstable;
odin-intel = nixpkgs.lib.nixosSystem { odin-intel = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ]; modules = odinStableBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-nvidia = nixpkgs.lib.nixosSystem { odin-nvidia = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ]; modules = odinStableBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-intel-unstable = unstable.lib.nixosSystem { odin-intel-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ]; modules = odinUnstableBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-nvidia-unstable = unstable.lib.nixosSystem { odin-nvidia-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ]; modules = odinUnstableBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-intel-big-data-unstable = unstable.lib.nixosSystem { odin-intel-big-data-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ modules = odinUnstableBaseModules ++ [
./odin/odin-intel.nix ./odin/odin-intel.nix
./nixos_modules/pro_audio.nix ./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix ./nixos_modules/big_data.nix
@ -150,7 +174,7 @@
odin-nvidia-big-data-unstable = unstable.lib.nixosSystem { odin-nvidia-big-data-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ modules = odinUnstableBaseModules ++ [
./odin/odin-nvidia.nix ./odin/odin-nvidia.nix
./nixos_modules/pro_audio.nix ./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix ./nixos_modules/big_data.nix

2
modules/pro_audio.nix
View file

@ -21,7 +21,7 @@ in
# artyFX # artyFX
autotalent autotalent
boops boops
cardinal # cardinal
geonkick geonkick
helm helm
(lsp-plugins.overrideAttrs (old: { version = "1.2.0"; })) (lsp-plugins.overrideAttrs (old: { version = "1.2.0"; }))