get test to run

deployment/check/proxmox/flake-part.nix

@@ -1,17 +1,24 @@
-{
-  inputs,
-  ...
-}:
-
 {
   perSystem =
     { pkgs, ... }:
+    let
+      sources = import ../../../npins;
+      overlay =
+        _: _:
+        import "${sources.proxmox-nixos}/pkgs" {
+          inherit pkgs;
+          pkgs-unstable = pkgs;
+          craneLib = pkgs.callPackage "${sources.crane}/lib" { };
+        };
+    in
     {
-      checks.proxmox-basic = pkgs.testers.runNixOSTest {
+      checks.proxmox-basic = (pkgs.extend overlay).testers.runNixOSTest {
         imports = [
           ./proxmoxTest.nix
         ];
-        _module.args.inputs = inputs;
+        _module.args = {
+          inherit sources;
+        };
       };
     };
 }

deployment/check/proxmox/myvm.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  ...
+}:
+let
+  sources = import ../../../npins;
+in
+{
+  imports = [
+    ../../../infra/common/nixos/hardware.nix
+    "${sources.disko}/module.nix" # https://github.com/nix-community/disko/issues/1060
+    "${sources.proxmox-nixos}/modules/proxmox-ve"
+    "${sources.proxmox-nixos}/modules/declarative-vms"
+  ];
+
+  networking.hostName = "myvm";
+  virtualisation.proxmox = {
+    node = "myproxmoxnode";
+    iso = pkgs.fetchurl {
+      url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
+      hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
+    };
+    vmid = 101;
+    memory = 4096;
+    cores = 4;
+    sockets = 2;
+    net = [
+      {
+        model = "virtio";
+        bridge = "vmbr0";
+      }
+    ];
+    scsi = [ { file = "local:16"; } ]; # This will create a 16GB volume in 'local'
+  };
+}

deployment/check/proxmox/proxmoxTest.nix

@@ -1,53 +1,22 @@
 {
-  inputs,
-  lib,
   pkgs,
-  system,
   ...
 }:
 
 let
-  # sources = import ../../../npins;
-  # proxmox-nixos = import sources.proxmox-nixos;
   minimalIso = pkgs.fetchurl {
     url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
     hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
   };
 in
-
 {
   name = "proxmox-basic";
 
   nodes.mypve = {
     imports = [
-      # proxmox-nixos.nixosModules.proxmox-ve
+      ./myvm.nix
-      # "${sources.proxmox-nixos}/modules/proxmox-ve"
-      inputs.proxmox-nixos.nixosModules.proxmox-ve
     ];
 
-    nixpkgs.overlays = lib.mkForce [
-      # proxmox-nixos.overlays.x86_64-linux
-      # (import "${sources.proxmox-nixos}/pkgs" { inherit pkgs; pkgs-unstable = pkgs; craneLib = pkgs.callPackage "${sources.crane}/lib" { }; })
-      inputs.proxmox-nixos.overlays.${system}
-    ];
-
-    services.proxmox-ve = {
-      enable = true;
-      # package = pkgs.callPackage "${sources.proxmox-nixos}/pkgs/proxmox-ve" { };
-      ipAddress = "192.168.1.1";
-      vms = {
-        myvm1 = {
-          vmid = 100;
-          memory = 1024;
-          cores = 1;
-          sockets = 1;
-          kvm = true;
-          scsi = [ { file = "local:16"; } ];
-          cdrom = "local:iso/minimal.iso";
-        };
-      };
-    };
-
     virtualisation = {
       additionalPaths = [ minimalIso ];
       diskSize = 4096;

flake.lock

@@ -17,25 +17,6 @@
         "type": "github"
       }
     },
-    "crane_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1717383740,
-        "narHash": "sha256-559HbY4uhNeoYvK3H6AMZAtVfmR3y8plXZ1x6ON/cWU=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "b65673fce97d277934488a451724be94cc62499a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "ref": "v0.17.3",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "dream2nix": {
       "inputs": {
         "nixpkgs": [
@@ -125,21 +106,6 @@
         "type": "github"
       }
     },
-    "flake-compat_5": {
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -598,36 +564,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1732981179,
-        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1730768919,
@@ -676,22 +612,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1714656196,
-        "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -715,28 +635,6 @@
         "type": "github"
       }
     },
-    "proxmox-nixos": {
-      "inputs": {
-        "crane": "crane_2",
-        "flake-compat": "flake-compat_5",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1746882493,
-        "narHash": "sha256-KbkIGJ6fe5F6AZRCzrNH3vNAnbbt+gf/PWrfMZ/B0As=",
-        "owner": "SaumonNet",
-        "repo": "proxmox-nixos",
-        "rev": "bda8df28b6656843e459f166b04bc291bc495a29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SaumonNet",
-        "repo": "proxmox-nixos",
-        "type": "github"
-      }
-    },
     "purescript-overlay": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -789,8 +687,7 @@
           "nixops4"
         ],
         "nixops4-nixos": "nixops4-nixos",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_4"
