Merge branch 'main' into infra-merge-main-bump-flake-lock

This commit is contained in:
teutat3s 2023-04-11 18:59:36 +02:00
commit ae2439a93a
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 2 additions and 17 deletions

View file

@ -125,7 +125,7 @@ steps:
from_secret: iso_web_ssh_port from_secret: iso_web_ssh_port
key: key:
from_secret: iso_web_ssh_key from_secret: iso_web_ssh_key
target: /srv/www/os/download target: /data/srv/www/os/download
source: source:
- /var/nix/iso-cache/*.iso - /var/nix/iso-cache/*.iso
- /var/nix/iso-cache/*.iso.sha256 - /var/nix/iso-cache/*.iso.sha256
@ -147,6 +147,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 907568d64c1560d414768dd453138911ebe0f922658335d1d5120482784b1426 hmac: 5c2b65a2c015f5f11e6d61349693246e3e3c2e88d6aa97d04cb935b13b48b80b
... ...

View file

@ -360,18 +360,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"locked": {
"lastModified": 0,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
"type": "path"
},
"original": {
"id": "nur",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -384,7 +372,6 @@
"latest": "latest", "latest": "latest",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur",
"triton-vmtools": "triton-vmtools" "triton-vmtools": "triton-vmtools"
} }
}, },

View file

@ -50,7 +50,6 @@
nixos, nixos,
home, home,
nixos-hardware, nixos-hardware,
nur,
agenix, agenix,
deploy, deploy,
triton-vmtools, triton-vmtools,
@ -84,7 +83,6 @@
our = self.lib; our = self.lib;
}); });
}) })
nur.overlay
agenix.overlays.default agenix.overlays.default
(import ./pkgs) (import ./pkgs)