Unverified Commit df490f67 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents d38d6c2c c3d339e5
Loading
Loading
Loading
Loading
+25 −25
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ busted,,,,,,
busted-htest,,,,,,mrcjkb
cassowary,,,,,,alerque
cldr,,,,,,alerque
commons.nvim,,,,,,mrcjkb
commons.nvim,,,,,5.1,mrcjkb
compat53,,,,,,vcunat
cosmo,,,,,,
coxpcall,,,,1.17.0-1,,
@@ -19,19 +19,19 @@ datafile,,,,,,
digestif,,,,,5.3,
dkjson,,,,,,
fennel,,,,,,misterio77
fidget.nvim,,,,,,mrcjkb
fidget.nvim,,,,,5.1,mrcjkb
fifo,,,,,,
fluent,,,,,,alerque
funnyfiles.nvim,,,,,,mrcjkb
funnyfiles.nvim,,,,,5.1,mrcjkb
fzf-lua,,,,,,mrcjkb
fzy,,,,,,mrcjkb
gitsigns.nvim,,,,,5.1,
grug-far.nvim,,,,,,teto
haskell-tools.nvim,,,,,,mrcjkb
grug-far.nvim,,,,,5.1,teto
haskell-tools.nvim,,,,,5.1,mrcjkb
http,,,,0.4-0,,vcunat
image.nvim,,,,,,teto
image.nvim,,,,,5.1,teto
inspect,,,,,,
jsregexp,,,,,,
jsregexp,,,,0.0.7-2,,
ldbus,,,https://luarocks.org/dev,,,
ldoc,,,,,,
lgi,,,,,,
@@ -48,7 +48,7 @@ lrexlib-gnu,,,,,,
lrexlib-oniguruma,,,,,,junestepp
lrexlib-pcre,,,,,,
lrexlib-posix,,,,,,
lsp-progress.nvim,,,,,,gepbird
lsp-progress.nvim,,,,,5.1,gepbird
lua-cjson,,,,,,
lua-cmsgpack,,,,,,
lua-curl,,,,,,
@@ -120,29 +120,29 @@ mimetypes,,,,,,
mini.test,,,,,,
moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn
mpack,,,,,,
neorg,,,,,,GaetanLepage
neorg,,,,,5.1,GaetanLepage
neorg-interim-ls,,,,,,
neotest,,,,,,mrcjkb
neotest,,,,,5.1,mrcjkb
nlua,,,,,,teto
nui.nvim,,,,,,mrcjkb
nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,,
nvim-nio,,,,,,mrcjkb
nvim-web-devicons,,,,,,
oil.nvim,,,,,,
orgmode,,,,,,
papis.nvim,,,,,,GaetanLepage
pathlib.nvim,,,,,,
nui.nvim,,,,,5.1,mrcjkb
nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,5.1,
nvim-nio,,,,,5.1,mrcjkb
nvim-web-devicons,,,,,5.1,
oil.nvim,,,,,5.1,
orgmode,,,,,5.1,
papis.nvim,,,,,5.1,GaetanLepage
pathlib.nvim,,,,,5.1,
penlight,,,,,,alerque
plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plenary.nvim-scm-1.rockspec,,,,5.1,
psl,,,,0.3,,
rapidjson,,,,,,
rest.nvim,,,,,5.1,teto
rocks-config.nvim,,,,,,mrcjkb
rocks-dev.nvim,,,,,,mrcjkb
rocks-git.nvim,,,,,,mrcjkb
rocks.nvim,,,,,,mrcjkb
rtp.nvim,,,,,,mrcjkb
rustaceanvim,,,,,,mrcjkb
rocks-config.nvim,,,,,5.1,mrcjkb
rocks-dev.nvim,,,,,5.1,mrcjkb
rocks-git.nvim,,,,,5.1,mrcjkb
rocks.nvim,,,,,5.1,mrcjkb
rtp.nvim,,,,,5.1,mrcjkb
rustaceanvim,,,,,5.1,mrcjkb
say,,,,,,
serpent,,,,,,lockejan
sofa,,,,,,f4z3r
@@ -150,7 +150,7 @@ sqlite,,,,,,
std._debug,,,,,,
std.normalize,,,,,,
stdlib,,,,41.2.2,,
teal-language-server,,,,,,
teal-language-server,,,,0.0.5-1,,
telescope-manix,,,,,,
telescope.nvim,,,,,5.1,
tiktoken_core,,,,,,natsukium
+0 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,6 @@
  ./services/networking/cato-client.nix
  ./services/networking/centrifugo.nix
  ./services/networking/cgit.nix
  ./services/networking/charybdis.nix
  ./services/networking/chisel-server.nix
  ./services/networking/cjdns.nix
  ./services/networking/clatd.nix
