From 4587ac9da565f76e66ffdca709bbc5d7a95f1b33 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 1 Jun 2026 12:06:02 -0500
Subject: [PATCH 1/2] profanity: switch from rev to tag, move variables out of
 top-level

Assisted-by: Gemini 3.1 Pro
---
 .../instant-messengers/profanity/default.nix  | 22 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  6 +----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 117a95f4e476..7f4780fb80ff 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  config,
   meson,
   ninja,
   cmocka,
@@ -18,21 +19,28 @@
   pkg-config,
   readline,
   sqlite,
-  autoAwaySupport ? true,
+
+  # Read from config.profanity, falling back to true
+  autoAwaySupport ? config.profanity.autoAwaySupport or true,
   libxscrnsaver,
   libx11,
-  notifySupport ? true,
+
+  notifySupport ? config.profanity.notifySupport or true,
   libnotify,
   gdk-pixbuf,
-  omemoSupport ? true,
+
+  omemoSupport ? config.profanity.omemoSupport or true,
   libsignal-protocol-c,
   libgcrypt,
   qrencode,
-  pgpSupport ? true,
+
+  pgpSupport ? config.profanity.pgpSupport or true,
   gpgme,
-  pythonPluginSupport ? true,
+
+  pythonPluginSupport ? config.profanity.pythonPluginSupport or true,
   python3,
-  traySupport ? true,
+
+  traySupport ? config.profanity.traySupport or true,
   gtk3,
   otrSupport ? true,
   libotr,
@@ -48,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo=";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2df4931b1f0e..9022c26614fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9207,11 +9207,7 @@ with pkgs;
 
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
-  profanity = callPackage ../applications/networking/instant-messengers/profanity (
-    {
-    }
-    // (config.profanity or { })
-  );
+  profanity = callPackage ../applications/networking/instant-messengers/profanity { };
 
   puredata-with-plugins =
     plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };

From 424d5fecf67215979acfefc6a2dcc901cd305da6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 1 Jun 2026 12:07:51 -0500
Subject: [PATCH 2/2] profanity: migrate to by-name

---
 .../default.nix => by-name/pr/profanity/package.nix}          | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/profanity/default.nix => by-name/pr/profanity/package.nix} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/by-name/pr/profanity/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/profanity/default.nix
rename to pkgs/by-name/pr/profanity/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9022c26614fc..2eb2389f9574 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9205,10 +9205,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  # perhaps there are better apps for this task? It's how I had configured my previous system.
-  # And I don't want to rewrite all rules
-  profanity = callPackage ../applications/networking/instant-messengers/profanity { };
-
   puredata-with-plugins =
     plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };