NixOS 24.11 builds

hm/common.nix

@@ -1,4 +1,7 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, config, lib, labellenixpkgs, ... }:
+let
+  labellepkgs = import labellenixpkgs { inherit (pkgs) system; };
+in
 {
   frogeye.hooks.lock = ''
     ${pkgs.coreutils}/bin/rm -rf "/tmp/cached_pass_$UID"
@@ -191,7 +194,7 @@
       usbutils
       dmidecode
       lshw
-      labelle # Label printer
+      labellepkgs.labelle # Label printer
 
       # Locker
       (pkgs.writeShellApplication {

hm/dev/common.nix

@@ -64,11 +64,11 @@
       ansiblels.enable = config.frogeye.dev.ansible; # Ansible
       bashls.enable = true; # Bash
       jsonls.enable = true; # JSON
-      lua-ls.enable = true; # Lua (for Neovim debugging)
+      lua_ls.enable = true; # Lua (for Neovim debugging)
       perlpls.enable = config.frogeye.dev.perl; # Perl
       phpactor.enable = config.frogeye.dev.php; # PHP
       # Nix
-      nil-ls = {
+      nil_ls = {
         enable = true;
         settings = {
           formatting.command = [ "nixpkgs-fmt" ];

hm/extra/default.nix

@@ -1,4 +1,7 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, onixpkgs, ... }:
+let
+  opkgs = import onixpkgs { inherit (pkgs) system; };
+in
 {
   config = lib.mkIf config.frogeye.extra {
     programs = {
@@ -21,7 +24,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?
@@ -52,7 +55,7 @@
 
       # downloading
       transmission-qt
-    # wine only makes sense on x86_64
+      # wine only makes sense on x86_64
     ] ++ lib.optionals pkgs.stdenv.isx86_64 [
       wine
       # TODO wine-gecko wine-mono lib32-libpulse (?)

hm/git/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, unixpkgs, ... }:
+{ pkgs, lib, config, ... }:
 let
   cfg = config.programs.git;
 in
@@ -82,9 +82,6 @@ in
       };
       jujutsu = {
         enable = true;
-        package = (import unixpkgs {
-          inherit (pkgs) system;
-        }).jujutsu;
         # Current version doesn't have the "none" signing backend
         settings = {
           git = {

hm/scripts/replayGain

@@ -3,7 +3,7 @@
 #! nix-shell -p python3 python3Packages.coloredlogs r128gain
 
 # TODO r128gain is not maintainted anymore
-# 24.05 rsgain replaces it, does the same job as I do with albums
+# rsgain replaces it, does the same job as I do with albums
 
 # Normalisation is done at the default of each program,
 # which is usually -89.0 dB

hm/vim/code.nix

@@ -54,8 +54,7 @@ in
         specs = {
           enable = true;
           min_jump = 5;
-          fader = { builtin = "pulse_fader"; };
-          resizer = { builtin = "shrink_resizer"; };
+          settings.popup.fader = "require('specs').pulse_fader";
         };
 
         # Treesitter

hm/vim/default.nix

@@ -110,8 +110,7 @@
       '';
 
       userCommands = {
-        Reload = { command = "source ${config.xdg.configHome}/nvim/init.lua"; force = false; };
-        # 24.05 force=false was for https://github.com/nix-community/nixvim/issues/954
+        Reload = { command = "source ${config.xdg.configHome}/nvim/init.lua"; };
       };
 
       keymaps = [