From f8f4d276ea277cc62f1654fe52dcf7bf2b33a85b Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Sat, 5 Apr 2025 00:28:59 -0400 Subject: [PATCH] gitlab broke? --- modules/users/overseer/services/default.nix | 1 - modules/users/overseer/services/gitlab.nix | 31 --------------------- modules/users/overseer/services/grocy.nix | 11 ++++---- 3 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 modules/users/overseer/services/gitlab.nix diff --git a/modules/users/overseer/services/default.nix b/modules/users/overseer/services/default.nix index a83ddf1..61acb3e 100644 --- a/modules/users/overseer/services/default.nix +++ b/modules/users/overseer/services/default.nix @@ -10,6 +10,5 @@ ./frigate.nix ./trilium.nix ./grocy.nix - ./gitlab.nix ]; } diff --git a/modules/users/overseer/services/gitlab.nix b/modules/users/overseer/services/gitlab.nix deleted file mode 100644 index 80c60df..0000000 --- a/modules/users/overseer/services/gitlab.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - ... -}: -lib.mkIf config.user.overseer.enable { - sops = { - secrets = { - "gitlab/db_password" = {}; - "gitlab/secrets/db" = {}; - "gitlab/secrets/jws" = {}; - "gitlab/secrets/otp" = {}; - "gitlab/secrets/secret" = {}; - }; - }; - - services.gitlab = { - enable = true; - host = "git.wanderingcrow.net"; - https = true; - databaseCreateLocally = true; - databasePasswordFile = config.sops.secrets."gitlab/db_password"; - initialRootPasswordFile = config.sops.secrets."gitlab/initial_root"; - secrets = { - secretFile = config.sops.secrets."gitlab/secrets/secret"; - otpFile = config.sops.secrets."gitlab/secrets/otp"; - jwsFile = config.sops.secrets."gitlab/secrets/jws"; - dbFile = config.sops.secrets."gitlab/secrets/db"; - }; - }; -} diff --git a/modules/users/overseer/services/grocy.nix b/modules/users/overseer/services/grocy.nix index 08f5771..bb07c36 100644 --- a/modules/users/overseer/services/grocy.nix +++ b/modules/users/overseer/services/grocy.nix @@ -32,13 +32,12 @@ in nginx.enableSSL = false; }; - virtualisation.oci-containers.containers.barcodebuddy = { - image = "f0rc3/barcodebuddy:latest"; - volumes = ["${volumePath}/barcodebuddy:/config"]; + virtualisation.oci-containers.containers = { + barcodebuddy = { + image = "f0rc3/barcodebuddy:latest"; + volumes = ["${volumePath}/barcodebuddy:/config"]; - extraOptions = ["--ip=10.88.0.11" "--device=/dev/input/by-id/usb-0581_011c-event-kbd"]; - environment = { - ATTACH_BARCODESCANNER = "true"; + extraOptions = ["--ip=10.88.0.11"]; }; }; }