Merge branch 'main' into main-to-momo-main
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Akshay Mankar 2023-03-31 16:15:10 +02:00
commit 3992ca0d5f
Signed by: axeman
GPG key ID: CA08F3AB62369B89
3 changed files with 3 additions and 18 deletions

View file

@ -142,7 +142,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
@ -161,6 +161,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 3edb1779f39db0416f8395a1b0d52bd07cf51b4a181059ecdcf6f1dbfc595a49 hmac: a600be61980312efec74374647cdff7e3876a7858caf51433a8b76148312edc1
... ...

View file

@ -282,18 +282,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",
@ -304,8 +292,7 @@
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware"
"nur": "nur"
} }
}, },
"utils": { "utils": {

View file

@ -44,7 +44,6 @@
nixos, nixos,
home, home,
nixos-hardware, nixos-hardware,
nur,
agenix, agenix,
deploy, deploy,
... ...
@ -76,7 +75,6 @@
our = self.lib; our = self.lib;
}); });
}) })
nur.overlay
agenix.overlays.default agenix.overlays.default
(import ./pkgs) (import ./pkgs)