Unverified Commit ceb7ed5e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 698b4f4f 58c85835
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -6403,6 +6403,15 @@
    githubId = 6074754;
    name = "Hlodver Sigurdsson";
  };
  hmajid2301 = {
    name = "Haseeb Majid";
    email = "hello@haseebmajid.dev";
    github = "hmajid2301";
    githubId = 998807;
    keys = [{
      fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9";
    }];
  };
  hmenke = {
    name = "Henri Menke";
    email = "henri@henrimenke.de";
+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ In addition to numerous new and upgraded packages, this release has the followin

- `graylog` has been updated to version 5, which can not be upgraded directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.

- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.

- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).

- `gajim` has been updated to version 1.7.3 which has disabled legacy ciphers. See [changelog for version 1.7.0](https://dev.gajim.org/gajim/gajim/-/releases/1.7.0).
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ in
    ./bspwm.nix
    ./cwm.nix
    ./clfswm.nix
    ./dk.nix
    ./dwm.nix
    ./e16.nix
    ./evilwm.nix
+27 −0
Original line number Diff line number Diff line
{ config, lib, pkgs, ... }:

let
  cfg = config.services.xserver.windowManager.dk;
in

{
  options = {
    services.xserver.windowManager.dk = {
      enable = lib.mkEnableOption (lib.mdDoc "dk");

      package = lib.mkPackageOptionMD pkgs "dk" { };
    };
  };

  config = lib.mkIf cfg.enable {
    services.xserver.windowManager.session = lib.singleton {
      name = "dk";
      start = ''
        export _JAVA_AWT_WM_NONREPARENTING=1
        ${cfg.package}/bin/dk &
        waitPID=$!
      '';
    };
    environment.systemPackages = [ cfg.package ];
  };
}
+107 −18
Original line number Diff line number Diff line
@@ -11,64 +11,145 @@ let
  ];
in
{
  options = {
    services.logind.extraConfig = mkOption {
  options.services.logind = {
    extraConfig = mkOption {
      default = "";
      type = types.lines;
      example = "IdleAction=lock";
      description = lib.mdDoc ''
        Extra config options for systemd-logind. See
        [
        logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html) for available options.
        Extra config options for systemd-logind.
        See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html)
        for available options.
      '';
    };

    services.logind.killUserProcesses = mkOption {
    killUserProcesses = mkOption {
      default = false;
      type = types.bool;
      description = lib.mdDoc ''
        Specifies whether the processes of a user should be killed
        when the user logs out.  If true, the scope unit corresponding
        to the session and all processes inside that scope will be
        terminated.  If false, the scope is "abandoned" (see
        [systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)), and processes are not killed.
        terminated.  If false, the scope is "abandoned"
        (see [systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)),
        and processes are not killed.

        See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html#KillUserProcesses=)
        for more details.
      '';
    };

    services.logind.lidSwitch = mkOption {
    powerKey = mkOption {
      default = "poweroff";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the power key is pressed.
      '';
    };

    powerKeyLongPress = mkOption {
      default = "ignore";
      example = "reboot";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the power key is long-pressed.
      '';
    };

    rebootKey = mkOption {
      default = "reboot";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the reboot key is pressed.
      '';
    };

    rebootKeyLongPress = mkOption {
      default = "poweroff";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the reboot key is long-pressed.
      '';
    };

    suspendKey = mkOption {
      default = "suspend";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to be done when the laptop lid is closed.
        Specifies what to do when the suspend key is pressed.
      '';
    };

    suspendKeyLongPress = mkOption {
      default = "hibernate";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the suspend key is long-pressed.
      '';
    };

    hibernateKey = mkOption {
      default = "hibernate";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the hibernate key is pressed.
      '';
    };

    services.logind.lidSwitchDocked = mkOption {
    hibernateKeyLongPress = mkOption {
      default = "ignore";
      example = "suspend";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to be done when the laptop lid is closed
        and another screen is added.
        Specifies what to do when the hibernate key is long-pressed.
      '';
    };

    services.logind.lidSwitchExternalPower = mkOption {
    lidSwitch = mkOption {
      default = "suspend";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the laptop lid is closed.
      '';
    };

    lidSwitchExternalPower = mkOption {
      default = cfg.lidSwitch;
      defaultText = literalExpression "services.logind.lidSwitch";
      example = "ignore";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the laptop lid is closed and the system is
        on external power. By default use the same action as specified in
        services.logind.lidSwitch.
        Specifies what to do when the laptop lid is closed
        and the system is on external power. By default use
        the same action as specified in services.logind.lidSwitch.
      '';
    };

    lidSwitchDocked = mkOption {
      default = "ignore";
      example = "suspend";
      type = logindHandlerType;

      description = lib.mdDoc ''
        Specifies what to do when the laptop lid is closed
        and another screen is added.
      '';
    };
  };
@@ -94,9 +175,17 @@ in
      "systemd/logind.conf".text = ''
        [Login]
        KillUserProcesses=${if cfg.killUserProcesses then "yes" else "no"}
        HandlePowerKey=${cfg.powerKey}
        HandlePowerKeyLongPress=${cfg.powerKeyLongPress}
        HandleRebootKey=${cfg.rebootKey}
        HandleRebootKeyLongPress=${cfg.rebootKeyLongPress}
        HandleSuspendKey=${cfg.suspendKey}
        HandleSuspendKeyLongPress=${cfg.suspendKeyLongPress}
        HandleHibernateKey=${cfg.hibernateKey}
        HandleHibernateKeyLongPress=${cfg.hibernateKeyLongPress}
        HandleLidSwitch=${cfg.lidSwitch}
        HandleLidSwitchDocked=${cfg.lidSwitchDocked}
        HandleLidSwitchExternalPower=${cfg.lidSwitchExternalPower}
        HandleLidSwitchDocked=${cfg.lidSwitchDocked}
        ${cfg.extraConfig}
      '';
    };
Loading