diff --git a/flake.lock b/flake.lock index bc922a9..88fbc09 100644 --- a/flake.lock +++ b/flake.lock @@ -298,18 +298,17 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1727301466, - "narHash": "sha256-357IEOtI+QZy9NzmKhU0vAS7aY528Uvh2n/gXQFgRpY=", - "ref": "refs/changes/46/1946/1", - "rev": "2c74949780830b5cfcd913ef24514dc8e7db5f14", - "revCount": 16269, + "lastModified": 1728506278, + "narHash": "sha256-ZAPqzjR86En31Yfau0auQmkDuyzr2QfD8yW+7205e8A=", + "ref": "refs/heads/main", + "rev": "9865ebaaa618d82a7b7fdccc636cbaa7dfa42427", + "revCount": 16335, "type": "git", - "url": "https://gerrit.lix.systems/lix" + "url": "https://git.lix.systems/lix-project/lix.git" }, "original": { - "ref": "refs/changes/46/1946/1", "type": "git", - "url": "https://gerrit.lix.systems/lix" + "url": "https://git.lix.systems/lix-project/lix.git" } }, "nix2container": { diff --git a/flake.nix b/flake.nix index e83aea8..7dc5499 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ # To update all inputs: # $ nix flake update --recreate-lock-file inputs = { - lix.url = "git+https://gerrit.lix.systems/lix?ref=refs/changes/46/1946/1"; + lix.url = "git+https://git.lix.systems/lix-project/lix.git"; lix.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko"; @@ -43,68 +43,80 @@ }; outputs = - { flake-parts - , ... - } @ inputs: - (flake-parts.lib.evalFlakeModule - { inherit inputs; } - ({ self, inputs, ... }: { - systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + { + flake-parts, + ... + }@inputs: + (flake-parts.lib.evalFlakeModule { inherit inputs; } ( + { self, inputs, ... }: + { + systems = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; imports = [ ./configurations.nix # ./modules/monitoring/flake-module.nix # ./pkgs/flake-module.nix # ./templates ]; - perSystem = { self', pkgs, ... }: { - devShells.default = pkgs.mkShellNoCC { - buildInputs = [ - pkgs.ipmitool - pkgs.colmena + perSystem = + { self', pkgs, ... }: + { + devShells.default = pkgs.mkShellNoCC { + buildInputs = [ + pkgs.ipmitool + pkgs.colmena - pkgs.python3.pkgs.invoke - #Until nixos-anywhere is packaged - pkgs.python3.pkgs.deploykit - pkgs.mypy - pkgs.pixiecore - pkgs.dnsmasq - pkgs.python3.pkgs.netaddr - pkgs.qemu_kvm - pkgs.openssh - pkgs.gitMinimal # for git flakes - pkgs.rsync - pkgs.nix - pkgs.coreutils - pkgs.curl # when uploading tarballs - pkgs.gnugrep - pkgs.findutils - pkgs.gnused # needed by ssh-copy-id - # sops dependencies - pkgs.age - pkgs.yq-go - ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd; - }; - packages = { - # netboot = pkgs.callPackage ./modules/netboot/netboot.nix { - # # this nixosSystem is built for x86_64 machines regardless of the host machine - # pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - # inherit (inputs.nixpkgs.lib) nixosSystem; - # extraModules = [ - # self.inputs.nur.nixosModules.nur - # { _module.args.inputs = self.inputs; } - # ]; - # }; + pkgs.python3.pkgs.invoke + #Until nixos-anywhere is packaged + pkgs.python3.pkgs.deploykit + pkgs.mypy + pkgs.pixiecore + pkgs.dnsmasq + pkgs.python3.pkgs.netaddr + pkgs.qemu_kvm + pkgs.openssh + pkgs.gitMinimal # for git flakes + pkgs.rsync + pkgs.nix + pkgs.coreutils + pkgs.curl # when uploading tarballs + pkgs.gnugrep + pkgs.findutils + pkgs.gnused # needed by ssh-copy-id + # sops dependencies + pkgs.age + pkgs.yq-go + ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd; + }; + packages = { + # netboot = pkgs.callPackage ./modules/netboot/netboot.nix { + # # this nixosSystem is built for x86_64 machines regardless of the host machine + # pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + # inherit (inputs.nixpkgs.lib) nixosSystem; + # extraModules = [ + # self.inputs.nur.nixosModules.nur + # { _module.args.inputs = self.inputs; } + # ]; + # }; - # netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix { - # inherit (self'.packages) netboot; - # }; + # netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix { + # inherit (self'.packages) netboot; + # }; + }; }; - }; flake = { - hydraJobs = inputs.nixpkgs.lib.mapAttrs' (name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations // { - devShells = self.devShells.x86_64-linux.default; - }; + hydraJobs = + inputs.nixpkgs.lib.mapAttrs' ( + name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel + ) self.nixosConfigurations + // { + devShells = self.devShells.x86_64-linux.default; + }; }; - })).config.flake; + } + )).config.flake; }