diff --git a/common/fragments/frq-friend.nix b/common/fragments/frq-friend.nix deleted file mode 100644 index b5b98e3..0000000 --- a/common/fragments/frq-friend.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, ... }: -let - config = pkgs.writeText "config.kdl" '' - status-text "hi there! i like to know people following me on here - - - what's something you enjoy doing? - - what's your stance on the Hellfire AGM-114R9X Knife Missile? - - what's your opinion on the current \"AI revolution\"? - - have you read my bio?" - with-cw "automated follow request pm" - ''; - path = "/var/lib/frq-friend"; -in { - systemd.services.frq-friend = { - wantedBy = [ "multi-user.target" ]; - description = - "just a friend that messages people who send you a follow request"; - after = [ "network.target" ]; - - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.frq-friend}/bin/f3"; - WorkingDirectory = path; - Restart = "always"; - RuntimeMaxSec = "1h"; - }; - preStart = '' - ln -sf ${config} ${path}/config.kdl - ''; - }; -} diff --git a/flake.lock b/flake.lock index 648a8d7..c15b9fa 100644 --- a/flake.lock +++ b/flake.lock @@ -93,7 +93,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -139,26 +139,6 @@ "type": "github" } }, - "frq-friend": { - "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_2", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1704635792, - "narHash": "sha256-18cwml0k6g7wWkPlFtORFt/eVf6vxu/g2fEr8LrEQIE=", - "ref": "refs/heads/main", - "rev": "fa324fbf2651f33f1d3557c058f5fbf8e985e624", - "revCount": 6, - "type": "git", - "url": "https://git.xenua.me/xenua/fedi-frq-friend" - }, - "original": { - "type": "git", - "url": "https://git.xenua.me/xenua/fedi-frq-friend" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -233,11 +213,11 @@ }, "matrix-ril100": { "inputs": { - "naersk": "naersk_2", + "naersk": "naersk", "nixpkgs": [ "nixpkgs-unstable" ], - "utils": "utils_3" + "utils": "utils_2" }, "locked": { "lastModified": 1688054487, @@ -280,25 +260,6 @@ "inputs": { "nixpkgs": "nixpkgs" }, - "locked": { - "lastModified": 1679567394, - "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", - "owner": "nix-community", - "repo": "naersk", - "rev": "88cd22380154a2c36799fe8098888f0f59861a15", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, "locked": { "lastModified": 1687852486, "narHash": "sha256-2rXkhKUVQxbVaC+TITPpILiy/dSbordOLs87eoWHYxA=", @@ -314,7 +275,7 @@ "type": "github" } }, - "naersk_3": { + "naersk_2": { "inputs": { "nixpkgs": [ "url-eater", @@ -339,7 +300,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -379,11 +340,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681272286, - "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=", + "lastModified": 1687946342, + "narHash": "sha256-vRxti8pOuXS0rJmqjbD8ueEEFXWSK22ISHoCWkhgzzg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b70761ea8c896aff8994eb367d9526686501860", + "rev": "1c851e8c92b76a00ce84167984a7ec7ba2b1f29c", "type": "github" }, "original": { @@ -440,36 +401,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1681272286, - "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6b70761ea8c896aff8994eb367d9526686501860", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1687946342, - "narHash": "sha256-vRxti8pOuXS0rJmqjbD8ueEEFXWSK22ISHoCWkhgzzg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c851e8c92b76a00ce84167984a7ec7ba2b1f29c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -485,7 +416,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1747676747, "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", @@ -501,7 +432,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1682092588, "narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=", @@ -521,13 +452,12 @@ "inputs": { "ccase": "ccase", "colmena": "colmena", - "frq-friend": "frq-friend", "home-manager": "home-manager", "lix-module": "lix-module", "matrix-ril100": "matrix-ril100", "mms": "mms", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable", "url-eater": "url-eater", @@ -625,28 +555,13 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "url-eater": { "inputs": { - "naersk": "naersk_3", + "naersk": "naersk_2", "nixpkgs": [ "nixpkgs-unstable" ], - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "lastModified": 1734618283, @@ -682,25 +597,7 @@ }, "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" - } - }, - "utils_3": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1687709756, @@ -716,9 +613,9 @@ "type": "github" } }, - "utils_4": { + "utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -734,9 +631,9 @@ "type": "github" } }, - "utils_5": { + "utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -754,8 +651,8 @@ }, "vampysite": { "inputs": { - "nixpkgs": "nixpkgs_6", - "utils": "utils_5" + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" }, "locked": { "lastModified": 1717180338, diff --git a/flake.nix b/flake.nix index f9362bb..e710e07 100644 --- a/flake.nix +++ b/flake.nix @@ -42,8 +42,6 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; - ccase = { url = "github:rutrum/ccase"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -60,7 +58,6 @@ mms, url-eater, matrix-ril100, - frq-friend, colmena, vampysite, ccase, @@ -69,7 +66,6 @@ let mkOverlays = system: config: [ (final: prev: { - frq-friend = frq-friend.packages.${final.system}.default; vampysite = vampysite.packages.${final.system}.default; matrix-ril100 = matrix-ril100.packages.${final.system}.default; ccase = ccase.packages.${final.system}.default; @@ -133,13 +129,6 @@ ]; destDir = "/var/lib/secrets"; }; - "fedi-data.toml" = { - keyCommand = [ - "cat" - "./secrets/frq-friend-fedi-data.toml" - ]; - destDir = "/var/lib/frq-friend"; - }; "ril100-bot-secrets" = { keyCommand = [ "cat" diff --git a/hosts/bloodletting/configuration.nix b/hosts/bloodletting/configuration.nix index fa63455..ccf4db7 100644 --- a/hosts/bloodletting/configuration.nix +++ b/hosts/bloodletting/configuration.nix @@ -9,7 +9,6 @@ ./hardware-configuration.nix ../../common/fragments/bin.nix ../../common/fragments/fail2ban.nix - ../../common/fragments/frq-friend.nix ../../common/fragments/grafana.nix ../../common/fragments/headscale.nix ../../common/fragments/hedgedoc.nix