fix: adapt to nix-darwin and nixpkgs API changes

- Remove `services.nix-daemon.enable`
  (`nix-darwin` now manages `nix-daemon` unconditionally)
- Rename `security.pam.enableSudoTouchIdAuth` to
  `security.pam.services.sudo_local.touchIdAuth`
- Replace `system.activationScripts.preUserActivation`
  and `postUserActivation` with `extraActivation`
- Rename `homebrew.brewPrefix` to `homebrew.prefix`
  and remove deprecated `lockfiles` option
- Add `system.primaryUser` to `limonka` config
- Remove duplicate `security.pam` and
  `services.nix-daemon` settings from `limonka`
- Replace `sbarlua.passthru.luaPackages` with
  `sbarlua.passthru.luaModule.pkgs` and
  `sbarlua.moduleDir` with `lib/lua/` path
- Rename removed/moved nixpkgs packages:
  - `fennel` -> `luaPackages.fennel`
  - `graalvm-ce` -> `graalvmPackages.graalvm-ce`
  - `mpv-cheatsheet` -> `mpv-cheatsheet-ng`
  - `pkgs.custom.swww` -> `pkgs.swww` (now in nixpkgs)
- Set `services.transmission.package`
  to `pkgs.transmission_4` explicitly
- Use `pkgs.custom.*` for custom packages that need
  quoted attribute names
  (`vim-fmi-cli`, `fennel-language-server`)

Author: reo101

hosts/nix-darwin/limonka/configuration.nix

@@ -10,9 +10,6 @@
 
   # environment.darwinConfig = builtins.toString ./configuration.nix;
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
   nix = {
     # Ensure we can work with flakes
     # TODO: add to `README.md`
@@ -65,6 +62,9 @@
     nerd-fonts.fira-code
   ];
 
+  # Required for nix-darwin options that apply to a specific user
+  system.primaryUser = "pavelatanasov";
+
   reo101 = {
     system = {
       enable = true;
@@ -81,9 +81,6 @@
   system.keyboard.enableKeyMapping = true;
   system.keyboard.remapCapsLockToEscape = true;
 
-  # Add ability to used TouchID for sudo authentication
-  security.pam.services.sudo_local.touchIdAuth = true;
-
   # Used for backwards compatibility, please read the changelog before changing.
   # > darwin-rebuild changelog
   system.stateVersion = 4;

hosts/nix-darwin/limonka/home/pavelatanasov.nix

@@ -41,7 +41,7 @@
     # }))
     (pkgs.writeShellScriptBin "lua" "exec -a $0 ${luajitPackages.nlua}/bin/nlua $@")
     # luajitPackages.nlua
-    fennel
+    luaPackages.fennel
     # fennel-language-server
     fennel-ls
     git
@@ -73,7 +73,7 @@
     himalaya
 
     # Java
-    graalvm-ce
+    graalvmPackages.graalvm-ce
 
     # SSH and GPG
     openssh
@@ -87,7 +87,7 @@
     google-cloud-sdk
 
     # FMI
-    vim-fmi-cli
+    pkgs.custom.vim-fmi-cli
 
     # Zig
     zigpkgs.master

hosts/nixos/gomi/homeModules/mpv.nix

@@ -17,7 +17,7 @@
       mpris
       thumbfast
       sponsorblock
-      mpv-cheatsheet
+      mpv-cheatsheet-ng
       mpv-discord
       # NOTE: Anki cards
       mpvacious

hosts/nixos/gomi/homeModules/niri.nix

@@ -12,7 +12,7 @@
 
   services.swww = {
     enable = true;
-    package = pkgs.custom.swww;
+    package = pkgs.swww;
   };
 
   programs.niri = {

hosts/nixos/homix/configuration.nix

@@ -219,6 +219,7 @@
   ### Transmission
   services.transmission = {
     enable = true;
+    package = pkgs.transmission_4;
   };
 
   # Open ports in the firewall.

hosts/nixos/homix/home/reo101.nix

@@ -32,7 +32,7 @@
 
     ## Core
     neovim
-    fennel-language-server
+    pkgs.custom.fennel-language-server
     git
     gnupg
     firefox
@@ -69,7 +69,7 @@
     pkg-config
 
     ## Vim FMI
-    vim-fmi-cli
+    pkgs.custom.vim-fmi-cli
 
     ## Zig
     # zigpkgs."0.10.1"

modules/nix-darwin/brew/default.nix

@@ -16,11 +16,11 @@ in
 
   config = mkIf cfg.enable {
     # Requires Homebrew to be installed
-    system.activationScripts.preUserActivation.text = ''
+    system.activationScripts.extraActivation.text = ''
       if ! xcode-select --version 2>/dev/null; then
         $DRY_RUN_CMD xcode-select --install
       fi
-      if ! ${config.homebrew.brewPrefix}/brew --version 2>/dev/null; then
+      if ! ${config.homebrew.prefix}/bin/brew --version 2>/dev/null; then
         $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
       fi
     '';
@@ -34,7 +34,6 @@ in
       };
       global = {
         brewfile = true; # Run brew bundle from anywhere
-        lockfiles = false; # Don't save lockfile (since running from anywhere)
       };
       taps = [
         "homebrew/cask-fonts"

modules/nix-darwin/system/default.nix

@@ -17,7 +17,6 @@ in
 
   config = mkIf cfg.enable {
 
-    services.nix-daemon.enable = true;
     # programs.nix-index.enable = true;
 
     environment.systemPackages = [
@@ -29,7 +28,7 @@ in
       pkgs.nushell
     ];
 
-    security.pam.enableSudoTouchIdAuth = true;
+    security.pam.services.sudo_local.touchIdAuth = true;
 
     system = {
       startup = {
@@ -199,8 +198,8 @@ in
         ${inputs.mac-app-util.packages.${pkgs.stdenv.system}.default}/bin/mac-app-util sync-trampolines "/Applications/Nix Apps" "/Applications/Nix Trampolines"
       '';
 
-      # User-level settings
-      activationScripts.postUserActivation.text = ''
+      # User-level settings (merged into postActivation since all activation now runs as root)
+      activationScripts.extraActivation.text = ''
         echo "Show the ~/Library folder"
         chflags nohidden ~/Library
 

modules/nix-darwin/yabai/sketchybar/fennel.nix

@@ -7,12 +7,13 @@
 , ...
 }:
 let
-  lua = sbarlua.passthru.luaPackages.lua;
-  fennel = sbarlua.passthru.luaPackages.fennel;
+  luaPkgs = sbarlua.passthru.luaModule.pkgs;
+  lua = luaPkgs.lua;
+  fennel = luaPkgs.fennel;
 in
   writeShellScriptBin "sketchybar-config" ''
     ${lib.getExe' fennel "fennel"} \
-      --add-package-cpath "${sbarlua}/${sbarlua.moduleDir}/?.so" \
+      --add-package-cpath "${sbarlua}/lib/lua/${sbarlua.luaModule.luaversion}/?.so" \
       --add-fennel-path "${./config}/?.fnl" \
       --add-fennel-path "${./config}/?/init.fnl" \
       ${./config}/init.fnl