Many many changes

flake.nix

@@ -2,7 +2,8 @@
   description = "Fudo Host Configuration";
 
   inputs = {
-    nixpkgs.url = "git+https://fudo.dev/nix/nixpkgs.git";
+    nixpkgs.url =
+      "nixpkgs/nixos-23.11"; # "git+https://fudo.dev/nix/nixpkgs.git";
 
     fudo-home = {
       url = "git+https://fudo.dev/nix/home.git";
@@ -11,31 +12,31 @@
     };
 
     # This MUST be a clean git repo, because we use the timestamp.
-    fudo-entities = {
-      url = "git+https://fudo.dev/nix/entities.git";
+    fudo-entities.url = "git+https://fudo.dev/nix/entities.git";
+
+    fudo-lib.url = "git+https://fudo.dev/nix/lib.git";
+
+    fudo-pkgs.url = "git+https://fudo.dev/nix/pkgs.git";
+
+    fudo-secrets = {
+      url = "path:/secrets";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    fudo-lib = { url = "git+https://fudo.dev/nix/lib.git"; };
+    # chute = {
+    #   url = "git+https://fudo.dev/chute/chute.git?ref=stable";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
-    fudo-pkgs = { url = "git+https://fudo.dev/nix/pkgs.git"; };
+    # chuteUnstable = {
+    #   url = "git+https://fudo.dev/chute/chute.git?ref=master";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
-    fudo-secrets.url = "path:/secrets";
-
-    chute = {
-      url = "git+https://fudo.dev/chute/chute.git?ref=stable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    chuteUnstable = {
-      url = "git+https://fudo.dev/chute/chute.git?ref=master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    pricebot = {
-      url = "git+https://fudo.dev/public/pricebot.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # pricebot = {
+    #   url = "git+https://fudo.dev/public/pricebot.git";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
 
@@ -69,6 +70,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    mabel = {
+      url = "git+https://fudo.dev/public/mabel.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     arion = {
       url = "github:hercules-ci/arion";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -143,6 +149,14 @@
       };
     };
 
+    immich-ml-container = {
+      url = "git+https://fudo.dev/public/immich-ml-container.git";
+      inputs = {
+        arion.follows = "arion";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
     authoritative-dns = {
       url = "git+https://fudo.dev/public/authoritative-dns.git";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -162,15 +176,17 @@
       url = "git+https://git.informis.land/informis/textfiles.git";
       flake = false;
     };
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   outputs = { self, nixpkgs, fudo-home, fudo-lib, fudo-entities, fudo-pkgs
-    , fudo-secrets, chute, chuteUnstable, nixpkgsUnstable, pricebot, wallfly
-    , objectifier, nexus, suanni, snooper, tattler, lemmy-docker
-    , tesla-mate-container, mastodon-container, authentik-container
-    , nextcloud-container, textfiles, matrix-module, mail-server
-    , authoritative-dns, frigate-container, grafana-module, lemmy-container
-    , immich-container, ... }@inputs:
+    , fudo-secrets, nixpkgsUnstable, wallfly, objectifier, nexus, suanni
+    , snooper, tattler, lemmy-docker, tesla-mate-container, mastodon-container
+    , authentik-container, nextcloud-container, textfiles, matrix-module
+    , mail-server, authoritative-dns, frigate-container, grafana-module
+    , lemmy-container, immich-container, immich-ml-container, mabel
+    , nixos-hardware, ... }@inputs:
     with nixpkgs.lib;
     let
       fudo-nixos-hosts = filterAttrs (hostname: hostOpts: hostOpts.nixos-system)
@@ -208,7 +224,10 @@
               chute = chute.packages.${arch}.chute;
               chuteUnstable = chuteUnstable.packages.${arch}.chute;
             })
-            (final: prev: { pkgsUnstable = unstable; })
+            (final: prev: {
+              pkgsUnstable = unstable;
+              inherit nixos-hardware;
+            })
             (final: prev: {
               signal-desktop = unstable.signal-desktop;
               factorio-experimental = unstable.factorio-experimental;
@@ -236,7 +255,7 @@
             fudo-secrets.nixosModules.default
             fudo-lib.nixosModules.default
             fudo-entities.nixosModule
-            pricebot.nixosModules.default
+            # pricebot.nixosModules.default
             wallfly.nixosModule
             objectifier.nixosModules.default
             suanni.nixosModules.default
@@ -254,6 +273,8 @@
             grafana-module.nixosModules.default
             lemmy-container.nixosModules.default
             immich-container.nixosModules.default
+            immich-ml-container.nixosModules.default
+            mabel.nixosModules.default
 
             nexus.nixosModules.nexus-client
             nexus.nixosModules.nexus-server
@@ -265,6 +286,8 @@
             (config-dir + "/profile-config/${hostOpts.profile}.nix")
             (config-dir + "/domain-config/${hostOpts.domain}.nix")
             (config-dir + "/site-config/${hostOpts.site}.nix")
+
+            (import ./hardware-modules.nix nixos-hardware.nixosModules hostname)
           ];
 
           config = let pkgs = pkgs-for hostOpts.arch;