-        "proxmox-nixos": "proxmox-nixos"
       }
     },
     "rust-overlay": {
@@ -856,21 +753,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt": {
       "inputs": {
         "nixpkgs": [
@@ -893,24 +775,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -5,7 +5,6 @@
     git-hooks.url = "github:cachix/git-hooks.nix";
     nixops4.follows = "nixops4-nixos/nixops4";
     nixops4-nixos.url = "github:nixops4/nixops4-nixos";
-    proxmox-nixos.url = "github:SaumonNet/proxmox-nixos";
   };
 
   outputs =

myvm.nix

@@ -1,53 +0,0 @@
-{
-  pkgs,
-  lib,
-  inputs,
-  system,
-  ...
-}:
-let
-  sources = import ./npins;
-  # pkgs = import sources.nixpkgs { inherit system; };
-  # pkgs = import sources.nixpkgs { };
-  # pkgs = import inputs.nixpkgs { };
-  # proxmox-nixos = import sources.proxmox-nixos;
-in
-{
-  # error: The option `virtualisation.proxmox' does not exist
-  imports = [
-    (import "${sources.disko}/module.nix")
-    ./infra/common/nixos/hardware.nix
-    # proxmox-nixos.nixosModules.proxmox-ve  # error: 'builtins.storePath' is not allowed in pure evaluation mode
-    # "${sources.proxmox-nixos}/modules/proxmox-ve"
-    inputs.proxmox-nixos.nixosModules.proxmox-ve
-  ];
-
-  nixpkgs.overlays = lib.mkForce [
-    # proxmox-nixos.overlays.x86_64-linux  # error: 'builtins.storePath' is not allowed in pure evaluation mode
-    # (import "${sources.proxmox-nixos}/pkgs" {
-    #   inherit pkgs;
-    #   pkgs-unstable = pkgs;
-    #   craneLib = pkgs.callPackage "${sources.crane}/lib" { };
-    # })
-    inputs.proxmox-nixos.overlays.${system}
-  ];
-  networking.hostName = "myvm";
-  virtualisation.proxmox = {
-    node = "myproxmoxnode";
-    iso = pkgs.fetchurl {
-      url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
-      hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
-    };
-    vmid = 101;
-    memory = 4096;
-    cores = 4;
-    sockets = 2;
-    net = [
-      {
-        model = "virtio";
-        bridge = "vmbr0";
-      }
-    ];
-    scsi = [ { file = "local:16"; } ]; # This will create a 16GB volume in 'local'
-  };
-}

npins/sources.json

@@ -57,6 +57,19 @@
       "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.12.0",
       "hash": "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq"
     },
+    "flake-inputs": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "fricklerhandwerk",
+        "repo": "flake-inputs"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "6461d0b56e790bf289af07c5e5261abbf4f536af",
+      "url": "https://github.com/fricklerhandwerk/flake-inputs/archive/6461d0b56e790bf289af07c5e5261abbf4f536af.tar.gz",
+      "hash": "03mwisvr1mc3nd33nvg4bvcyxjxpm4lwhwym39r0768cm1007ixl"
+    },
     "flake-parts": {
       "type": "Git",
       "repository": {
@@ -147,9 +160,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bda8df28b6656843e459f166b04bc291bc495a29",
+      "revision": "48f39fbe2e8f90f9ac160dd4b6929f3ac06d8223",
-      "url": "https://github.com/SaumonNet/proxmox-nixos/archive/bda8df28b6656843e459f166b04bc291bc495a29.tar.gz",
+      "url": "https://github.com/SaumonNet/proxmox-nixos/archive/48f39fbe2e8f90f9ac160dd4b6929f3ac06d8223.tar.gz",
-      "hash": "02yhq6gk3pva7pzhgypdnsfl1wyy8yrwwhll05x92ywzkqc0if99"
+      "hash": "0606qcs8x1jwckd1ivf52rqdmi3lkn66iiqh6ghd4kqx0g2bw3nv"
     }
   },
   "version": 5