Commit b2dfadf1 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/staging-next' into staging

parents 0a07ae8d d39406e5
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -3510,12 +3510,6 @@
    githubId = 52386117;
    name = "Blusk";
  };
  bmanuel = {
    name = "Benjamin Manuel";
    email = "ben@benmanuel.com";
    github = "bmanuel";
    githubId = 3662307;
  };
  bmilanov = {
    name = "Biser Milanov";
    email = "bmilanov11+nixpkgs@gmail.com";
@@ -4775,6 +4769,12 @@
    name = "Alex Zero";
    keys = [ { fingerprint = "A0AA 4646 B8F6 9D45 4553  5A88 A515 50ED B450 302C"; } ];
  };
  cizniarova = {
    email = "gabriel.hosquet@epitech.eu";
    github = "Ciznia";
    githubId = 114656678;
    name = "Gabriel Hosquet";
  };
  cizra = {
    email = "todurov+nix@gmail.com";
    github = "cizra";
@@ -15491,6 +15491,11 @@
    githubId = 1809783;
    name = "Marco Maggesi";
  };
  magicquark = {
    name = "magicquark";
    github = "magicquark";
    githubId = 198001825;
  };
  magistau = {
    name = "Mg. Tau";
    email = "nix@alice-carroll.pet";
+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@

- [Sshwifty](https://github.com/nirui/sshwifty), a Telnet and SSH client for your browser. Available as [services.sshwifty](#opt-services.sshwifty.enable).

- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`.

## Backward Incompatibilities {#sec-release-25.11-incompatibilities}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -168,6 +170,8 @@

- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.

- `programs.skim.fuzzyCompletions` has been removed in favor of adding the completions to the package itself.

- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
  - The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
  - The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.
+1 −0
Original line number Diff line number Diff line
@@ -1803,6 +1803,7 @@
  ./system/activation/activatable-system.nix
  ./system/activation/activation-script.nix
  ./system/activation/bootspec.nix
  ./system/activation/nixos-init.nix
  ./system/activation/pre-switch-check.nix
  ./system/activation/specialisation.nix
  ./system/activation/switchable-system.nix
+17 −18
Original line number Diff line number Diff line
@@ -8,36 +8,35 @@ let
  inherit (lib)
    mkEnableOption
    mkPackageOption
    optional
    mkRemovedOptionModule
    optionalString
    mkIf
    ;
  cfg = config.programs.skim;
in
{
  imports = [
    (mkRemovedOptionModule [ "programs" "skim" "fuzzyCompletion" ]
      "programs.skim.fuzzyCompletion has been removed. Completions are now included in the package itself."
    )
  ];

  options = {
    programs.skim = {
      fuzzyCompletion = mkEnableOption "fuzzy completion with skim";
      enable = mkEnableOption "skim fuzzy finder";
      keybindings = mkEnableOption "skim keybindings";
      package = mkPackageOption pkgs "skim" { };
    };
  };

  config = {
    environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) cfg.package;
  config = mkIf cfg.enable {
    environment.systemPackages = [ cfg.package ];

    programs.bash.interactiveShellInit =
      optionalString cfg.fuzzyCompletion ''
        source ${cfg.package}/share/skim/completion.bash
      ''
      + optionalString cfg.keybindings ''
    programs.bash.interactiveShellInit = optionalString cfg.keybindings ''
      source ${cfg.package}/share/skim/key-bindings.bash
    '';

    programs.zsh.interactiveShellInit =
      optionalString cfg.fuzzyCompletion ''
        source ${cfg.package}/share/skim/completion.zsh
      ''
      + optionalString cfg.keybindings ''
    programs.zsh.interactiveShellInit = optionalString cfg.keybindings ''
      source ${cfg.package}/share/skim/key-bindings.zsh
    '';

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ let
      comment = list.description;
    };
  payloads = map makePayload cfg.lists;
  macvendorURL = lib.strings.escapeShellArg cfg.macvendorURL;
in
''
  # Can't use -u (unset) because api.sh uses API_URL before it is set
@@ -22,8 +23,10 @@ in
  pihole="${lib.getExe pihole}"
  jq="${lib.getExe pkgs.jq}"

  ${lib.getExe pkgs.curl} --retry 3 --retry-delay 5 "${macvendorURL}" -o "${cfg.settings.files.macvendor}" || echo "Failed to download MAC database from ${macvendorURL}"

  # If the database doesn't exist, it needs to be created with gravity.sh
  if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then
  if [ ! -f '${cfg.settings.files.gravity}' ]; then
    $pihole -g
    # Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one
    ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
Loading