From 5536af3b94a09275644ff4ad0e65addeda4026d2 Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 7 Jul 2025 08:36:13 -0400 Subject: [PATCH] garage and forgejo fixes --- hosts/valefar/default.nix | 10 +++++----- modules/forgejo/default.nix | 5 +++-- modules/garage/default.nix | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix index df18dd3..1d3c272 100755 --- a/hosts/valefar/default.nix +++ b/hosts/valefar/default.nix @@ -20,7 +20,7 @@ ../../common/efi.nix # Hardware-specific (commented out) - # ../../common/nvidia.nix + ../../common/nvidia.nix ]; # ============================================================================= @@ -29,8 +29,7 @@ system.stateVersion = "24.11"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - # Intel microcode updates - hardware.cpu.intel.updateMicrocode = lib.mkDefault + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # ============================================================================= @@ -150,6 +149,7 @@ "d /storage/immich/photos 0755 immich immich -" "Z /storage/immich 0755 immich immich -" "d /storage/tm_share 0755 regent users" + "Z /garage/ 0755 garage garage -" ]; # ============================================================================= @@ -269,7 +269,7 @@ # ============================================================================= # VIRTUAL MACHINES # ============================================================================= - systemd.services."microvm@".after = [ "microvm-virtiofsd@%i.service" ]; + /*systemd.services."microvm@".after = [ "microvm-virtiofsd@%i.service" ]; microvm.vms = { gameservers = { @@ -279,5 +279,5 @@ microvm.autostart = [ "gameservers" - ]; + ];*/ } diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 7aab652..faf3a17 100755 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -37,8 +37,9 @@ in SSH_LISTEN_PORT = 2222; SSH_PORT = 2222; START_SSH_SERVER = true; + SSH_DOMAIN = "sgit.nekomimi.pet"; }; - # service.DISABLE_REGISTRATION = true; + service.DISABLE_REGISTRATION = true; actions = { ENABLED = true; DEFAULT_ACTIONS_URL = "github"; @@ -46,4 +47,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/modules/garage/default.nix b/modules/garage/default.nix index 543bd16..2edd532 100755 --- a/modules/garage/default.nix +++ b/modules/garage/default.nix @@ -16,12 +16,12 @@ in config = mkIf cfg.enable { services.garage = { enable = true; - package = pkgs.garage; + package = pkgs.garage_2; settings = { metadata_dir = "/garage/metadata"; data_dir = "/garage/data"; db_engine = "lmdb"; - replication_mode = "2"; + replication_factor = 2; rpc_bind_addr = "[::]:3901"; rpc_public_addr = "${config.networking.hostName}:3901"; rpc_secret_file = config.age.secrets."garage-rpc-secret".path; @@ -41,8 +41,8 @@ in metrics_token_file = config.age.secrets."garage-metrics-token".path; }; bootstrap_peers = [ - "d548d0c9ae9aec9e26fe0bd2ca3efe75f654fa350bad5cb02bc9aebc9850ba8f@[2a04:52c0:135:48d1::2]:3901" # buer - "5504cb25910dcef4a4312006691d651c099cde7c3a88df9ca79aa350571e6e65@[2601:5c2:8400:26c0:4ecc:6aff:fef7:98ca]:3901" #valefar + "d548d0c9ae9aec9e26fe0bd2ca3efe75f654fa350bad5cb02bc9aebc9850ba8f@[buer]:3901" + "5504cb25910dcef4a4312006691d651c099cde7c3a88df9ca79aa350571e6e65@[valefar]:3901" ]; }; };