From 0b3a851a5777ded33dd9013e7483efafc414b713 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Thu, 8 May 2025 23:52:05 +0200
Subject: [PATCH] common.nix: make fish binaries high-priority

---
 hosts/common.nix | 73 ++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/hosts/common.nix b/hosts/common.nix
index 17b8626..999772c 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -3,44 +3,51 @@
 # since these also get installed to server,
 # which should have a small attack surface.
 {
+  lib,
   self,
   pkgs,
   ...
 }: let
+  inherit (lib.meta) hiPrioSet;
   inherit (self.packages.${pkgs.stdenv.system}) wrapped-helix fish;
 in {
-  environment.systemPackages = builtins.attrValues {
-    inherit
-      (pkgs)
-      cachix
-      calc
-      difftastic
-      eza
-      gcc
-      git
-      httpie
-      inetutils
-      jujutsu
-      just
-      lazygit
-      linuxHeaders
-      neofetch
-      microfetch
-      mprocs
-      nmap
-      polkit
-      ripgrep
-      smartmontools
-      television
-      trash-cli
-      util-linux
-      w3m
-      wireguard-tools
-      zip
-      zoxide
-      ;
-    inherit wrapped-helix fish;
-  };
+  environment.systemPackages =
+    builtins.attrValues {
+      inherit
+        (pkgs)
+        cachix
+        calc
+        delta
+        difftastic
+        eza
+        gcc
+        git
+        httpie
+        inetutils
+        jujutsu
+        just
+        lazygit
+        linuxHeaders
+        neofetch
+        microfetch
+        mprocs
+        nmap
+        polkit
+        ripgrep
+        smartmontools
+        television
+        trash-cli
+        util-linux
+        uutils-coreutils-noprefix
+        w3m
+        wireguard-tools
+        zip
+        zoxide
+        ;
+    }
+    ++ builtins.attrValues (hiPrioSet {
+      inherit wrapped-helix fish;
+    });
   # helix as the only editor, a reasonable choice.
-  environment.sessionVariables.EDITOR =  "hx";
+  environment.sessionVariables.EDITOR = "hx";
 }