From 2dfcc0eb3e24afdba96335edc00ea2e138fb5c39 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Wed, 14 Jun 2023 12:33:35 -0300 Subject: [PATCH] remove firefly bot --- flake.lock | 85 ++------------------------ flake.nix | 4 -- home/misterio/global/default.nix | 4 ++ hosts/alcyone/secrets.yaml | 5 +- hosts/alcyone/services/default.nix | 1 - hosts/alcyone/services/firefly-bot.nix | 21 ------- hosts/common/global/default.nix | 9 ++- 7 files changed, 14 insertions(+), 115 deletions(-) delete mode 100644 hosts/alcyone/services/firefly-bot.nix diff --git a/flake.lock b/flake.lock index 7a60fe14..501938e8 100644 --- a/flake.lock +++ b/flake.lock @@ -90,27 +90,6 @@ "type": "github" } }, - "firefly-bot": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1681934803, - "narHash": "sha256-4qjxGyAcZFuASPi8ooW76frK3dPV252/PtdzyWCHAvo=", - "owner": "misterio77", - "repo": "firefly-bot", - "rev": "4befee0e15fdc65a9be58a72eb998b57752d3cbd", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "firefly-bot", - "type": "github" - } - }, "firefly-iii-src": { "flake": false, "locked": { @@ -130,7 +109,7 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -200,24 +179,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -232,9 +193,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -443,7 +404,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -726,33 +687,10 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "firefly-bot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1681902048, - "narHash": "sha256-RScWWUuAcRp0Rll5igAgTov99mPRhK8H+PJXtEfwg0s=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "a28d8d414da62b9074dee60d5a759f55ea7c1315", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "root": { "inputs": { "disconic": "disconic", "firefly": "firefly", - "firefly-bot": "firefly-bot", "firefox-addons": "firefox-addons", "hardware": "hardware", "home-manager": "home-manager", @@ -841,21 +779,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index e4f06239..9fd96142 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,6 @@ url = "github:timhae/firefly"; inputs.nixpkgs.follows = "nixpkgs"; }; - firefly-bot = { - url = "github:misterio77/firefly-bot"; - inputs.nixpkgs.follows = "nixpkgs"; - }; hydra.url = "github:nixos/hydra"; hyprland.url = "github:hyprwm/hyprland/v0.25.0"; diff --git a/home/misterio/global/default.nix b/home/misterio/global/default.nix index 6629231b..4b8d8880 100644 --- a/home/misterio/global/default.nix +++ b/home/misterio/global/default.nix @@ -17,6 +17,10 @@ in config = { allowUnfree = true; allowUnfreePredicate = (_: true); + # FIXME + permittedInsecurePackages = [ + "openssl-1.1.1u" + ]; }; }; diff --git a/hosts/alcyone/secrets.yaml b/hosts/alcyone/secrets.yaml index c5419af4..30e3e955 100644 --- a/hosts/alcyone/secrets.yaml +++ b/hosts/alcyone/secrets.yaml @@ -1,7 +1,6 @@ gabriel-mail-password: ENC[AES256_GCM,data:p3i7W8TShjzX/uQwxcdCMOGA2Gcel8HBL1n/rrvVRcjuELLlyFlF3w4mAYLgjreuwehjK+dG8cs30VPC,iv:5liBGqrXk9xVczhlfqR2eXM9cKG+Ax0V0oQvObQfSXA=,tag:8L15b92rJGxplP3KT5eKPQ==,type:str] radicale-htpasswd: ENC[AES256_GCM,data:ByKxmnhFzFohcHvNrHwwtHV8Y84QxZupsEeqAufAaFBi+RKoYdxwT9CKhCp5uaME1J5PnOTF4ySW8oJWdSj8dJdMjM43,iv:k/aTnZIMlzaXztStLaJgrU+v/H0ziWDW/7UAeI0J3TI=,tag:NFVybqzY0OmLfybLpbAXeQ==,type:str] firefly-key: ENC[AES256_GCM,data:ouQNrh6CGxoqYeHt6VA8YcnJRc/vQuH5CFZjsr5qiIuiWbvaypO1RJiV02Y=,iv:1TiYsDzn5STQkqdBW7qdUjAV9uFHqbQUbshcWThGCwE=,tag:cgvEU2jd803K8DX+SDqQ9g==,type:str] -firefly-bot-env: ENC[AES256_GCM,data:9MXtcPYWYJu+oSGCfq5r2F3sMgmxekHk0uxVXLyiwQ6BpWhxL4rtb5ldjUrIdbjar+j+ywJlQ/aSrgh9CRjkAmdY,iv:9d8hEWP4JTLUj1ZCR1IKBTdfSJ5CyLr9Z44Hhg5tJWk=,tag:Y07Tm02Q9lPmGNtXm9ghbQ==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +16,8 @@ sops: cjJrZWhKOFpMRytWcFg2Y0xscGtyZzgKC9oZ5kQs78AMAOCUVu8W1gD6bSum91DF kTr57muioVJPcP5ccxgZZgd9jmUxErw5zS1Ex/rtXwa/27nrxFNKeg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-04-19T19:57:34Z" - mac: ENC[AES256_GCM,data:zMmb/QVEY9/LUe6cwOMtX7pFX9y0H7xQSph8DPUN52cyDI1m+UdV+jiPugeUWUNUdElwTKjZVHJyf1PjZtOzAZcORPUblO32sPEqpIwRwrv4qhJatBvqDlngFuxy1o3toP81uAfN87aMlf+D3mBszrE0PwEoot0oHIiPEFfbGSQ=,iv:VtGb6jUYFoPX9+wmNKcKdgozxMQRYWiK6C4rSu77RHY=,tag:x8sEUUHoV2fwucywp7UAUw==,type:str] + lastmodified: "2023-06-14T15:32:59Z" + mac: ENC[AES256_GCM,data:INlMNv4CbwJe1k/6rptwjCLD06TOn18lE8DcBKtYse5C/itU2u4JWrFOPf+SxcFyA9wgMlAxCyfJNKwAqNy5UC+hIMqFGrQp9JJ5heZ8+0ngGdvJ9JkYC+tF7JXH7Y0LsuhSEiZOYmOm6RMsWwxSfTsFCpPaJ8wyubEEx2LeQ7E=,iv:GBwMkozQNUAjtQi/kUCXXI5Ssee5iG2jRJZClneLXX4=,tag:yX3P8xPZChFTwSn4GTiwHA==,type:str] pgp: - created_at: "2023-02-06T01:46:44Z" enc: |- diff --git a/hosts/alcyone/services/default.nix b/hosts/alcyone/services/default.nix index b64c399e..46d8babd 100644 --- a/hosts/alcyone/services/default.nix +++ b/hosts/alcyone/services/default.nix @@ -5,7 +5,6 @@ ../../common/optional/postgres.nix ./firefly.nix - ./firefly-bot.nix ./files-server.nix ./git-remote.nix ./headscale.nix diff --git a/hosts/alcyone/services/firefly-bot.nix b/hosts/alcyone/services/firefly-bot.nix deleted file mode 100644 index 2d07ebde..00000000 --- a/hosts/alcyone/services/firefly-bot.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ inputs, config, ... }: -{ - imports = [ - inputs.firefly-bot.nixosModules.default - ]; - - services.firefly-bot = { - enable = true; - environmentFile = config.sops.secrets.firefly-bot-env.path; - }; - - sops.secrets.firefly-bot-env = { - owner = "firefly-bot"; - group = "firefly-bot"; - sopsFile = ../secrets.yaml; - }; - - environment.persistence = { - "/persist".directories = [ "/var/lib/firefly-bot" ]; - }; -} diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index e09d9bd0..b031a3c5 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -23,6 +23,10 @@ overlays = builtins.attrValues outputs.overlays; config = { allowUnfree = true; + # FIXME + permittedInsecurePackages = [ + "openssl-1.1.1u" + ]; }; }; @@ -46,9 +50,4 @@ value = "1048576"; } ]; - - # FIXME - nixpkgs.config.permittedInsecurePackages = [ - "openssl-1.1.1u" - ]; }