diff options
Diffstat (limited to '')
-rw-r--r-- | flake.lock | 17 | ||||
-rw-r--r-- | flake.nix | 4 | ||||
-rw-r--r-- | flora/services/ntfy.nix | 2 | ||||
-rw-r--r-- | pkgs/overlay.nix | 3 | ||||
-rw-r--r-- | secrets/flora.yaml | 6 |
5 files changed, 26 insertions, 6 deletions
@@ -220,6 +220,22 @@ "type": "github" } }, + "nixpkgs-review": { + "locked": { + "lastModified": 1710036628, + "narHash": "sha256-ACV9Knz/OqGWGwjA/KtKU600zq1Hi8HbeEkIBzkjPrg=", + "owner": "dotlambda", + "repo": "nixpkgs", + "rev": "6fc8811f723187ce8996b5495e0d7dfe255313a9", + "type": "github" + }, + "original": { + "owner": "dotlambda", + "ref": "mollysocket-init", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1708501555, @@ -263,6 +279,7 @@ "home-manager": "home-manager", "isabelle-utils": "isabelle-utils", "nixpkgs": "nixpkgs", + "nixpkgs-review": "nixpkgs-review", "nixpkgs-unstable": "nixpkgs-unstable", "playground": "playground", "rust-overlay": "rust-overlay", @@ -7,6 +7,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs-review.url = "github:dotlambda/nixpkgs/mollysocket-init"; home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -149,7 +150,8 @@ nixosModules = { # glitchtip = import ./modules/glitchtip.nix; bookwyrm = import ./modules/bookwyrm.nix; - mollysocket = import ./modules/mollysocket.nix; + # mollysocket = import ./modules/mollysocket.nix; + mollysocket = import "${inputs.nixpkgs-review.outPath}/nixos/modules/services/misc/mollysocket.nix"; }; hydraJobs = { diff --git a/flora/services/ntfy.nix b/flora/services/ntfy.nix index e00971f..cb875a7 100644 --- a/flora/services/ntfy.nix +++ b/flora/services/ntfy.nix @@ -28,8 +28,8 @@ port = 8020; host = "::"; }; - environmentFile = "/run/secrets/mollysocket/config.toml"; }; + systemd.services.mollysocket.serviceConfig.EnvironmentFile = "/run/secrets/mollysocket/config.toml"; sops.secrets."mollysocket/config.toml" = {}; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index a0d629f..0194a2a 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -208,5 +208,6 @@ in ''; }) {}; - mollysocket = self.callPackage ./mollysocket.nix { }; + # mollysocket = self.callPackage ./mollysocket.nix { }; + mollysocket = inputs.nixpkgs-review.legacyPackages.x86_64-linux.mollysocket; } diff --git a/secrets/flora.yaml b/secrets/flora.yaml index 2ea3529..ccb31c7 100644 --- a/secrets/flora.yaml +++ b/secrets/flora.yaml @@ -7,7 +7,7 @@ akkoma: monit: mail: ENC[AES256_GCM,data:wq+xDelBsyIZRJY0GHrZGPWCF0deLZRZxrU89M93hK1zUIeWP6i7xO3dgKE/A5OAGa350Zbj5v9QTieNFHiGqr9g,iv:APUuS3s+t4VPz24Ppen3u+LFSv+GqO49j9Mq77Mb3lQ=,tag:rNVJGN/lnCuq9Km8lZTkLw==,type:str] mollysocket: - config.toml: ENC[AES256_GCM,data:FGT6QOpqaf74yKmUFyyeAPLLv1BEtXZvLrUZw9bCG3hjmd2oUqcX2EGSWWICik3bnfgwYtQAnORg,iv:wEaK5COW9Gm7Hux+Kt8/Md+O/ygSWUk65gMnD6Mnw2g=,tag:4AhZs2vVE2oYErJOC5lMEw==,type:str] + config.toml: ENC[AES256_GCM,data:pBdN+bw+Ksf8q/+w9z6wv2lijKqS7saMAMRqU6O5efikyaCfZwAfdgOXRUoJJQ2CBVqV9uMvBA4b2H4=,iv:4XRkkFiQ/805W7xAnBNXCq7aO2feiUzMgNb7ja49RuU=,tag:YpzPP5gb5BmlQ8iLzHWLQw==,type:str] sops: kms: [] gcp_kms: [] @@ -32,8 +32,8 @@ sops: SEx0Y2tsaGtkV3dMd0t0ejl3WVkwOW8KTpb14yYJ1bOeLquOrmworNqiwYoZSYiQ LkLkXKSGf6T3BrL0t0bM3fgwSQN3k92GGsEZzY7I2hhxZoNXGBOaKg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-04T17:19:00Z" - mac: ENC[AES256_GCM,data:/GOYEzTEn3fxJRidfPzwgfitcUv2S5MRppiiagH+E1wsEJgV3JtlfxuQ9KQlh1tFPgS1p109+w4udP2dstJGKj027tZT0VJr7KYHFrXzKKdqWypINaqLXOibUg17THHn5W+Y/AFU2hQK1MXem5eY2qCBtxJQMU0ermllY4nuHvA=,iv:KlYG0h6NtPyjrNaLXxpKSO/yQkeW6LqmZl9ZvFNwNdY=,tag:SYrr1grlqOgQcHVJkJzWWQ==,type:str] + lastmodified: "2024-03-10T12:40:37Z" + mac: ENC[AES256_GCM,data:xhz3IvwgCSzWyHzQag9kGbLo50uloQ1qeFri4TiUNhiPvtDwW2CjffHOLNai/GtnzWc9LrexpVwLEmaz1hwnYwx0nDSrUWq9b99tk+hYHr4kpup2lrHF5AFsXMtWtKmg31vewUm/1btLJlDGHldyvBkN6qG55JjL9ywppBn6eCc=,iv:xLpfzYOyWciEjOOcpnX6pxoMGFPb7x1gNbGBEyOCJug=,tag:SWaa/9NwM9uFldoEc8N+4w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 |