Commit 63730dc4 authored by K900's avatar K900
Browse files

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

parents ea925c76 061032ae

ci/pinned.json

+6 −6
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
      },

      "branch": "nixpkgs-unstable",

      "submodules": false,

      "revision": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0",

      "url": "https://github.com/NixOS/nixpkgs/archive/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0.tar.gz",

      "hash": "06lqp08pfgnsn8kb4kdpjmmjyhj4bgniv7yf9bjczg4kn25l1dz6"

      "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939",

      "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz",

      "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56"

    },

    "treefmt-nix": {

      "type": "Git",
@@ -22,9 +22,9 @@ 
      },

      "branch": "main",

      "submodules": false,

      "revision": "128222dc911b8e2e18939537bed1762b7f3a04aa",

      "url": "https://github.com/numtide/treefmt-nix/archive/128222dc911b8e2e18939537bed1762b7f3a04aa.tar.gz",

      "hash": "1p81chik0sb8aligng579m4h0klnndxv76z0p4gyhr4g3s9cydpw"

      "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",

      "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz",

      "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9"

    }

  },

  "version": 5

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -287,3 +287,5 @@ 
- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.



  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).



- `cloudflare-ddns`: Added package cloudflare-ddns.

maintainers/maintainer-list.nix

+12 −6
Original line number Diff line number Diff line
@@ -23727,6 +23727,12 @@ 
    githubId = 114918019;

    name = "Shourya Goel";

  };

  shokerplz = {

    name = "Ivan Kovalev";

    email = "ivan@ikovalev.nl";

    github = "shokerplz";

    githubId = 28829931;

  };

  shortcord = {

    name = "Short Cord";

    email = "short@shortcord.com";
@@ -26977,6 +26983,12 @@ 
    githubId = 1525767;

    name = "Vaibhav Sagar";

  };

  vaisriv = {

    email = "vai.sriv@icloud.com";

    github = "vaisriv";

    githubId = 46390109;

    name = "Vai";

  };

  valebes = {

    email = "valebes@gmail.com";

    github = "valebes";
@@ -28279,12 +28291,6 @@ 
    githubId = 5121426;

    name = "Albert Safin";

  };

  y0no = {

    email = "y0no@y0no.fr";

    github = "y0no";

    githubId = 2242427;

    name = "Yoann Ono";

  };

  yah = {

    email = "yah@singularpoint.cc";

    github = "wangxiaoerYah";

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 


- [SuiteNumérique Meet](https://github.com/suitenumerique/meet) is an open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React. Available as [services.lasuite-meet](#opt-services.lasuite-meet.enable).



- [Prometheus Storagebox Exporter](https://github.com/fleaz/prometheus-storagebox-exporter), a Prometheus exporter for Hetzner storage boxes.



- [lemurs](https://github.com/coastalwhite/lemurs), a customizable TUI display/login manager. Available at [services.displayManager.lemurs](#opt-services.displayManager.lemurs.enable).



- [paisa](https://github.com/ananthakumaran/paisa), a personal finance tracker and dashboard. Available as [services.paisa](#opt-services.paisa.enable).

nixos/modules/services/hardware/openrgb.nix

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ in 
      description = "Set server port of openrgb.";

    };



    startupProfile = lib.mkOption {

      type = lib.types.nullOr (lib.types.str);

      default = null;

      description = "The profile file to load from \"/var/lib/OpenRGB\" at startup.";

    };

  };



  config = lib.mkIf cfg.enable {
@@ -61,7 +66,9 @@ in 
      serviceConfig = {

        StateDirectory = "OpenRGB";

        WorkingDirectory = "/var/lib/OpenRGB";

        ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";

        ExecStart =

          "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}"

          + lib.optionalString (builtins.isString cfg.startupProfile) " --profile ${lib.escapeShellArg cfg.startupProfile}";

        Restart = "always";

      };

    };