diff --git a/flake.lock b/flake.lock index c770593..212c7b7 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1744564581, - "narHash": "sha256-3oYyf8uwhgjvHqa82QqYJJcdertKL/WGYM4cXREKE3o=", + "lastModified": 1744621650, + "narHash": "sha256-z8aK2dugzjwDDXNDOsMFUPLRDltBXGZYJRayvOoG/Og=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1997c83d637f2ab52651826d90099e1e1561bab7", + "rev": "3253a4b2cfcfad6810746f5c62d0e6bf53ba97a9", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1744498625, - "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", + "lastModified": 1744618730, + "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", + "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", "type": "github" }, "original": { diff --git a/hosts/emenel-services/configuration.nix b/hosts/emenel-services/configuration.nix index 3efffc9..078d154 100644 --- a/hosts/emenel-services/configuration.nix +++ b/hosts/emenel-services/configuration.nix @@ -39,7 +39,7 @@ age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; defaultSopsFile = ./secrets.yaml; secrets = { - forgejoemenel = {}; + forgejo-emenel = {}; }; }; diff --git a/hosts/emenel-services/secrets.yaml b/hosts/emenel-services/secrets.yaml index b0d7379..ed2b81d 100644 --- a/hosts/emenel-services/secrets.yaml +++ b/hosts/emenel-services/secrets.yaml @@ -1,4 +1,4 @@ -forgejoemenel: ENC[AES256_GCM,data:T7e2fAnNz8vwtv5CjeBvKNE+WFMgtrGwTEqgr91SvUTIwhUAhC2IEnuiOVOGTfV0lCMfTze2ezskQgzhCQwYkSXJZJu7OmS1,iv:BRca5QlBKixl8mbcbFR7UIdlB8OEHFItgAS297aDveY=,tag:PkLbXcslO6otBM3O69ZmDQ==,type:str] +forgejo-emenel: ENC[AES256_GCM,data:Ngb8YCzaxVskDau76iv0XTesSA2NLXOfRr4Y+J47Z0prq5ol5Kf9H71VpWFTzR0TjSu8q8EUdq/2dqNzlzxlW+5SAXzxDWVW,iv:EOiKG4Y/yrOWUfbPoM3O4BvZiWEltTXIyYhcRNQ3Jbw=,tag:fUl2/3wtevmXCSUqsv+Hqg==,type:str] sops: age: - recipient: age10k8v6pfm3p7cmsgn6wu5ufpcquqgpvqh76l23xf326et55dacc0qlr8fe8 @@ -19,7 +19,7 @@ sops: cjUxSzYwSjg4c2pqRVlEeDVYc2NlN28KLyF2kPwaBTfm6ooIWkC7QuM4H4F7uvhi tsS/pHp9aE43ur6CShAJn4x7AHJGIwge+VZe3mUiMpsBfO5hROvwmA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-04-13T19:02:08Z" - mac: ENC[AES256_GCM,data:qMruNm31DbQJT3PrhQlonV9Xo87YPuqPHXv87SAyfJ2izX3J+w9v1nAu3yruOkW0Jt/gBAqlV7k20jMpwqGhuIm9+nZ7jLF0RaBTxPyBxmQ3wkO27We9KR5b7ekfoS/ECva59vwo5BbVTWNuflw0qdeG1HFswveMvCAJAqAIP8c=,iv:/aQxt+DMEEN1+PUnINMq0olO4eBGVZuL4LjB55vo3yc=,tag:ApBK4IFl/fUJalx8Sm8zYA==,type:str] + lastmodified: "2025-04-14T12:29:05Z" + mac: ENC[AES256_GCM,data:lYflBymIecXWR5gAu3eKjmWqn4FPEuE2STFyxQdjPEbj7aP2CfshOUhUAwvhEy9twPvPTDkZuyiWmfSHZiHWiUYdI9cEKOB4ZiG+wlwmdOP76soXulFPyIsvFCbQMbvbUrxpA7+kUDArzuXnvffH+zI8lExgh0LHrnNR3893A10=,iv:SAECjDkkJxeNklUUaJMOJFrQjWtj/1IMZR5Tpkd1EzA=,tag:fBVnhFXRgYiDZ9gYfUUUtg==,type:str] unencrypted_suffix: _unencrypted version: 3.10.1 diff --git a/modules/system/forgejo.nix b/modules/system/forgejo.nix index 57eb876..10dfbba 100644 --- a/modules/system/forgejo.nix +++ b/modules/system/forgejo.nix @@ -63,7 +63,7 @@ forgejo-cli ]; - sops.secrets.forgejoemenel.owner = "forgejo"; + sops.secrets.forgejo-emenel.owner = "forgejo"; systemd.services.forgejo.preStart = let adminCmd = "${lib.getExe pkgs.forgejo} admin user"; pwd = config.sops.secrets.forgejoemenel;