summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix20
-rw-r--r--hosts/immich/immich.nix6
2 files changed, 12 insertions, 14 deletions
diff --git a/flake.nix b/flake.nix
index 072d6ab..8672d2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,19 +68,21 @@
{
nixosConfigurations =
let
- microvm-list = [
- "auth"
+ microvm-stable-list = [
"conduwuit"
"forgejo"
- "immich"
"miniflux"
"radicale"
];
+ microvm-unstable-list = [
+ "auth"
+ "immich"
+ ];
- microvms = builtins.listToAttrs (
+ microvm-builder = (nixpkgs-ver: vm-list: builtins.listToAttrs (
map (vm: {
name = vm;
- value = nixpkgs.lib.nixosSystem {
+ value = nixpkgs-ver.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -92,8 +94,10 @@
./modules/wg
];
};
- }) microvm-list
- );
+ }) vm-list
+ ));
+ microvms = (microvm-builder nixpkgs microvm-stable-list)
+ // (microvm-builder nixpkgs-unstable microvm-unstable-list);
in
microvms
// {
@@ -152,7 +156,7 @@
./modules/wg
{
- config.microvm.autostart = microvm-list;
+ config.microvm.autostart = microvm-stable-list ++ microvm-unstable-list;
}
];
};
diff --git a/hosts/immich/immich.nix b/hosts/immich/immich.nix
index 40243ae..11a69b6 100644
--- a/hosts/immich/immich.nix
+++ b/hosts/immich/immich.nix
@@ -1,12 +1,7 @@
{
config,
- inputs,
- pkgs,
...
}:
-let
- immich-latest = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.immich;
-in
{
sops.secrets."immich.yaml" = {
sopsFile = ./immich.yaml;
@@ -16,7 +11,6 @@ in
services.immich = {
enable = true;
- package = immich-latest;
host = "10.89.88.13";
redis.enable = true;
database.createDB = true;