diff --git a/.sops.yaml b/.sops.yaml deleted file mode 100644 index 47ede6d..0000000 --- a/.sops.yaml +++ /dev/null @@ -1,9 +0,0 @@ -keys: - - &admin age13flq29rfu03np26ujargsjml3wdhlruvhqyjnfhlq87s56lrxy2sgl8z6h - - &server_netbox: age1y5y2k2zn9w3ss2drqw3d295ny0t0xww5855dkuh4g2f934gt74eqxgmhvh -creation_rules: - - path_regex: boxes/netbox/secrets.yaml - key_groups: - - age: - - *admin - - *server_netbox diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix index 4b8ecaf..cd2635a 100644 --- a/boxes/netbox/default.nix +++ b/boxes/netbox/default.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix ../../lib/bootstrap.nix - ./sops.nix ./franklincce.nix ./gitea.nix diff --git a/boxes/netbox/gitea.nix b/boxes/netbox/gitea.nix index 164af4b..990526e 100644 --- a/boxes/netbox/gitea.nix +++ b/boxes/netbox/gitea.nix @@ -1,11 +1,11 @@ -{ config, ... }: +{ lib, config, pkgs, ... }: { services.gitea = { enable = true; appName = "beepboop.systems"; # Give the site a name database = { type = "postgres"; - passwordFile = config.sops.secrets."gitea/postgres-password".path; + passwordFile = "/etc/gittea-pass"; }; settings.security.INSTALL_LOCK = true; settings.service = { diff --git a/boxes/netbox/secrets.yaml b/boxes/netbox/secrets.yaml deleted file mode 100644 index be9eb2f..0000000 --- a/boxes/netbox/secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -gitea: - postgres-password: ENC[AES256_GCM,data:lcF+qOUo3PuCM/ymuIsxrZ/Ui5lwWuto8FMAQNY2nGWEvtf/yjcRzFwWIyqfszb19Wl3Z70a3i5fyurCdQ+izwAL83TOMA==,iv:+ValvmW5P4geg/2LdvrR28mp1lbB2a/Lu1zpHsxg6Uo=,tag:fayiaAf3MTSJE6Fnic9RPw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age13flq29rfu03np26ujargsjml3wdhlruvhqyjnfhlq87s56lrxy2sgl8z6h - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1UkFWVm5GanMvQXdUZUc1 - TFhxVDhWSDZwb3BMUHNnZHg5c2sxbmY0Y2lVCjF1T3FFdUE0bVJ1T3BaNnpjeThH - Sld6K2gydVN0YmJvUHdlTmd3VkV0ZTgKLS0tIE1VSElDbXdDUkd6aWFGSW02VTRP - MGwzY3dySzJHQzJWUTArVDU4MSszakUK3u5xVX+Oey1Ax6I4PH8IuJ/eQAWMgFyK - SaEgS7z/pHSEKQZeGmZwrk5+1ahI+qkjX4XPiTxiM4rxjiluxhyqQg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-27T03:59:29Z" - mac: ENC[AES256_GCM,data:BJQOgkeU71G9Cy9tRxSCNJce4NDlc73ZKoWfpMkYcIbBIkpQotmnEzmWvjmDjcR9hEayDoDHVXZA4DWtpPPSYCuls5tkHV0wFg3usLRAFWWhMOWLL4D9ZJl9C8uuW21c8mlhDf+5n+sWY5UGaRSD5SBqYdqn68E62bunLm6kHrM=,iv:Z7A686d5B7oG1GODtUDdMG9zsf2tSyqWLrofdBC9PLo=,tag:U5sf23+BRBDuqXkdb/LYGw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/boxes/netbox/sops.nix b/boxes/netbox/sops.nix deleted file mode 100644 index ed91957..0000000 --- a/boxes/netbox/sops.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ inputs, config, ... }: -{ - imports = [ - inputs.sops-nix.nixosModules.sops - ]; - - sops = { - defaultSopsFile = ./secrets.yaml; - age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - secrets = { - "gitea/postgres-password" = {}; - }; - }; -} diff --git a/flake.nix b/flake.nix index 51f4bf2..8353937 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,11 @@ description = "stupidcomputer's nixos flake"; inputs = { + # regular nixos stuff nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; - sops-nix.url = "github:Mic92/sops-nix"; + simple-nixos-mailserver = { + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + }; }; outputs = {