Use deploy-rs from nixpkgs, use caddy module from nixos-unstable #17

Merged
b12f merged 2 commits from deploy-rs-from-nixpkgs into main 2023-10-28 13:07:30 +00:00
3 changed files with 28 additions and 2 deletions
Showing only changes of commit a5b32302c1 - Show all commits

View file

@ -229,7 +229,8 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-flake": "nixos-flake", "nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"terranix": "terranix" "terranix": "terranix",
"unstable": "unstable"
} }
}, },
"terranix": { "terranix": {
@ -271,6 +272,22 @@
"type": "github" "type": "github"
} }
}, },
"unstable": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,

View file

@ -2,6 +2,7 @@
inputs = { inputs = {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -2,7 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
self, flake,
... ...
}: let }: let
maintenanceMode = { maintenanceMode = {
@ -40,6 +40,14 @@
''; '';
}; };
in { in {
disabledModules = [
"services/web-servers/caddy/default.nix"
];
imports = [
"${flake.inputs.unstable}/nixos/modules/services/web-servers/caddy/default.nix"
];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -" "d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -"
]; ];