From ab288d9aee0f540cbf254075db42dde55aece375 Mon Sep 17 00:00:00 2001 From: Andre Date: Wed, 19 Jun 2024 11:27:46 -0400 Subject: [PATCH] Remove fail on error on start-haven script --- flake.lock | 20 ++++++++++---------- hosts/Haven/start-haven.sh | 3 --- modules/services/forgejo.nix | 1 - 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index a5229e4..2798b67 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718548414, - "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", + "lastModified": 1718806950, + "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=", "ref": "master", - "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", - "revCount": 1719, + "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda", + "revCount": 1720, "type": "git", "url": "https://github.com/NixOS/nixos-hardware" }, @@ -300,11 +300,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { diff --git a/hosts/Haven/start-haven.sh b/hosts/Haven/start-haven.sh index be5a583..ffb8856 100644 --- a/hosts/Haven/start-haven.sh +++ b/hosts/Haven/start-haven.sh @@ -7,9 +7,6 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi -# Immediately exit on any errors -set -e - # Unlock and mount storage directory if we haven't already if [ -e "/dev/mapper/storage" ]; then echo "Storage partition already mounted." diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index d6abc1a..4a0a897 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -63,7 +63,6 @@ in services = { forgejo = { enable = true; - lfs.enable = true; settings.server = { DOMAIN = cfg.domain; ROOT_URL = cfg.url;