Merge pull request 'main-to-momo-main' (#212) from main-to-momo-main into momo/main

Reviewed-on: pub-solar/os#212
Reviewed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2023-03-31 16:19:07 +02:00
commit ea18402f21
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
3 changed files with 3 additions and 18 deletions

View file

@ -142,7 +142,7 @@ steps:
from_secret: iso_web_ssh_port
key:
from_secret: iso_web_ssh_key
target: /srv/www/os/download
target: /data/srv/www/os/download
source:
- /var/nix/iso-cache/*.iso
- /var/nix/iso-cache/*.iso.sha256
@ -161,6 +161,6 @@ volumes:
---
kind: signature
hmac: 3edb1779f39db0416f8395a1b0d52bd07cf51b4a181059ecdcf6f1dbfc595a49
hmac: a600be61980312efec74374647cdff7e3876a7858caf51433a8b76148312edc1
...

View file

@ -282,18 +282,6 @@
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 0,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
"type": "path"
},
"original": {
"id": "nur",
"type": "indirect"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -304,8 +292,7 @@
"home": "home",
"latest": "latest",
"nixos": "nixos",
"nixos-hardware": "nixos-hardware",
"nur": "nur"
"nixos-hardware": "nixos-hardware"
}
},
"utils": {

View file

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