Better thor flake

This commit is contained in:
Filippo Berto 2022-04-19 15:54:29 +02:00
parent 4a3b1b9083
commit 7be25d3226
5 changed files with 87 additions and 72 deletions

View file

@ -52,7 +52,7 @@
(final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
(final: prev: {
# cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
# update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
lockscreen = final.callPackage ./custom/lockscreen {
palette = final.rice.colorPalette;
font = final.rice.font.normal;
@ -75,7 +75,6 @@
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/base.nix
./odin/pro_audio.nix
home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
@ -85,54 +84,66 @@
# home-manager.users.bertof.home.packages = [ unstable.hello ];
}
];
thorBaseModules = [
{ nixpkgs = nixpkgsSettings; }
./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
# home-manager.nixpkgs.overlays = overlays;
home-manager.users.bertof = import ./thor.nix;
# home-manager.users.bertof.home.packages = [ unstable.hello ];
}
];
in
{
packages.x86_64-linux = pkgs;
exports = {
inherit pkgs unstablePkgs;
};
nixosConfigurations = rec {
thor = pkgs.lib.nixosSystem {
thor = unstable.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
};
modules = [
{ nixpkgs = nixpkgsSettings; }
./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
];
thor-big-data = unstable.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
};
odin = odin-nvidia-big-data-unstable;
odin-intel = pkgs.lib.nixosSystem {
odin-intel = nixpkgs.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
};
modules = [
{ nixpkgs = nixpkgsSettings; }
./odin/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/base.nix
./odin/odin-intel.nix
./odin/pro_audio.nix
];
odin-nvidia = nixpkgs.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
};
odin-intel-unstable = unstable.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ];
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
};
odin-nvidia-unstable = unstable.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ];
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
};
odin-intel-big-data-unstable = unstable.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [
./odin/odin-intel.nix
./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix
];
};
@ -141,6 +152,7 @@
inherit system;
modules = odinBaseModules ++ [
./odin/odin-nvidia.nix
./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix
];
};