flake.nix

@@ -4,7 +4,8 @@
   inputs = {
     # Packages
     nixpkgs.url = "nixpkgs/nixos-24.11";
-    jjuinixpkgs.url = "github:Adda0/nixpkgs/jjui"; # Testing PR
+    onixpkgs.url = "nixpkgs/64b80bfb316b57cdb8919a9110ef63393d74382a";
+    unixpkgs.url = "nixpkgs/master";
     labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies
     # OS
     disko = {

hm/extra/default.nix

@@ -2,8 +2,12 @@
   pkgs,
   lib,
   config,
+  onixpkgs,
   ...
 }:
+let
+  opkgs = import onixpkgs { inherit (pkgs) system; };
+in
 {
   config = lib.mkIf config.frogeye.extra {
     programs = {
@@ -29,7 +33,7 @@
 
           # Communication
           signal-desktop
-          (pkgs.callPackage ./whisperx.nix { }) # Transcribe voice messages
+          (opkgs.callPackage ./whisperx.nix { }) # Transcribe voice messages
 
           # downloading
           # transmission TODO Collision if both transmissions are active?

hm/extra/whisperx.nix

@@ -1,15 +1,15 @@
 {
   pkgs ? import <nixpkgs> { },
 }:
-pkgs.python3Packages.buildPythonPackage rec {
+pkgs.python3Packages.buildPythonPackage {
   pname = "whisperx";
-  version = "3.2.0";
+  version = "2024-08-19";
   # pypi doesn't have the requirements.txt file, and it's required
   src = pkgs.fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
-    rev = "v${version}"; # git doesn't have tags
-    hash = "sha256-JQvyR9JW8OiSRI0eywTyWB4VMXmu6cTpBekBWonoJa4=";
+    rev = "9e3a9e0e38fcec1304e1784381059a0e2c670be5"; # git doesn't have tags
+    hash = "sha256-IVtn9fe/yi4+fbH57s9LoiREnMZ2nhEObp1a4R/7gHg=";
   };
   pyproject = true;
   dependencies = [
@@ -29,12 +29,6 @@ pkgs.python3Packages.buildPythonPackage rec {
     pkgs.python3Packages.pandas
     pkgs.python3Packages.nltk
   ];
-  pythonRelaxDeps = true;
-  # torchaudio: 2.5.1a0 is >=2, despite dependency check saying otherwise
-  # ctranslate2: was pinned to 4.4.0 to fix some nvidia pinning issue or whatnot
-  # pyannote-audio: not sure what pins this to 3.1.1, but 3.3.1 works fine
-  # For some reason pyannote-audio doesn't get relaxed when listed in a pythonRelaxDeps array,
-  # hence why using true
   build-system = [
     pkgs.python3Packages.setuptools
   ];

hm/git/default.nix

@@ -2,18 +2,15 @@
   pkgs,
   lib,
   config,
-  jjuinixpkgs,
   ...
 }:
 let
   cfg = config.programs.git;
-  jjuipkgs = import jjuinixpkgs { inherit (pkgs) system; };
 in
 {
   config = lib.mkIf cfg.enable {
     home.packages = [
-      jjuipkgs.jjui
-      pkgs.lazyjj
+      (pkgs.callPackage ./jjui.nix { })
       (pkgs.writeShellApplication {
         name = "git-sync";
         text = (

hm/git/jjui.nix

@@ -0,0 +1,21 @@
+{ buildGoModule, fetchFromGitHub }:
+buildGoModule {
+  pname = "jjui";
+  version = "2024-11-28";
+
+  src = fetchFromGitHub {
+    owner = "GeoffreyFrogeye";
+    repo = "jjui";
+    rev = "push-sszqvsmvqxmy"; # base16 colors
+    sha256 = "sha256-jNi5Ek3Qy/MojlQXBNlqREy7UxnyMaJuUtKPysWBoNU=";
+  };
+
+  vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI=";
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/jjui
+  '';
+
+  doCheck = false; # Some tests are not working
+
+}

os/wireless/default.nix

@@ -53,38 +53,24 @@ in
     })
   ];
   # wireless support via wpa_supplicant
-  networking = {
-    # Tell the time synchronisation service when we got/lost the connection
-    dhcpcd.runHook = ''
-      if $if_up; then
-          ${config.services.chrony.package}/bin/chronyc online
-      elif $if_down; then
-          ${config.services.chrony.package}/bin/chronyc offline
-      fi
+  networking.wireless = {
+    enable = true;
+    extraConfig = ''
+      country=NL
     '';
-
-    wireless = {
-      enable = true;
-      extraConfig = ''
-        country=NL
-      '';
-      # Public wireless networks
-      networks = lib.genAttrs [
-        "EurostarTrainsWiFi"
-        "_SNCF gare-gratuit"
-        "_SNCF_WIFI_INOUI"
-        "Wifi in de trein"
-        "WiFi in de trein"
-        "_WIFI_LYRIA"
-        "WIFIonICE"
-      ] (ssid: { });
-      userControlled.enable = true; # Allow some control with wpa_cli
-    };
+    # Public wireless networks
+    networks = lib.genAttrs [
+      "EurostarTrainsWiFi"
+      "_SNCF gare-gratuit"
+      "_SNCF_WIFI_INOUI"
+      "Wifi in de trein"
+      "WiFi in de trein"
+      "_WIFI_LYRIA"
+      "WIFIonICE"
+    ] (ssid: { });
+    userControlled.enable = true; # Allow some control with wpa_cli
   };
-
-  # Wait until there's a connection to fetch time
   services.chrony.serverOption = "offline";
-
   systemd.services.wifi_apply = {
     after = [ "wpa_supplicant.service" ];
     wantedBy = [ "wpa_supplicant.service" ];