Merge branch 'nix-community:master' into repeat_kdl_nodes

2024-09-20 06:21:57 +00:00 · 2024-08-28 20:39:36 +02:00 · 2024-08-28 20:39:36 +02:00 · 9fef6ccf23
commit 9fef6ccf23
parent 7b5f3727de c2cd2a52e0
12 changed files with 76 additions and 33 deletions
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1722185531,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
--- a/home-manager/po/ca.po
+++ b/home-manager/po/ca.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-04-05 11:01+0000\n"
-"Last-Translator: Leix b <abone9999@gmail.com>\n"
+"PO-Revision-Date: 2024-08-07 17:09+0000\n"
+"Last-Translator: Tomi Ockier <ockier1@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/cli/"
 "ca/>\n"
 "Language: ca\n"
@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.7-dev\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%: falta un argument per %s"

 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
--- a/modules/misc/submodule-support.nix
+++ b/modules/misc/submodule-support.nix
@ -29,4 +29,19 @@ with lib;
      '';
    };
  };
+
+  config = {
+    # To make it easier for the end user to override the values in the
+    # configuration depending on the installation method, we set default values
+    # for the arguments that are defined in the NixOS/nix-darwin modules.
+    #
+    # Without these defaults, these attributes would simply not exist, and the
+    # module system can not inform modules about their non-existence; see
+    # https://github.com/NixOS/nixpkgs/issues/311709#issuecomment-2110861842
+    _module.args = {
+      osConfig = mkDefault null;
+      nixosConfig = mkDefault null;
+      darwinConfig = mkDefault null;
+    };
+  };
 }
--- a/modules/po/hu.po
+++ b/modules/po/hu.po
@ -8,29 +8,32 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2024-08-23 14:09+0000\n"
+"Last-Translator: Szabin Hamrik <h.szabin@gmail.com>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
+"modules/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.7.1-dev\n"

 #: modules/files.nix:191
 msgid "Creating home file links in %s"
-msgstr ""
+msgstr "Hivatkozások létrehozása itt: %s"

 #: modules/files.nix:204
 msgid "Cleaning up orphan links from %s"
-msgstr ""
+msgstr "Árva hivatkozások kitakarítása innen: %s"

 #: modules/files.nix:220
 msgid "Creating profile generation %s"
-msgstr ""
+msgstr "%s. profil generáció létrehozása"

 #: modules/files.nix:237
 msgid "No change so reusing latest profile generation %s"
