Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

flake update.

Browse source
This commit is contained in:
Gabe Venberg 2025-04-18 11:34:25 +02:00
parent b53f2d2da9
commit a08109dc84
3 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741786315, "lastModified": 1744940522,
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1743550720,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743295846, "lastModified": 1744919155,
"narHash": "sha256-hKKz07d4RV9gzxzE5Qu3RQWX8a7XpzRrP5timoxoGRQ=", "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "717030011980e9eb31eb8ce011261dd532bce92c", "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,11 +185,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743167577, "lastModified": 1744633460,
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743125458, "lastModified": 1744290088,
"narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=", "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215", "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +225,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744623728, "lastModified": 1744967394,
"narHash": "sha256-4yNH4c7zkUi3nuYHsmRRXXAcDLkT/fP5eQPoLhqMWwA=", "narHash": "sha256-/vM9SHdS+xAA5j5vHTrR6FHxHj6uw1OEt6O5CpW5uPc=",
"owner": "gabevenberg", "owner": "gabevenberg",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b87080e2ab4478d9fb9b89114a9bea3e62ddd98f", "rev": "fc7742acf2f4beaf449944b078cf016a294f2c9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,11 +248,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1743288994, "lastModified": 1744874965,
"narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742659553, "lastModified": 1743683223,
"narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "508752835128a3977985a4d5225ff241f7756181", "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +306,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743305778, "lastModified": 1744669848,
"narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8e873886bbfc32163fe027b8676c75637b7da114", "rev": "61154300d945f0b147b30d24ddcafa159148026a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/cirrostratus/restic.nix
View file

@ -11,8 +11,6 @@ in {
secrets.restic-server-credentials = { secrets.restic-server-credentials = {
sopsFile = "${inputs.nix-secrets}/restic-server"; sopsFile = "${inputs.nix-secrets}/restic-server";
format = "binary"; format = "binary";
# TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to remove this.
# path = "/backup/restic/.htpasswd";
owner = "restic"; owner = "restic";
}; };
secrets.restic-url = { secrets.restic-url = {

4
modules/nixos/restic.nix
View file

@ -28,8 +28,9 @@
description = "path of repository"; description = "path of repository";
}; };
htpasswdPath = lib.mkOption { htpasswdPath = lib.mkOption {
type = lib.types.path; type = lib.types.nullOr lib.types.path;
description = "path to the repositories .htpasswd file"; description = "path to the repositories .htpasswd file";
default = null;
}; };
domain = lib.mkOption { domain = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -91,7 +92,6 @@
appendOnly = true; appendOnly = true;
dataDir = cfg.server.repositoryPath; dataDir = cfg.server.repositoryPath;
listenAddress = "127.0.0.1:${cfg.server.port}"; listenAddress = "127.0.0.1:${cfg.server.port}";
# TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to enable this.
htpasswd-file = cfg.server.htpasswdPath; htpasswd-file = cfg.server.htpasswdPath;
}; };