+14 −16
Original line number Diff line number Diff line
@@ -30,17 +30,14 @@ let

  optionalPackages =
    optionals cfg.enableSystemMonitoring [ pkgs.dgop ]
    ++ optionals cfg.enableClipboard [
      pkgs.cliphist
      pkgs.wl-clipboard
    ]
    ++ optionals cfg.enableVPN [
      pkgs.glib
      pkgs.networkmanager
    ]
    ++ optional cfg.enableDynamicTheming pkgs.matugen
    ++ optional cfg.enableAudioWavelength pkgs.cava
    ++ optional cfg.enableCalendarEvents pkgs.khal;
    ++ optional cfg.enableCalendarEvents pkgs.khal
    ++ optional cfg.enableClipboardPaste pkgs.wtype;
in
{
  imports = [
@@ -49,6 +46,7 @@ in
    (lib.mkRemovedOptionModule (
      path ++ [ "enableSystemSound" ]
    ) "qtmultimedia is now included on dms-shell package.")
    (lib.mkRemovedOptionModule (path ++ [ "enableClipboard" ]) builtInRemovedMsg)
  ];

  options.programs.dms-shell = {
@@ -99,17 +97,6 @@ in
      '';
    };

    enableClipboard = mkOption {
      type = types.bool;
      default = true;
      description = ''
        Whether to install dependencies required for clipboard management widgets.
        This enables clipboard history and clipboard manager functionality.

        Requires: cliphist, wl-clipboard
      '';
    };

    enableVPN = mkOption {
      type = types.bool;
      default = true;
@@ -154,6 +141,17 @@ in
      '';
    };

    enableClipboardPaste = mkOption {
      type = types.bool;
      default = true;
      description = ''
        Whether to install dependencies required for pasting directly from the clipboard history support.
        This enables pressing Shift+Return for pasting entries from the clipboard history.

        Requires: wtype
      '';
    };

    quickshell = {
      package = mkPackageOption pkgs "quickshell" { };
    };
+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ in
      "cgmanager"
      "enable"
    ] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.")
    (mkRemovedOptionModule [
      "services"
      "charybdis"
    ] "The charybdis module has been removed, the project was archived in 2021.")
    (mkRemovedOptionModule [
      "services"
      "chatgpt-retrieval-plugin"
+0 −126
Original line number Diff line number Diff line
{
  config,
  lib,
  pkgs,
  ...
}:

let
  inherit (lib)
    mkEnableOption
    mkIf
    mkOption
    singleton
    types
    ;
  inherit (pkgs) coreutils charybdis;
  cfg = config.services.charybdis;

  configFile = pkgs.writeText "charybdis.conf" ''
    ${cfg.config}
  '';
in

{

  ###### interface

  options = {

    services.charybdis = {

      enable = mkEnableOption "Charybdis IRC daemon";

      config = mkOption {
        type = types.str;
        description = ''
          Charybdis IRC daemon configuration file.
        '';
      };

      statedir = mkOption {
        type = types.path;
        default = "/var/lib/charybdis";
        description = ''
          Location of the state directory of charybdis.
        '';
      };

      user = mkOption {
        type = types.str;
        default = "ircd";
        description = ''
          Charybdis IRC daemon user.
        '';
      };

      group = mkOption {
        type = types.str;
        default = "ircd";
        description = ''
          Charybdis IRC daemon group.
        '';
      };

      motd = mkOption {
        type = types.nullOr types.lines;
        default = null;
        description = ''
          Charybdis MOTD text.

          Charybdis will read its MOTD from /etc/charybdis/ircd.motd .
          If set, the value of this option will be written to this path.
        '';
      };

    };

  };

  ###### implementation

  config = mkIf cfg.enable (
    lib.mkMerge [
      {
        users.users.${cfg.user} = {
          description = "Charybdis IRC daemon user";
          uid = config.ids.uids.ircd;
          group = cfg.group;
        };

        users.groups.${cfg.group} = {
          gid = config.ids.gids.ircd;
        };

        systemd.tmpfiles.settings."10-charybdis".${cfg.statedir}.d = {
          inherit (cfg) user group;
        };

        environment.etc."charybdis/ircd.conf".source = configFile;

        systemd.services.charybdis = {
          description = "Charybdis IRC daemon";
          wantedBy = [ "multi-user.target" ];
          reloadIfChanged = true;
          restartTriggers = [
            configFile
          ];
          environment = {
            BANDB_DBPATH = "${cfg.statedir}/ban.db";
          };
          serviceConfig = {
            ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile /etc/charybdis/ircd.conf";
            ExecReload = "${coreutils}/bin/kill -HUP $MAINPID";
            Group = cfg.group;
            User = cfg.user;
          };
        };

      }

      (mkIf (cfg.motd != null) {
        environment.etc."charybdis/ircd.motd".text = cfg.motd;
      })
    ]
  );
}
Loading