-msgstr ""
+msgstr "Nincs változás, legutóbbi %s. generáció lesz használva"

 #: modules/home-environment.nix:634
 msgid ""
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@ -29,6 +29,8 @@ in {
    programs.bash = {
      enable = mkEnableOption "GNU Bourne-Again SHell";

+      package = mkPackageOption pkgs "bash" { default = "bashInteractive"; };
+
      enableCompletion = mkOption {
        type = types.bool;
        default = true;
@ -190,7 +192,7 @@ in {
        HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore);
      }));
  in mkIf cfg.enable {
-    home.packages = [ pkgs.bashInteractive ];
+    home.packages = [ cfg.package ];

    home.file.".bash_profile".source = writeBashScript "bash_profile" ''
      # include .profile if it exists
--- a/modules/programs/fastfetch.nix
+++ b/modules/programs/fastfetch.nix
@ -26,7 +26,9 @@ in {
            };
          };
          display = {
-            binaryPrefix = "si";
+            size = {
+              binaryPrefix = "si";
+            };
            color = "blue";
            separator = "  ";
          };
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@ -34,6 +34,21 @@ let

  historyModule = types.submodule ({ config, ... }: {
    options = {
+      append = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If set, zsh sessions will append their history list to the history
+          file, rather than replace it. Thus, multiple parallel zsh sessions
+          will all have the new entries from their history lists added to the
+          history file, in the order that they exit.
+
+          This file will still be periodically re-written to trim it when the
+          number of lines grows 20% beyond the value specified by
+          `programs.zsh.history.save`.
+        '';
+      };
+
      size = mkOption {
        type = types.int;
        default = 10000;
@ -669,6 +684,7 @@ in
        mkdir -p "$(dirname "$HISTFILE")"

        setopt HIST_FCNTL_LOCK
+        ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY
        ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
        ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS
        ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@ -65,9 +65,8 @@ in {
      };

      configFile = mkOption {
-        type = with types; either str path;
-        default = "${config.xdg.configHome}/dunst/dunstrc";
-        defaultText = "$XDG_CONFIG_HOME/dunst/dunstrc";
+        type = with types; nullOr (either str path);
+        default = null;
        description = ''
          Path to the configuration file read by dunst.

@ -170,7 +169,7 @@ in {
          "stock"
        ];

-        mkPath = { basePath, theme, category }:
+        mkPath = { basePath, theme, category, }:
          "${basePath}/share/icons/${theme.name}/${theme.size}/${category}";
      in concatMapStringsSep ":" mkPath (cartesianProduct {
        basePath = basePaths;
@ -188,7 +187,9 @@ in {
        Service = {
          Type = "dbus";
          BusName = "org.freedesktop.Notifications";
-          ExecStart = "${cfg.package}/bin/dunst -config ${cfg.configFile}";
+          ExecStart = escapeShellArgs ([ "${cfg.package}/bin/dunst" ] ++
+            # Using `-config` breaks dunst's drop-ins, so only use it when an alternative path is set
+            optionals (cfg.configFile != null) [ "-config" cfg.configFile ]);
          Environment = optionalString (cfg.waylandDisplay != "")
            "WAYLAND_DISPLAY=${cfg.waylandDisplay}";
        };
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@ -183,7 +183,7 @@ in {
        default = "suggest";
        type = with types;
          either bool (enum [ "suggest" "legacy" "sd-switch" ]);
-        apply = p: if isBool p then if p then "legacy" else "suggest" else p;
+        apply = p: if isBool p then if p then "sd-switch" else "suggest" else p;
        description = ''
          Whether new or changed services that are wanted by active targets
          should be started. Additionally, stop obsolete services from the
@ -196,17 +196,15 @@ in {
            {command}`systemctl` commands to run. You will have to
            manually run those commands after the switch.

-          `legacy` (or `true`)
+          `legacy`
          : Use a Ruby script to, in a more robust fashion, determine the
            necessary changes and automatically run the
-            {command}`systemctl` commands.
+            {command}`systemctl` commands. Note, this alternative will soon
+            be removed.

-          `sd-switch`
-          : Use sd-switch, a third party application, to perform the service
-            updates. This tool offers more features while having a small
-            closure size. Note, it requires a fully functional user D-Bus
-            session. Once tested and deemed sufficiently robust, this will
-            become the default.
+          `sd-switch` (or `true`)
+          : Use sd-switch, a tool that determines the necessary changes and
+            automatically apply them.
        '';
      };

@ -299,6 +297,12 @@ in {
      message = "This module is only available on Linux.";
    }];

+    warnings = lib.optional (cfg.startServices == "legacy") ''
+      Having 'systemd.user.startServices = "legacy"' is deprecated and will soon be removed.
+
+      Please change to 'systemd.user.startServices = true' to use the new systemd unit switcher (sd-switch).
+    '';
+
    xdg.configFile = mkMerge [
      (lib.listToAttrs ((buildServices "service" cfg.services)
        ++ (buildServices "slice" cfg.slices)
--- a/tests/integration/nixos/basics.nix
+++ b/tests/integration/nixos/basics.nix
@ -33,7 +33,7 @@
      machine.send_chars("alice\n")
      machine.wait_until_tty_matches("1", "Password: ")
      machine.send_chars("foobar\n")
-      machine.wait_until_tty_matches("1", "alice\@machine")
+      machine.wait_until_tty_matches("1", "alice\\@machine")

    def logout_alice():
      machine.send_chars("exit\n")
--- a/tests/integration/standalone/flake-basics.nix
+++ b/tests/integration/standalone/flake-basics.nix
@ -32,7 +32,7 @@
      machine.send_chars("alice\n")
      machine.wait_until_tty_matches("1", "Password: ")
      machine.send_chars("foobar\n")
-      machine.wait_until_tty_matches("1", "alice\@machine")
+      machine.wait_until_tty_matches("1", "alice\\@machine")

    def logout_alice():
      machine.send_chars("exit\n")
--- a/tests/integration/standalone/standard-basics.nix
+++ b/tests/integration/standalone/standard-basics.nix
@ -27,7 +27,7 @@
      machine.send_chars("alice\n")
      machine.wait_until_tty_matches("1", "Password: ")
      machine.send_chars("foobar\n")
-      machine.wait_until_tty_matches("1", "alice\@machine")
+      machine.wait_until_tty_matches("1", "alice\\@machine")

    def logout_alice():
      machine.send_chars("exit\n")