diff --git a/flake.lock b/flake.lock index 11e8115..d882722 100644 --- a/flake.lock +++ b/flake.lock @@ -349,16 +349,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1661208473, - "narHash": "sha256-EcoSSCrhc/qkoACcbB1Q2zi1jiFvb93kb4SS1AbviFw=", + "lastModified": 1661414334, + "narHash": "sha256-9uL8a3v1L9FNCJIhhXZzNQJLS8dq1S0vd03cDrbc0Lw=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "a73f576bc51a194b6cf77580f84b60c610e0bbbe", + "rev": "ed0a4bf92a7b00da1497d87846c068af92919f54", "type": "github" }, "original": { "owner": "NULLx76", - "ref": "direnv-vscode-extension", + "ref": "0x76", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c4d941c..32e8b13 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix inputs = { - nixpkgs.url = "github:NULLx76/nixpkgs/direnv-vscode-extension"; + nixpkgs.url = "github:NULLx76/nixpkgs/0x76"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; @@ -46,7 +46,11 @@ # Define args each module gets access to (access to hosts is useful for DNS/DHCP) specialArgs = { inherit hosts flat_hosts inputs; }; - pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [ vault-secrets.overlay ]; + pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [ + (import ./nixos/pkgs) + vault-secrets.overlay + minecraft-servers.overlays.default + ]; # Script to apply local colmena deployments apply-local = pkgs.writeScriptBin "apply-local" '' @@ -68,14 +72,8 @@ { meta = { inherit specialArgs; - nixpkgs = import nixpkgs { - inherit system; - overlays = [ - (import ./nixos/pkgs) - minecraft-servers.overlays.default - ]; + nixpkgs = pkgs; }; - }; } nixHosts; diff --git a/nixos/hosts/olympus/k3s/configuration.nix b/nixos/hosts/olympus/k3s/configuration.nix index cb51352..4524c4b 100644 --- a/nixos/hosts/olympus/k3s/configuration.nix +++ b/nixos/hosts/olympus/k3s/configuration.nix @@ -37,7 +37,7 @@ # Enable k3s as a master node services.k3s = { - enable = false; + enable = true; role = "server"; extraFlags = builtins.toString [ diff --git a/nixos/pkgs/vmagent/default.nix b/nixos/pkgs/vmagent/default.nix index 2a1984d..c9fdcd2 100644 --- a/nixos/pkgs/vmagent/default.nix +++ b/nixos/pkgs/vmagent/default.nix @@ -1,13 +1,14 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.79.0"; + version = "1.80.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-+LirbGbKeazXMtgVh5kZP+KEk/fDbSxceZ26OlE0hbY="; + sha256 = "sha256-SIwl8Mgbkk/z3xZ6wCmce7D2T2A2+dcuQ607BOsfrkQ="; + # sha256 = lib.fakeSha256; }; vendorSha256 = null;