From 82300df9b1d7bebdcae912a32546f6110cb63c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sat, 3 May 2025 09:45:14 +0200
Subject: [PATCH] nix/packages: update hbrainfuck, prop_solveur

---
 .github/workflows/cachix.yml                  |  2 +-
 nix/configurations/tungsten/home/programs.nix |  2 +-
 nix/configurations/vanadium/home/programs.nix |  2 +-
 nix/packages/default.nix                      | 42 +++++++------------
 nix/sources.json                              | 12 ++++++
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 52caf570..92fb425d 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -67,7 +67,7 @@ jobs:
       matrix:
         package:
           - typst-bot
-          - hbf
+          - hbrainfuck
           - prop-solveur
           - hutils
     runs-on: ubuntu-latest
diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix
index 7f2c50b2..15c164ff 100644
--- a/nix/configurations/tungsten/home/programs.nix
+++ b/nix/configurations/tungsten/home/programs.nix
@@ -24,7 +24,7 @@ in {
 
         # fun
         # myPkgs.prop-solveur
-        # myPkgs.hbf
+        # myPkgs.hbrainfuck
         # pkgs.lucky-commit
 
         # pretty tui tools
diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix
index be421df6..82bd338a 100644
--- a/nix/configurations/vanadium/home/programs.nix
+++ b/nix/configurations/vanadium/home/programs.nix
@@ -24,7 +24,7 @@ in {
 
         # fun
         myPkgs.prop-solveur
-        myPkgs.hbf
+        myPkgs.hbrainfuck
         pkgs.lucky-commit
 
         # research
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
index d6d7f8a3..86b658f2 100644
--- a/nix/packages/default.nix
+++ b/nix/packages/default.nix
@@ -99,38 +99,26 @@ in rec {
   ltex-ls-plus = pkgs.callPackage ./ltex-ls-plus.nix {};
 
   # my repositories
-  hbf = mkHaskellPackage {
+  hbrainfuck = mkHaskellPackage {
     name = "hbrainfuck";
-    src = pkgs.fetchFromGitea {
-      domain = "git.confusedcompiler.org";
-      owner = "leana8959";
-      repo = "hbrainfuck";
-      rev = "81c1d0d7ef1595bda1f8e4d86592d06e33bfd422";
-      hash = "sha256-NSCqJwcM5UgsAMpIpDSTy534hEK0wMicqwoE3DC8CGk=";
-    };
-    apply = p:
-      p.overrideAttrs (old: {
-        nativeBuildInputs = (old.nativeBuildInputs or []) ++ [pkgs.installShellFiles];
-        postInstall =
-          (old.postInstall or "")
-          + ''
-            installShellCompletion --cmd hbf \
-            --bash <("$out/bin/hbf" --bash-completion-script "$out/bin/hbf") \
-            --fish <("$out/bin/hbf" --fish-completion-script "$out/bin/hbf") \
-            --zsh  <("$out/bin/hbf" --zsh-completion-script  "$out/bin/hbf")
-          '';
-      });
+    src = sources.hbrainfuck;
+    # apply = p:
+    #   p.overrideAttrs (old: {
+    #     nativeBuildInputs = (old.nativeBuildInputs or []) ++ [pkgs.installShellFiles];
+    #     postInstall =
+    #       (old.postInstall or "")
+    #       + ''
+    #         installShellCompletion --cmd hbrainfuck \
+    #         --bash <("$out/bin/hbrainfuck" --bash-completion-script "$out/bin/hbrainfuck") \
+    #         --fish <("$out/bin/hbrainfuck" --fish-completion-script "$out/bin/hbrainfuck") \
+    #         --zsh  <("$out/bin/hbrainfuck" --zsh-completion-script  "$out/bin/hbrainfuck")
+    #       '';
+    #   });
   };
 
   prop-solveur = mkHaskellPackage {
     name = "prop-solveur";
-    src = pkgs.fetchFromGitea {
-      domain = "git.confusedcompiler.org";
-      owner = "leana8959";
-      repo = "prop_solveur";
-      rev = "814082ed223f77f15484fcd62ab130c7c7ba1b17";
-      hash = "sha256-YNl9n3T0NfPQxbkLo4WVbg9huwAxKy96jQJxzt77z2w=";
-    };
+    src = sources.prop_solveur;
     apply = p:
       p.overrideAttrs (old: {
         nativeBuildInputs = (old.nativeBuildInputs or []) ++ [pkgs.installShellFiles];
diff --git a/nix/sources.json b/nix/sources.json
index 4702fbd6..0da1612f 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -37,6 +37,12 @@
         "url": "https://github.com/edolstra/flake-compat/archive/v1.1.0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "hbrainfuck": {
+        "branch": "mistress",
+        "repo": "https://git.confusedcompiler.org/leana8959/hbrainfuck",
+        "rev": "796aae9bdb222e8e0431627eb11a3e3a71c1ffef",
+        "type": "git"
+    },
     "home-manager": {
         "branch": "release-24.11",
         "description": "Manage a user environment using Nix  [maintainer=@rycee] ",
@@ -163,6 +169,12 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/9d3ae807ebd2981d593cddd0080856873139aa40.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "prop_solveur": {
+        "branch": "mistress",
+        "repo": "https://git.confusedcompiler.org/leana8959/prop_solveur",
+        "rev": "cc2430dc5a396b01d02bd925070ce5d009d05bc4",
+        "type": "git"
+    },
     "url-eater": {
         "branch": "mistress",
         "description": "Clean unnecessary parameters from URLs copied to clipboard",