Odin: Fix importing

This commit is contained in:
Filippo Berto 2025-03-18 21:36:43 +01:00
parent 54f1080a67
commit 9a874b3909
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED

View file

@ -125,32 +125,6 @@
# { age.secrets.ollama = { file = ./secrets/ollama.age; owner = "bertof"; }; }
];
odinCommonModules = [
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
./instances/odin/hardware-configuration.nix
./instances/odin/common_configuration.nix
# S3 cache write
./modules/nixos/s3_cache_write.nix
{ age.secrets.s3_odin = { file = ./secrets/s3_odin.age; owner = "bertof"; }; }
./modules/nixos/pro_audio.nix
./modules/nixos/kdeconnect.nix
./modules/nixos/ip_forwarding.nix
./modules/nixos/steam.nix
# ./modules/nixos/minio_local.nix
./modules/nixos/hyprland.nix
./modules/nixos/users/tiziano.nix
{ home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix; }
./modules/nixos/musa.nix
] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
installerModules = commonModules ++ [ ./modules/nixos/installer.nix ];
in
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
@ -320,12 +294,6 @@
}];
};
odin-nvidia = inputs.nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-nvidia.nix ];
};
odin = inputs.nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ [
@ -335,10 +303,13 @@
./instances/odin/hardware-configuration.nix
./instances/odin/configuration.nix
./modules/nixos/users/tiziano.nix
./modules/nixos/server
./modules/nixos/steam.nix
] ++ homeManagerUModules ++ [{
home-manager.users.bertof = import ./instances/odin/hm.nix;
home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
}];
};