i3status-rust: deprecate icons and theme options

Signed-off-by: Sumner Evans <me@sumnerevans.com>
lib: add functions to create DAGs from lists
2026-01-11 17:39:37 +08:00 · 2023-06-05 23:03:31 -06:00 · 2023-06-05 23:08:30 +02:00 · 2023-06-05 23:08:29 +02:00 · 2023-06-05 22:46:18 +02:00 · 2023-06-04 15:23:23 +02:00
87 changed files with 911 additions and 434 deletions
--- a/.release
+++ b/.release
@@ -1 +1 @@
-23.05
+23.11
--- a/docs/release-notes/release-notes.adoc
+++ b/docs/release-notes/release-notes.adoc
@@ -6,6 +6,8 @@ This section lists the release notes for stable versions of Home Manager and the

 :leveloffset: 1

+include::rl-2311.adoc[]
+
 include::rl-2305.adoc[]

 include::rl-2211.adoc[]
--- a/docs/release-notes/rl-2311.adoc
+++ b/docs/release-notes/rl-2311.adoc
@@ -0,0 +1,25 @@
+[[sec-release-23.11]]
+== Release 23.11
+
+This is the current unstable branch and the information in this section is therefore not final.
+
+[[sec-release-23.11-highlights]]
+=== Highlights
+
+This release has the following notable changes:
+
+* When using <<opt-programs.fish.enable>>, the setup code
+for <<opt-home.sessionVariables>> is now translated
+with https://github.com/bouk/babelfish[babelfish].
+This should result in significantly faster shell startup times
+but could theoretically break
+if you have very complex bash expressions in a session variable.
+Please report any issues you experience.
+
+[[sec-release-23.11-state-version-changes]]
+=== State Version Changes
+
+The state version in this release includes the changes below.
+These changes are only active if the `home.stateVersion` option is set to "23.11" or later.
+
+* Nothing, yet.
--- a/docs/writing-modules.adoc
+++ b/docs/writing-modules.adoc
@@ -11,12 +11,13 @@ The module system in Home Manager is based entirely on the NixOS module system s

 Overall the basic option types are the same in Home Manager as NixOS. A few Home Manager options, however, make use of custom types that are worth describing in more detail. These are the option types `dagOf` and `gvariant` that are used, for example, by <<opt-programs.ssh.matchBlocks>> and <<opt-dconf.settings>>.

-`hm.types.dagOf`::
+[[sec-option-types-dag]]`hm.types.dagOf`::
 Options of this type have attribute sets as values where each member is a node in a {wikipedia-dag}[directed acyclic graph] (DAG). This allows the attribute set entries to express dependency relations among themselves. This can, for example, be used to control the order of match blocks in a OpenSSH client configuration or the order of activation script blocks in <<opt-home.activation>>.
 +
 A number of functions are provided to create DAG nodes. The functions are shown below with examples using an option `foo.bar`  of type `hm.types.dagOf types.int`.
 +
-`hm.dag.entryAnywhere (value: T)`:::
+--
+[[sec-option-types-dag-entryAnywhere]]`hm.dag.entryAnywhere (value: T) : DagEntry<T>`:::
 Indicates that `value` can be placed anywhere within the DAG. This is also the default for plain attribute set entries, that is
 +
 [source,nix]
@@ -37,7 +38,7 @@ foo.bar = {
 +
 are equivalent.
 +
-`hm.dag.entryAfter (afters: list string) (value: T)`:::
+[[sec-option-types-dag-entryAfter]]`hm.dag.entryAfter (afters: list string) (value: T) : DagEntry<T>` :::
 Indicates that `value` must be placed _after_ each of the attribute names in the given list. For example
 +
 [source,nix]
@@ -50,7 +51,7 @@ foo.bar = {
 +
 would place `b` after `a` in the graph.
 +
-`hm.dag.entryBefore (befores: list string) (value: T)`:::
+[[sec-option-types-dag-entryBefore]]`hm.dag.entryBefore (befores: list string) (value: T) : DagEntry<T>` :::
 Indicates that `value` must be placed _before_ each of the attribute names in the given list. For example
 +
 [source,nix]
@@ -63,7 +64,7 @@ foo.bar = {
 +
 would place `b` before `a` in the graph.
 +
-`hm.dag.entryBetween (befores: list string) (afters: list string) (value: T)`:::
+[[sec-option-types-dag-entryBetween]]`hm.dag.entryBetween (befores: list string) (afters: list string) (value: T) : DagEntry<T>` :::
 Indicates that `value` must be placed _before_ the attribute names in the first list and _after_ the attribute names in the second list. For example
 +
 [source,nix]
@@ -76,6 +77,93 @@ foo.bar = {
 ----
 +
 would place `c` before `b` and after `a` in the graph.
+--
+
+There are also a set of functions that generate a DAG from a list.
+These are convenient when you just want to have a linear list of DAG entries,
+without having to manually enter the relationship between each entry.
+Each of these functions take a `tag` as argument and the DAG entries will be named `${tag}-${index}`.
+
+[[sec-option-types-dag-entriesAnywhere]]`hm.dag.entriesAnywhere (tag: string) (values: [T]) : Dag<T>`:::
+Creates a DAG with the given values with each entry labeled using the given tag. For example
+
+[source,nix]
+foo.bar = hm.dag.entriesAnywhere "a" [ 0 1 ];
+
+is equivalent to
+
+[source,nix]
+----
+foo.bar = {
+  a-0 = 0;
+  a-1 = hm.dag.entryAfter [ "a-0" ] 1;
+}
+----
+
+[[sec-option-types-dag-entriesAfter]]`hm.dag.entriesAfter (tag: string) (afters: list string) (values: [T]) : Dag<T>`:::
+Creates a DAG with the given values with each entry labeled using the given tag.
+The list of values are placed are placed _after_ each of the attribute names in `afters`.
+For example
+
+[source,nix]
+foo.bar =
+  { b = 0; }
+  // hm.dag.entriesAfter "a" [ "b" ] [ 1 2 ];
+
+is equivalent to
+
+[source,nix]
+----
+foo.bar = {
+  b = 0;
+  a-0 = hm.dag.entryAfter [ "b" ] 1;
+  a-1 = hm.dag.entryAfter [ "a-0" ] 2;
+}
+----
+
+[[sec-option-types-dag-entriesBefore]]`hm.dag.entriesBefore (tag: string) (befores: list string) (values: [T]) : Dag<T>`:::
+Creates a DAG with the given values with each entry labeled using the given tag.
+The list of values are placed _before_ each of the attribute names in `befores`.
+For example
+
+[source,nix]
+foo.bar =
+  { b = 0; }
+  // hm.dag.entriesBefore "a" [ "b" ] [ 1 2 ];
+
+is equivalent to
+
+[source,nix]
+----
+foo.bar = {
+  b = 0;
+  a-0 = 1;
+  a-1 = hm.dag.entryBetween [ "b" ] [ "a-0" ] 2;
+}
+----
+
+[[sec-option-types-dag-entriesBetween]]`hm.dag.entriesBetween (tag: string) (befores: list string) (afters: list string) (values: [T]) : Dag<T>`:::
+Creates a DAG with the given values with each entry labeled using the given tag.
+The list of values are placed _before_ each of the attribute names in `befores`
+and _after_ each of the attribute names in `afters`.
+For example
+
+[source,nix]
+foo.bar =
+  { b = 0; c = 3; }
+  // hm.dag.entriesBetween "a" [ "b" ] [ "c" ] [ 1 2 ];
+
+is equivalent to
+
+[source,nix]
+----
+foo.bar = {
+  b = 0;
+  c = 3;
+  a-0 = hm.dag.entryAfter [ "c" ] 1;
+  a-1 = hm.dag.entryBetween [ "b" ] [ "a-0" ] 2;
+}
+----

 [[sec-option-types-gvariant]]`hm.types.gvariant`::
 This type is useful for options representing {gvariant-description}[GVariant] values. The type accepts all primitive GVariant types as well as arrays, tuples, ``maybe'' types, and dictionaries.
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1684570954,
-        "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
+        "lastModified": 1685655444,
+        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
+        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
        "type": "github"
      },
      "original": {
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -961,7 +961,7 @@ while [[ $# -gt 0 ]]; do
            export VERBOSE=1
            ;;
        --version)
-            echo 23.05
+            echo 23.11-pre
            exit 0
            ;;
        *)
--- a/home-manager/po/ca.po
+++ b/home-manager/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-23 12:49+0000\n"
 "Last-Translator: Leix b <abone9999@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/da.po
+++ b/home-manager/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-09-19 18:22+0000\n"
 "Last-Translator: cafkafk <christina@cafkafk.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/de.po
+++ b/home-manager/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-13 06:48+0000\n"
 "Last-Translator: Reiner Gerecke <me@reinergerecke.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/es.po
+++ b/home-manager/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-10 22:05+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/fa.po
+++ b/home-manager/po/fa.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
-"PO-Revision-Date: 2022-04-09 18:11+0000\n"
-"Last-Translator: Artin Mobasher <mobasherartin.icm@gmail.com>\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
+"PO-Revision-Date: 2023-05-28 22:49+0000\n"
+"Last-Translator: Mohammad Abdolirad <m.abdolirad@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/home-manager/cli/"
 "fa/>\n"
 "Language: fa\n"
@@ -17,7 +17,7 @@ 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 4.12-dev\n"
+"X-Generator: Weblate 4.18-dev\n"

 #: home-manager/home-manager:71
 msgid "No configuration file found at %s"
@@ -56,11 +56,11 @@ msgstr ""

 #: home-manager/home-manager:284 home-manager/home-manager:383
 msgid "The file %s already exists, leaving it unchanged..."
-msgstr ""
+msgstr "فایل %s از قبل وجود داشته است، بدون تغییر رها شد..."

 #: home-manager/home-manager:286 home-manager/home-manager:385
 msgid "Creating %s..."
-msgstr ""
+msgstr "ساختن %s..."

 #: home-manager/home-manager:427
 msgid "Creating initial Home Manager generation..."
@@ -109,7 +109,7 @@ msgstr ""
 #: home-manager/home-manager:542
 #, sh-format
 msgid "Please set the $EDITOR environment variable"
-msgstr ""
+msgstr "لطفا متغیر محیطی $EDITOR را مقدار دهی کنید"

 #: home-manager/home-manager:557
 msgid "Cannot run build in read-only directory"
@@ -121,11 +121,11 @@ msgstr ""

 #: home-manager/home-manager:643
 msgid "Cannot remove the current generation %s"
-msgstr ""
+msgstr "نمی‌توان نسل فعلی %s را حذف کرد"

 #: home-manager/home-manager:645
 msgid "Removing generation %s"
-msgstr ""
+msgstr "حذف کردن نسل %s"

 #: home-manager/home-manager:664
 msgid "No generations to expire"
@@ -154,7 +154,7 @@ msgstr ""

 #: home-manager/home-manager:762
 msgid "Really uninstall Home Manager?"
-msgstr ""
+msgstr "واقعاً هوم منیجر را حذف نصب کنید؟"

 #: home-manager/home-manager:768
 msgid "Switching to empty Home Manager configuration..."
@@ -167,7 +167,7 @@ msgstr "آره!"

 #: home-manager/home-manager:800
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
-msgstr ""
+msgstr "هوم منیجر حذف نصب شد اما home.nix شما دست نخورده باقی ماند."

 #: home-manager/home-manager:1011
 msgid "expire-generations expects one argument, got %d."
--- a/home-manager/po/fi.po
+++ b/home-manager/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
--- a/home-manager/po/fr.po
+++ b/home-manager/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-11 20:41+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/it.po
+++ b/home-manager/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-11 20:41+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/ja.po
+++ b/home-manager/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-13 06:48+0000\n"
 "Last-Translator: Markus Amano <markus.a.amano@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
@@ -40,7 +40,8 @@ msgstr "設定ファイルがありません。ファイルを %s に作って

 #: home-manager/home-manager:136
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"
+msgstr ""
+"適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"

 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:191
--- a/home-manager/po/ko.po
+++ b/home-manager/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-19 15:49+0000\n"
 "Last-Translator: Suwon Park <sepiabrown@naver.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/lt.po
+++ b/home-manager/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-01-09 11:33+0000\n"
 "Last-Translator: Kornelijus Tvarijanavičius <kornelijus@tvaria.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/home-manager/"
--- a/home-manager/po/nb_NO.po
+++ b/home-manager/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-03-08 07:22+0000\n"
 "Last-Translator: \"Kim A. Ødegaard\" <kim@dyktig.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/home-"
--- a/home-manager/po/nl.po
+++ b/home-manager/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-10 11:48+0000\n"
 "Last-Translator: Pablo Bollansee <pablo.bollansee@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/pl.po
+++ b/home-manager/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-03 19:48+0000\n"
 "Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/pt.po
+++ b/home-manager/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-02-19 10:19+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/home-manager/"
--- a/home-manager/po/pt_BR.po
+++ b/home-manager/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-04-04 11:11+0000\n"
 "Last-Translator: Alex Miranda <alexmirandamoraes@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/home-"
--- a/home-manager/po/ro.po
+++ b/home-manager/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
--- a/home-manager/po/ru.po
+++ b/home-manager/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2021-12-21 19:55+0000\n"
 "Last-Translator: Mikhail Chekan <chekoopa@mail.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/sv.po
+++ b/home-manager/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-11 20:41+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/tr.po
+++ b/home-manager/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-03-26 23:57+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/home-manager/cli/"
--- a/home-manager/po/uk.po
+++ b/home-manager/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-13 13:47+0000\n"
 "Last-Translator: Dan <denqwerta@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/home-manager/"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.17-dev\n"

 #: home-manager/home-manager:71
--- a/home-manager/po/zh_Hans.po
+++ b/home-manager/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2021-12-28 12:41+0000\n"
 "Last-Translator: WhiredPlanck <fungdaat31@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
--- a/home-manager/po/zh_Hant.po
+++ b/home-manager/po/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2021-12-29 08:48+0000\n"
 "Last-Translator: WhiredPlanck <fungdaat31@outlook.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -291,6 +291,15 @@ in
      '';
    };

+    home.sessionVariablesPackage = mkOption {
+      type = types.package;
+      internal = true;
+      description = ''
+        The package containing the
+        <filename>hm-session-vars.sh</filename> file.
+      '';
+    };
+
    home.sessionPath = mkOption {
      type = with types; listOf str;
      default = [ ];
@@ -544,24 +553,22 @@ in
        //
        (maybeSet "LC_MEASUREMENT" cfg.language.measurement);

-    home.packages = [
-      # Provide a file holding all session variables.
-      (
-        pkgs.writeTextFile {
-          name = "hm-session-vars.sh";
-          destination = "/etc/profile.d/hm-session-vars.sh";
-          text = ''
-            # Only source this once.
-            if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
-            export __HM_SESS_VARS_SOURCED=1
+    # Provide a file holding all session variables.
+    home.sessionVariablesPackage = pkgs.writeTextFile {
+      name = "hm-session-vars.sh";
+      destination = "/etc/profile.d/hm-session-vars.sh";
+      text = ''
+        # Only source this once.
+        if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
+        export __HM_SESS_VARS_SOURCED=1

-            ${config.lib.shell.exportAll cfg.sessionVariables}
-          '' + lib.optionalString (cfg.sessionPath != [ ]) ''
-            export PATH="$PATH''${PATH:+:}${concatStringsSep ":" cfg.sessionPath}"
-          '' + cfg.sessionVariablesExtra;
-        }
-      )
-    ];
+        ${config.lib.shell.exportAll cfg.sessionVariables}
+      '' + lib.optionalString (cfg.sessionPath != [ ]) ''
+        export PATH="$PATH''${PATH:+:}${concatStringsSep ":" cfg.sessionPath}"
+      '' + cfg.sessionVariablesExtra;
+    };
+
+    home.packages = [ config.home.sessionVariablesPackage ];

    # A dummy entry acting as a boundary between the activation
    # script's "check" and the "write" phases.
--- a/modules/lib/dag.nix
+++ b/modules/lib/dag.nix
@@ -9,7 +9,7 @@

 { lib }:

-let inherit (lib) all filterAttrs hm mapAttrs toposort;
+let inherit (lib) all filterAttrs head hm mapAttrs length tail toposort;
 in {
  empty = { };

@@ -100,4 +100,30 @@ in {

  entryAfter = hm.dag.entryBetween [ ];
  entryBefore = before: hm.dag.entryBetween before [ ];
+
+  # Given a list of entries, this function places them in order within the DAG.
+  # Each entry is labeled "${tag}-${entry index}" and other DAG entries can be
+  # added with 'before' or 'after' referring these indexed entries.
+  #
+  # The entries as a whole can be given a relation to other DAG nodes. All
+  # generated nodes are then placed before or after those dependencies.
+  entriesBetween = tag:
+    let
+      go = i: before: after: entries:
+        let
+          name = "${tag}-${toString i}";
+          i' = i + 1;
+        in if entries == [ ] then
+          hm.dag.empty
+        else if length entries == 1 then {
+          "${name}" = hm.dag.entryBetween before after (head entries);
+        } else
+          {
+            "${name}" = hm.dag.entryAfter after (head entries);
+          } // go (i + 1) before [ name ] (tail entries);
+    in go 0;
+
+  entriesAnywhere = tag: hm.dag.entriesBetween tag [ ] [ ];
+  entriesAfter = tag: hm.dag.entriesBetween tag [ ];
+  entriesBefore = tag: before: hm.dag.entriesBetween tag before [ ];
 }
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -394,4 +394,10 @@
    github = "natecox";
    githubId = 2782695;
  };
+  pedorich-n = {
+    name = "Mykyta Pedorich";
+    email = "pedorich.n@gmail.com";
+    github = "pedorich-n";
+    githubId = 15573098;
+  };
 }
--- a/modules/lib/types-dag.nix
+++ b/modules/lib/types-dag.nix
@@ -57,57 +57,4 @@ in rec {
      functor = (defaultFunctor name) // { wrapped = elemType; };
      nestedTypes.elemType = elemType;
    };
-
-  # A directed acyclic graph of some inner type OR a list of that
-  # inner type. This is a temporary hack for use by the
-  # `programs.ssh.matchBlocks` and is only guaranteed to be vaguely
-  # correct!
-  #
-  # In particular, adding a dependency on one of the "unnamed-N-M"
-  # entries generated by a list value is almost guaranteed to destroy
-  # the list's order.
-  #
-  # This function will be removed in version 20.09.
-  listOrDagOf = elemType:
-    let
-      paddedIndexStr = list: i:
-        let padWidth = stringLength (toString (length list));
-        in fixedWidthNumber padWidth i;
-
-      convertAll = loc: defs:
-        let
-          convertListValue = namePrefix: def:
-            let
-              vs = def.value;
-              pad = paddedIndexStr vs;
-              makeEntry = i: v: nameValuePair "${namePrefix}.${pad i}" v;
-              warning = ''
-                In file ${def.file}
-                a list is being assigned to the option '${
-                  concatStringsSep "." loc
-                }'.
-                This will soon be an error due to the list form being deprecated.
-                Please use the attribute set form instead with DAG functions to
-                express the desired order of entries.
-              '';
-            in warn warning (listToAttrs (imap1 makeEntry vs));
-
-          convertValue = i: def:
-            if isList def.value then
-              convertListValue "unnamed-${paddedIndexStr defs i}" def
-            else
-              def.value;
-        in imap1 (i: def: def // { value = convertValue i def; }) defs;
-
-      dagType = dagOf elemType;
-    in mkOptionType rec {
-      name = "listOrDagOf";
-      description = "list or DAG of ${elemType.description}s";
-      check = x: isList x || dagType.check x;
-      merge = loc: defs: dagType.merge loc (convertAll loc defs);
-      getSubOptions = dagType.getSubOptions;
-      getSubModules = dagType.getSubModules;
-      substSubModules = m: listOrDagOf (elemType.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = elemType; };
-    };
 }
--- a/modules/lib/types.nix
+++ b/modules/lib/types.nix
@@ -14,7 +14,7 @@ let

 in rec {

-  inherit (typesDag) dagOf listOrDagOf;
+  inherit (typesDag) dagOf;

  selectorFunction = mkOptionType {
    name = "selectorFunction";
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1033,12 +1033,20 @@ in
          defaults to 'null'.
        '';
      }
+
      {
        time = "2023-05-18T21:03:30+00:00";
        message = ''
          A new module is available: 'programs.script-directory'.
        '';
      }
+
+      {
+        time = "2023-06-03T22:19:32+00:00";
+        message = ''
+          A new module is available: 'programs.ripgrep'.
+        '';
+      }
    ];
  };
 }
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -17,6 +17,7 @@ with lib;
        "22.05"
        "22.11"
        "23.05"
+        "23.11"
      ];
      description = ''
        It is occasionally necessary for Home Manager to change
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -163,6 +163,7 @@ let
    ./programs/qutebrowser.nix
    ./programs/rbw.nix
    ./programs/readline.nix
+    ./programs/ripgrep.nix
    ./programs/rofi-pass.nix
    ./programs/rofi.nix
    ./programs/rtorrent.nix
--- a/modules/po/ca.po
+++ b/modules/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-23 12:49+0000\n"
 "Last-Translator: Leix b <abone9999@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "Creant generació de perfil %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "No hi ha canvis, reutilitzant últim perfil generat %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "i després provar d'activar la teva configuració de Home Manager de nou."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Activant %s"

@@ -108,26 +108,34 @@ msgstr ""
 "\n"
 "i provar home-manager switch de nou. Bona Sort!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Començant activació de Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Comprovant Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Execució de simulacre"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Execució en viu"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Utilitzant versió de Nix: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variables d'activació:"
--- a/modules/po/da.po
+++ b/modules/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-09-19 18:22+0000\n"
 "Last-Translator: cafkafk <christina@cafkafk.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "Kreere profil generation %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Ingen ændring så genbrug den seneste profil generation %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 " \n"
 "og så prøve at genaktivere din Home Manager konfiguration igen."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Aktivere %s"

@@ -107,26 +107,34 @@ msgstr ""
 " \n"
 "og så prøve at køre home-manager switch igen. Held og lykke!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Starter Home Manager aktivation"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Udføre fornuft check af Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Dette er en tør kørsel"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Dette er en direkte kørsel"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Bruger Nix version: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Aktivere variable:"
--- a/modules/po/de.po
+++ b/modules/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-13 06:48+0000\n"
 "Last-Translator: Reiner Gerecke <me@reinergerecke.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "Erstelle Profilgeneration %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Keine Änderungen. Benutze daher letzte Profilgeneration %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Versuchen Sie dann, Ihre Home Manager Konfiguration erneut zu aktivieren."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Aktiviere %s"

@@ -108,27 +108,35 @@ msgstr ""
 "\n"
 "Führen Sie danach 'home-manager switch' aus. Viel Glück!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Starte Home Manager Aktivierung"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Überprüfe zur Sicherheit Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Dies ist ein Probelauf"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Dies ist eine Live-Ausführung"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Nutze Nix Version: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Aktivierungsvariablen:"

--- a/modules/po/es.po
+++ b/modules/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
-"PO-Revision-Date: 2023-04-10 22:05+0000\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
+"PO-Revision-Date: 2023-05-27 12:11+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/home-manager/"
 "modules/es/>\n"
@@ -17,7 +17,7 @@ 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 4.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"

 #: modules/files.nix:234
 msgid "Creating home file links in %s"
@@ -35,7 +35,7 @@ msgstr "Creando generación de perfil %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "No hay cambios, reutilizando la generación más reciente del perfil: %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Y después reintente activar su configuración de Home Manager."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Activando %s"

@@ -109,27 +109,35 @@ msgstr ""
 "\n"
 "y probando el cambio de administrador de casa nuevamente. ¡Buena suerte!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr "Error: USER está configurado en \"%s\" pero esperamos \"%s\""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr "Error: HOME está configurado en \"%s\" pero esperamos \"%s\""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Comenzando activación de Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Chequeando Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Ejecución de simulacro"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Ejecución en vivo"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Usando Nix versión %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variables de activación:"

--- a/modules/po/fa.po
+++ b/modules/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "No change so reusing latest profile generation %s"
 msgstr ""

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr ""

@@ -80,26 +80,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr ""
--- a/modules/po/fi.po
+++ b/modules/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "No change so reusing latest profile generation %s"
 msgstr ""

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr ""

@@ -80,26 +80,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr ""
--- a/modules/po/fr.po
+++ b/modules/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-05-18 23:12+0000\n"
 "Last-Translator: Naïm Camille Favier <n@monade.li>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "Création de la génération de profil %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Pas de changement, réutilisation du dernier profil génération %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Après, essayez encore d'activer votre configuration de Home Manager."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Activation de %s"

@@ -109,27 +109,35 @@ msgstr ""
 "\n"
 "et de réessayer home-manager switch. Bonne chance !"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Démarrage de l'activation de Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Vérification de Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Ceci est une fausse activation (essai à blanc)"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Ceci est une vraie activation"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Version de Nix : %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variables d'activation :"

--- a/modules/po/it.po
+++ b/modules/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-12-15 08:50+0000\n"
 "Last-Translator: Walter Franzini <walter.franzini@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/home-manager/"
@@ -36,7 +36,7 @@ msgid "No change so reusing latest profile generation %s"
 msgstr ""
 "Nessuna modifica, verrà riutilizzata l'ultimo generazione di profilo %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -52,7 +52,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Attivando %s"

@@ -96,26 +96,34 @@ msgstr ""
 "\n"
 "e provare a cambiare home-manager di nuovo. Buona fortuna!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Iniziando attivazione Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Controllando Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Questo è un avvio secco"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Questa è una esecuzione live"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Versione di Nix in uso: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variabili di attivazione:"
--- a/modules/po/ja.po
+++ b/modules/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-13 06:48+0000\n"
 "Last-Translator: Markus Amano <markus.a.amano@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "世代 %s のプロファイルを生成しています"
 msgid "No change so reusing latest profile generation %s"
 msgstr "変更されていないので最新の世代 %s のプロファイルを再利用します"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "で競合を解消し、再度Home Managerの設定を試してください。"

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "%s を有効化しています"

@@ -73,7 +73,8 @@ msgstr "%s から %s にプロファイルを転送中"

 #: modules/lib-bash/activation-init.sh:53
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"
+msgstr ""
+"適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"

 #: modules/lib-bash/activation-init.sh:81
 msgid "Sanity checking oldGenNum and oldGenPath"
@@ -107,27 +108,35 @@ msgstr ""
 "\n"
 "を実行して、home-manager switch を再び実行してみることでしょう。幸運を！"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Home Managerの有効化を開始しました"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Nixの健全性検査中です"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "これは予行練習(dry run)です"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "これは実際に実行されます"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Nix バージョン %s を使用しています"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "有効化変数:"

--- a/modules/po/ko.po
+++ b/modules/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-19 15:50+0000\n"
 "Last-Translator: Suwon Park <sepiabrown@naver.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/home-manager/"
@@ -37,7 +37,7 @@ msgstr ""
 "바뀐 것이 없어서 가장 최근의 profile 세대 %s를 다시 사용하는 것으로 설정하는 "
 "중"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "그런 후, 다시 홈 매니저 설정을 활성화 해보세요."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "%s를 활성화 하는 중"

@@ -109,27 +109,35 @@ msgstr ""
 "\n"
 "그런 후 'home-manager switch'를 다시 시도해 보십시오. 행운을 빕니다!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "홈 매니저 활성화를 시작하는 중"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Nix가 정상인지 확인 중"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "모의 실행 중 입니다"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "모의 실행이 아닌 실제 실행 중 입니다"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "사용 중인 Nix 버전: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "활성화 변수들:"

--- a/modules/po/lt.po
+++ b/modules/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "No change so reusing latest profile generation %s"
 msgstr ""

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr ""

@@ -80,26 +80,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr ""
--- a/modules/po/nb_NO.po
+++ b/modules/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-03-08 07:22+0000\n"
 "Last-Translator: \"Kim A. Ødegaard\" <kim@dyktig.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/home-"
@@ -35,7 +35,7 @@ msgstr "Oppretter profil for generering %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Ingen endring, gjenbruker derfor siste profilgenerering %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "for så å aktivere ditt Home Manager-oppsett igjen."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Aktiverer %s"

@@ -107,27 +107,35 @@ msgstr ""
 "\n"
 "for så å forsøke `home-manager switch` igjen. Lykke til!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Starter aktivering av Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Kontrollerer at Nix fungerer"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Dette er en simulert kjøring"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Dette er en virkelig kjøring"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Bruker Nix-versjon: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Aktiveringsvariabler:"

--- a/modules/po/nl.po
+++ b/modules/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-04-10 11:48+0000\n"
 "Last-Translator: Pablo Bollansee <pablo.bollansee@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/home-manager/"
@@ -36,7 +36,7 @@ msgid "No change so reusing latest profile generation %s"
 msgstr ""
 "Geen veranderingen dus de laatste profiel generatie %s wordt hergebruikt"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Probeer daarna je Home Manager configuratie opnieuw te activeren."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "%s aan het activeren"

@@ -109,27 +109,35 @@ msgstr ""
 "\n"
 "en dan opnieuw 'home-manager switch' te proberen. Veel succes!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Home manager activatie aan het starten"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Nix aan het sanity checken"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Dit is een oefening"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Dit is voor echt"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Nix versie %s wordt gebruikt"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Activatie variabelen:"

--- a/modules/po/pl.po
+++ b/modules/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-05-03 19:48+0000\n"
 "Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/"
@@ -36,7 +36,7 @@ msgstr "Tworzenie profilu generacji %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Brak zmian więc używam ostatniej generacji profilu %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Po czym spróbuj aktywować swoją konfigurację Home Manager jeszcze raz."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Aktywowanie %s"

@@ -109,26 +109,34 @@ msgstr ""
 "\n"
 "i spróbować uruchomić home-manager switch raz jeszcze. Powodzenia!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Rozpoczynam aktywację Home Managera"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Sprawdzanie poprawności Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "To jest wykonanie testowe"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "To jest wykonanie właściwe"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Używając wersji Nix: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Zmienne aktywacyjne:"
--- a/modules/po/pt.po
+++ b/modules/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-02-19 10:19+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/home-manager/"
@@ -35,7 +35,7 @@ msgstr "A criar geração %s para o perfil"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Nenhuma mudança, portanto a reusar a última geração %s para o perfil"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "E então tente novamente ativar a sua configuração do Home Manager."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Ativando %s"

@@ -107,26 +107,34 @@ msgstr ""
 "\n"
 "e tentar executar \"home-manager switch\" de novo. Boa sorte!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Iniciando ativação do Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Essa é uma execução de teste"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Essa é uma execução de fato"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Usando versão do Nix: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variáveis durante ativação:"
--- a/modules/po/pt_BR.po
+++ b/modules/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-04-04 11:11+0000\n"
 "Last-Translator: Alex Miranda <alexmirandamoraes@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/home-"
@@ -35,7 +35,7 @@ msgstr "Criando geração %s para o perfil"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Nenhuma mudança, portanto reusando a última geração %s para o perfil"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "E então tente novamente ativar a sua configuração do Home Manager."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Ativando %s"

@@ -107,26 +107,34 @@ msgstr ""
 "\n"
 "e tentar rodar \"home-manager switch\" de novo. Boa sorte!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Iniciando ativação do Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Essa é uma execução de teste"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Essa é uma execução de fato"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Usando versão do Nix: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Variáveis durante ativação:"
--- a/modules/po/ro.po
+++ b/modules/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "No change so reusing latest profile generation %s"
 msgstr ""

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr ""

@@ -80,26 +80,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr ""
--- a/modules/po/ru.po
+++ b/modules/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-03-26 23:57+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/"
@@ -36,7 +36,7 @@ msgstr "Создаю профиль в поколении %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Изменений нет, переиспользую профиль в последнем поколении %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "После попробуйте активировать конфигурацию снова."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Активирую %s"

@@ -108,27 +108,35 @@ msgstr ""
 "\n"
 "и выполнить home-manager switch ещё раз. Удачи!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Начинаю активацию Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Проверяю Nix на всякий случай"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Это пробный запуск"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Это реальный запуск"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Использую Nix версии: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Переменные для активации:"

--- a/modules/po/sv.po
+++ b/modules/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
-"PO-Revision-Date: 2023-04-10 14:51+0000\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
+"PO-Revision-Date: 2023-05-27 12:11+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/home-manager/"
 "modules/sv/>\n"
@@ -17,7 +17,7 @@ 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 4.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"

 #: modules/files.nix:234
 msgid "Creating home file links in %s"
@@ -35,7 +35,7 @@ msgstr "Skapar profil för generation %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Ingen förändring, återanvänder därför profil-generation %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Prova sedan att aktivera din Home Manager-konfiguration igen."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Aktiverar %s"

@@ -107,27 +107,35 @@ msgstr ""
 "\n"
 "och prova 'home-manager switch' igen. Lycka till!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr "Fel: USER är satt till \"%s\" men \"%s\" förväntades"
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr "Fel: HOME är satt till \"%s\" men \"%s\" förväntades"
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Startar Home Manager-aktivering"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Kontrollerar att Nix funkar"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Detta är en simulerad körning"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Detta är en verklig körning"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Använder Nix-version: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Aktiveringsvariabler:"

--- a/modules/po/tr.po
+++ b/modules/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-03-26 23:57+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/home-manager/"
@@ -36,7 +36,7 @@ msgid "No change so reusing latest profile generation %s"
 msgstr ""
 "Değişiklik yok, bu nedenle en son profil inşası %s yeniden kullanılıyor"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "ile kaldırabilirsiniz. Sonra Home Manager yapılandırmanızı yeniden\n"
 "etkinleştirmeyi deneyin."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "%s etkinleştiriliyor"

@@ -109,26 +109,34 @@ msgstr ""
 "komutlarını çalıştırmak ve tekrar home-manager switch denemektir. İyi "
 "şanslar!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Home Manager etkinleştirmesi başlatılıyor"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Nix denetleniyor"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Bu bir deneme çalıştırmasıdır"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Bu bir gerçek çalıştırmadır"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Kullanılan Nix sürümü: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Etkinleştirme değişkenleri:"
--- a/modules/po/uk.po
+++ b/modules/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
-"PO-Revision-Date: 2023-04-13 13:47+0000\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
+"PO-Revision-Date: 2023-05-28 22:49+0000\n"
 "Last-Translator: Dan <denqwerta@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/home-manager/"
 "modules/uk/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"

 #: modules/files.nix:234
 msgid "Creating home file links in %s"
@@ -36,7 +36,7 @@ msgstr "Створення генерації профілю %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "Без змін, тому повторне використання останньої генерації профілю %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Потім спробуйте знову активувати конфігурацію Home Manager."

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "Активація %s"

@@ -109,27 +109,35 @@ msgstr ""
 "\n"
 "і знову намагатися переключитися на home-manager switch. Удачі!"

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr "Помилка: USER встановлено на \"%s\", але очікувалося \"%s\""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr "Помилка: HOME встановлено на \"%s\", але очікувалося \"%s\""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "Початок активації Home Manager"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "Перевірка адекватності Nix"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "Це пробний запуск"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "Це справжній запуск"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "Використання версії Nix: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "Активація змінних:"

--- a/modules/po/zh_Hans.po
+++ b/modules/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2022-05-16 13:18+0000\n"
 "Last-Translator: Yubo-Cao <Cao2006721@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -35,7 +35,7 @@ msgstr "正在创建配置文件世代 %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "未发生变化，正在重新使用最近一次的配置文件世代 %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "来移除。然后尝试再次激活您的 Home Manager 配置。"

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "正在激活 %s"

@@ -95,26 +95,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "正在启动 Home Manager 初始化程序"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "正在进行 Nix 完整性检查"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "这是试运行"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "这是在实际运行"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "正在使用的 Nix 版本: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "激活的变量："
--- a/modules/po/zh_Hant.po
+++ b/modules/po/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2023-04-11 22:44+0200\n"
+"POT-Creation-Date: 2023-05-27 09:08+0200\n"
 "PO-Revision-Date: 2023-01-08 11:50+0000\n"
 "Last-Translator: Eric Ho <eric913@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -35,7 +35,7 @@ msgstr "正在建立配置檔案世代 %s"
 msgid "No change so reusing latest profile generation %s"
 msgstr "未發生變化，正在重新使用最近一次的配置檔案世代 %s"

-#: modules/home-environment.nix:625
+#: modules/home-environment.nix:627
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "來移除。然後嘗試再次啟用您的 Home Manager 配置。"

-#: modules/home-environment.nix:658
+#: modules/home-environment.nix:660
 msgid "Activating %s"
 msgstr "正在啟用 %s"

@@ -95,26 +95,34 @@ msgid ""
 "and trying home-manager switch again. Good luck!"
 msgstr ""

-#: modules/lib-bash/activation-init.sh:101
+#: modules/lib-bash/activation-init.sh:95
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:104
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:119
 msgid "Starting Home Manager activation"
 msgstr "正在啟動 Home Manager 初始化程式"

-#: modules/lib-bash/activation-init.sh:105
+#: modules/lib-bash/activation-init.sh:123
 msgid "Sanity checking Nix"
 msgstr "正在進行 Nix 完整性檢查"

-#: modules/lib-bash/activation-init.sh:112
+#: modules/lib-bash/activation-init.sh:133
 msgid "This is a dry run"
 msgstr "這是試運行"

-#: modules/lib-bash/activation-init.sh:116
+#: modules/lib-bash/activation-init.sh:137
 msgid "This is a live run"
 msgstr "這是在實際運行"

-#: modules/lib-bash/activation-init.sh:122
+#: modules/lib-bash/activation-init.sh:143
 msgid "Using Nix version: %s"
 msgstr "正在使用的 Nix 版本: %s"

-#: modules/lib-bash/activation-init.sh:125
+#: modules/lib-bash/activation-init.sh:146
 msgid "Activation variables:"
 msgstr "啟用的變數:"
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -152,6 +152,13 @@ let
      passAsFile = [ "text" ];
    } "env HOME=$(mktemp -d) fish_indent < $textPath > $out";

+  translatedSessionVariables =
+    pkgs.runCommandLocal "hm-session-vars.fish" { } ''
+      ${pkgs.babelfish}/bin/babelfish \
+        <${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh \
+        >$out
+    '';
+
 in {
  imports = [
    (mkRemovedOptionModule [ "programs" "fish" "promptInit" ] ''
@@ -354,9 +361,7 @@ in {
        set -q __fish_home_manager_config_sourced; and exit
        set -g __fish_home_manager_config_sourced 1

-        set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
-        fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
-        set -e fish_function_path[1]
+        source ${translatedSessionVariables}

        ${cfg.shellInit}

--- a/modules/programs/i3status-rust.nix
+++ b/modules/programs/i3status-rust.nix
@@ -11,6 +11,23 @@ let
 in {
  meta.maintainers = with lib.maintainers; [ farlion thiagokokada ];

+  imports = [
+    (mkRenamedOptionModule [
+      "programs"
+      "i3status-rust"
+      "bars"
+      "<name>"
+      "icons"
+    ] [ "programs" "i3status-rust" "bars" "<name>" "settings" "icons" "icons" ])
+    (mkRenamedOptionModule [
+      "programs"
+      "i3status-rust"
+      "bars"
+      "<name>"
+      "theme"
+    ] [ "programs" "i3status-rust" "bars" "<name>" "settings" "theme" "theme" ])
+  ];
+
  options.programs.i3status-rust = {
    enable = mkEnableOption "a replacement for i3-status written in Rust";

@@ -102,28 +119,6 @@ in {
              }
            '';
          };
-
-          icons = mkOption {
-            type = types.str;
-            default = "none";
-            description = ''
-              The icons set to use. See
-              <link xlink:href="https://github.com/greshake/i3status-rust/blob/master/doc/themes.md"/>
-              for a list of available icon sets.
-            '';
-            example = "awesome6";
-          };
-
-          theme = mkOption {
-            type = types.str;
-            default = "plain";
-            description = ''
-              The theme to use. See
-              <link xlink:href="https://github.com/greshake/i3status-rust/blob/master/doc/themes.md"/>
-              for a list of available themes.
-            '';
-            example = "gruvbox-dark";
-          };
        };
      });

@@ -218,8 +213,6 @@ in {
              };
            };
          };
-          icons = "awesome5";
-          theme = "gruvbox-dark";
        };
      '';
    };
@@ -248,7 +241,7 @@ in {
    home.packages = [ cfg.package ];

    xdg.configFile = mapAttrs' (cfgFileSuffix: cfgBar:
-      nameValuePair ("i3status-rust/config-${cfgFileSuffix}.toml") ({
+      nameValuePair "i3status-rust/config-${cfgFileSuffix}.toml" ({
        onChange = mkIf config.xsession.windowManager.i3.enable ''
          i3Socket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/i3/ipc-socket.*"
          if [[ -S $i3Socket ]]; then
@@ -256,17 +249,8 @@ in {
          fi
        '';

-        source = settingsFormat.generate ("config-${cfgFileSuffix}.toml") ({
-          theme = if lib.versionAtLeast cfg.package.version "0.30.0" then {
-            theme = cfgBar.theme;
-          } else
-            cfgBar.theme;
-          icons = if lib.versionAtLeast cfg.package.version "0.30.0" then {
-            icons = cfgBar.icons;
-          } else
-            cfgBar.icons;
-          block = cfgBar.blocks;
-        } // cfgBar.settings);
+        source = settingsFormat.generate "config-${cfgFileSuffix}.toml"
+          ({ block = cfgBar.blocks; } // cfgBar.settings);
      })) cfg.bars;
  };
 }
--- a/modules/programs/ripgrep.nix
+++ b/modules/programs/ripgrep.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.ripgrep;
+  configPath = "${config.xdg.configHome}/ripgrep/ripgreprc";
+in {
+  meta.maintainers = [ hm.maintainers.pedorich-n ];
+
+  options = {
+    programs.ripgrep = {
+      enable = mkEnableOption "Ripgrep";
+
+      package = mkPackageOption pkgs "ripgrep" { };
+
+      arguments = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "--max-columns-preview" "--colors=line:style:bold" ];
+        description = ''
+          List of arguments to pass to ripgrep. Each item is given to ripgrep as
+          a single command line argument verbatim.
+          </para><para>
+          See <link xlink:href="https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#configuration-file"/>
+          for an example configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home = {
+      packages = [ cfg.package ];
+
+      file."${configPath}" =
+        mkIf (cfg.arguments != [ ]) { text = lib.concatLines cfg.arguments; };
+
+      sessionVariables = { "RIPGREP_CONFIG_PATH" = configPath; };
+    };
+  };
+}
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -482,7 +482,7 @@ in
    };

    matchBlocks = mkOption {
-      type = hm.types.listOrDagOf matchBlockModule;
+      type = hm.types.dagOf matchBlockModule;
      default = {};
      example = literalExpression ''
        {
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -7,6 +7,10 @@ let
  cfg = config.programs.wezterm;
  tomlFormat = pkgs.formats.toml { };

+  shellIntegrationStr = ''
+    source "${cfg.package}/etc/profile.d/wezterm.sh"
+  '';
+
 in {
  meta.maintainers = [ hm.maintainers.blmhemu ];

@@ -79,6 +83,13 @@ in {
      '';
    };

+    enableBashIntegration = mkEnableOption "WezTerm's Bash integration." // {
+      default = true;
+    };
+
+    enableZshIntegration = mkEnableOption "WezTerm's Zsh integration." // {
+      default = true;
+    };
  };

  config = mkIf cfg.enable {
@@ -99,5 +110,9 @@ in {
      nameValuePair "wezterm/colors/${name}.toml" {
        source = tomlFormat.generate "${name}.toml" { colors = value; };
      }) cfg.colorSchemes;
+
+    programs.bash.initExtra =
+      mkIf cfg.enableBashIntegration shellIntegrationStr;
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration shellIntegrationStr;
  };
 }
--- a/modules/services/window-managers/i3-sway/lib/functions.nix
+++ b/modules/services/window-managers/i3-sway/lib/functions.nix
@@ -150,7 +150,7 @@ rec {
  windowCommandsStr = { command, criteria, ... }:
    "for_window ${criteriaStr criteria} ${command}";
  workspaceOutputStr = item:
-    ''workspace "${item.workspace}" output ${item.output}'';
+    ''workspace "${item.workspace}" output "${item.output}"'';

  indent = list:
    { includesWrapper ? true, level ? 1 }:
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -115,6 +115,7 @@ import nmt {
    ./modules/programs/pubs
    ./modules/programs/qutebrowser
    ./modules/programs/readline
+    ./modules/programs/ripgrep
    ./modules/programs/sagemath
    ./modules/programs/sbt
    ./modules/programs/scmpuff
--- a/tests/lib/types/dag-merge-result.txt
+++ b/tests/lib/types/dag-merge-result.txt
@@ -2,3 +2,11 @@ before:before
 merged:left,middle,middle,right
 between:between
 after:after
+list-anywhere-0:list-anywhere-0
+list-before-0:list-before-0,sneaky-merge
+list-before-1:list-before-1
+list-anywhere-1:list-anywhere-1
+inside-list:inside-list
+list-after-0:list-after-0
+list-after-1:list-after-1
+list-anywhere-2:list-anywhere-2
--- a/tests/lib/types/dag-merge.nix
+++ b/tests/lib/types/dag-merge.nix
@@ -27,7 +27,27 @@ in {
      { merged = dag.entryBefore [ "between" ] "middle"; }
      { merged = mkBefore "left"; }
      { merged = dag.entryBetween [ "after" ] [ "before" ] (mkAfter "right"); }
-      { merged = dag.entryBefore [ "between" ] "middle"; }
+      {
+        merged = dag.entryBefore [ "between" ] "middle";
+      }
+
+      # Some tests of list entries.
+      (dag.entriesAnywhere "list-anywhere" [
+        "list-anywhere-0"
+        "list-anywhere-1"
+        "list-anywhere-2"
+      ])
+      { inside-list = dag.entryAfter [ "list-anywhere-1" ] "inside-list"; }
+      (dag.entriesBefore "list-before" [ "list-anywhere-1" ] [
+        "list-before-0"
+        "list-before-1"
+      ])
+      (dag.entriesAfter "list-after" [ "list-before-0" ] [
+        "list-after-0"
+        "list-after-1"
+      ])
+      (dag.entriesAnywhere "list-empty" [ ])
+      { "list-before-0" = mkAfter "sneaky-merge"; }
    ];

    home.file."result.txt".text = result;
--- a/tests/lib/types/default.nix
+++ b/tests/lib/types/default.nix
@@ -1,7 +1,6 @@
 {
  lib-types-dag-submodule = ./dag-submodule.nix;
  lib-types-dag-merge = ./dag-merge.nix;
-  lib-types-list-or-dag-merge = ./list-or-dag-merge.nix;

  lib-types-gvariant-merge = ./gvariant-merge.nix;
 }
--- a/tests/lib/types/list-or-dag-merge-result.txt
+++ b/tests/lib/types/list-or-dag-merge-result.txt
@@ -1,15 +0,0 @@
-before:before
-between:between
-after:after
-unnamed-1.1:k
-unnamed-1.2:l
-unnamed-2.01:a
-unnamed-2.02:b
-unnamed-2.03:c
-unnamed-2.04:d
-unnamed-2.05:e
-unnamed-2.06:f
-unnamed-2.07:g
-unnamed-2.08:h
-unnamed-2.09:i
-unnamed-2.10:j
--- a/tests/lib/types/list-or-dag-merge.nix
+++ b/tests/lib/types/list-or-dag-merge.nix
@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) concatStringsSep hm mkMerge mkOption types;
-
-  dag = lib.hm.dag;
-
-  result = let
-    sorted = dag.topoSort config.tested.dag;
-    data = map (e: "${e.name}:${e.data}") sorted.result;
-  in concatStringsSep "\n" data + "\n";
-
-in {
-  options.tested.dag = mkOption { type = hm.types.listOrDagOf types.str; };
-
-  config = {
-    tested = mkMerge [
-      { dag = [ "k" "l" ]; }
-      { dag = [ "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" ]; }
-      { dag.after = "after"; }
-      { dag.before = dag.entryBefore [ "after" ] "before"; }
-      { dag.between = dag.entryBetween [ "after" ] [ "before" ] "between"; }
-    ];
-
-    home.file."result.txt".text = result;
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/result.txt \
-        ${./list-or-dag-merge-result.txt}
-    '';
-  };
-}
--- a/tests/modules/programs/autojump/default-settings.nix
+++ b/tests/modules/programs/autojump/default-settings.nix
@@ -8,6 +8,7 @@ with lib;

    test.stubs.autojump = {
      buildScript = "mkdir -p $out/bin; touch $out/bin/autojump";
+      outPath = null;
    };

    nmt.script = ''
--- a/tests/modules/programs/ripgrep/custom-arguments.nix
+++ b/tests/modules/programs/ripgrep/custom-arguments.nix
@@ -0,0 +1,24 @@
+{ pkgs, config, ... }: {
+  config = {
+    programs.ripgrep = {
+      enable = true;
+      package = config.lib.test.mkStubPackage { name = "ripgrep"; };
+      arguments = [
+        "--max-columns-preview"
+        "--colors=line:style:bold"
+        "--no-require-git"
+      ];
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/ripgrep/ripgreprc
+      assertFileContent home-files/.config/ripgrep/ripgreprc ${
+        pkgs.writeText "ripgrep.expected" ''
+          --max-columns-preview
+          --colors=line:style:bold
+          --no-require-git
+        ''
+      }
+    '';
+  };
+}
--- a/tests/modules/programs/ripgrep/default-arguments.nix
+++ b/tests/modules/programs/ripgrep/default-arguments.nix
@@ -0,0 +1,12 @@
+{ config, ... }: {
+  config = {
+    programs.ripgrep = {
+      enable = true;
+      package = config.lib.test.mkStubPackage { name = "ripgrep"; };
+    };
+
+    nmt.script = ''
+      assertPathNotExists home-files/.config/ripgrep/ripgreprc
+    '';
+  };
+}
--- a/tests/modules/programs/ripgrep/default.nix
+++ b/tests/modules/programs/ripgrep/default.nix
@@ -0,0 +1,4 @@
+{
+  ripgrep-default-arguments = ./default-arguments.nix;
+  ripgrep-custom-arguments = ./custom-arguments.nix;
+}
--- a/tests/modules/programs/wezterm/bash-integration-default.nix
+++ b/tests/modules/programs/wezterm/bash-integration-default.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  programs.bash.enable = true;
+
+  # Bash integration is enabled by default.
+  programs.wezterm.enable = true;
+
+  test.stubs.wezterm = { };
+
+  nmt.script = ''
+    assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/programs/wezterm/bash-integration-disabled.nix
+++ b/tests/modules/programs/wezterm/bash-integration-disabled.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  programs.bash.enable = true;
+
+  programs.wezterm = {
+    enable = true;
+    enableBashIntegration = false;
+  };
+
+  test.stubs.wezterm = { };
+
+  nmt.script = ''
+    assertFileNotRegex home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/programs/wezterm/bash-integration-enabled.nix
+++ b/tests/modules/programs/wezterm/bash-integration-enabled.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  programs.bash.enable = true;
+
+  programs.wezterm = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+
+  test.stubs.wezterm = { };
+
+  nmt.script = ''
+    assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/programs/wezterm/default.nix
+++ b/tests/modules/programs/wezterm/default.nix
@@ -1,4 +1,12 @@
 {
  wezterm-example-setting = ./example-setting.nix;
  wezterm-empty-setting = ./empty-setting.nix;
+
+  wezterm-bash-integration-default = ./bash-integration-default.nix;
+  wezterm-bash-integration-disabled = ./bash-integration-disabled.nix;
+  wezterm-bash-integration-enabled = ./bash-integration-enabled.nix;
+
+  wezterm-zsh-integration-default = ./zsh-integration-default.nix;
+  wezterm-zsh-integration-disabled = ./zsh-integration-disabled.nix;
+  wezterm-zsh-integration-enabled = ./zsh-integration-enabled.nix;
 }
--- a/tests/modules/programs/wezterm/zsh-integration-default.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-default.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  programs.zsh.enable = true;
+
+  # Zsh integration is enabled by default.
+  programs.wezterm.enable = true;
+
+  test.stubs.wezterm = { };
+  test.stubs.zsh = { };
+
+  nmt.script = ''
+    assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/programs/wezterm/zsh-integration-disabled.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-disabled.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs.zsh.enable = true;
+
+  programs.wezterm = {
+    enable = true;
+    enableZshIntegration = false;
+  };
+
+  test.stubs.wezterm = { };
+  test.stubs.zsh = { };
+
+  nmt.script = ''
+    assertFileNotRegex home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/programs/wezterm/zsh-integration-enabled.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-enabled.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs.zsh.enable = true;
+
+  programs.wezterm = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+  test.stubs.wezterm = { };
+  test.stubs.zsh = { };
+
+  nmt.script = ''
+    assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
+  '';
+}
--- a/tests/modules/services/git-sync/basic.nix
+++ b/tests/modules/services/git-sync/basic.nix
@@ -24,7 +24,7 @@
        WantedBy=default.target

        [Service]
-        Environment=PATH=/nix/store/00000000000000000000000000000000-openssh/bin:/nix/store/00000000000000000000000000000000-git/bin
+        Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin
        Environment=GIT_SYNC_DIRECTORY=/a/path
        Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
        Environment=GIT_SYNC_REPOSITORY=git+ssh://user@example.com:/~user/path/to/repo.git
--- a/tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf
+++ b/tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf
@@ -94,7 +94,7 @@ bar {
  }
 }

-workspace "1" output eDP
-workspace "ABC" output DP
-workspace "3: Test" output HDMI
-workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output DVI
+workspace "1" output "eDP"
+workspace "ABC" output "DP"
+workspace "3: Test" output "HDMI"
+workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output "DVI"
--- a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
@@ -103,8 +103,8 @@ bar {
  }
 }

-workspace "1" output eDP
-workspace "ABC" output DP
-workspace "3: Test" output HDMI
-workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output DVI
+workspace "1" output "eDP"
+workspace "ABC" output "DP"
+workspace "3: Test" output "HDMI"
+workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output "DVI"
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"
--- a/tests/stubs.nix
+++ b/tests/stubs.nix
@@ -41,8 +41,18 @@ let
        dummyPackage
      else
        pkgs.runCommandLocal name { pname = name; } buildScript;
-    in pkg // optionalAttrs (outPath != null) { inherit outPath; }
-    // optionalAttrs (version != null) { inherit version; };
+    in pkg // optionalAttrs (outPath != null) {
+      inherit outPath;
+
+      # Prevent getOutput from descending into outputs
+      outputSpecified = true;
+
+      # Allow the original package to be used in derivation inputs
+      __spliced = {
+        buildHost = pkg;
+        hostTarget = pkg;
+      };
+    } // optionalAttrs (version != null) { inherit version; };

 in {
  options.test.stubs = mkOption {
Author	SHA1	Message	Date
Sumner Evans	2790158226	i3status-rust: deprecate icons and theme options Signed-off-by: Sumner Evans <me@sumnerevans.com>	2023-06-05 23:03:31 -06:00
Robert Helgesson	28614ed7a1	lib: add functions to create DAGs from lists	2023-06-05 23:08:30 +02:00
Robert Helgesson	79e03fbe24	lib: remove listOrDagOf type It has been deprecated for a long time and should be safe to remove.	2023-06-05 23:08:29 +02:00
Olmo Kramer	24d590cc32	wezterm: add integrations for Bash and Zsh (#3934 ) * wezterm: Add `enableBashIntegration` option * wezterm: Add `enableZshIntegration` option	2023-06-05 22:46:18 +02:00
Naïm Favier	607d8fad96	i3-sway: quote output names (#4059 ) They can contain spaces.	2023-06-04 15:23:23 +02:00
github-actions[bot]	57ed23cd29	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3' (2023-05-20) → 'github:nixos/nixpkgs/e635192892f5abbc2289eaac3a73cdb249abaefd' (2023-06-01)	2023-06-04 09:50:37 +02:00
Naïm Favier	221056c59f	tests: fix `getOutput` on stubs Setting `outputSpecified` prevents `getOutput` from descending into outputs, which don't have an overridden `outPath`. Additionally, use `__spliced` to permit derivations to use the dummy as an input.	2023-06-04 09:15:14 +02:00
Nikita Pedorich	bffc49ffb2	ripgrep: remove configDir Also minor formatting and news entry.	2023-06-04 01:12:05 +02:00
Nikita Pedorich	2951946183	ripgrep: add module (#4017 ) * ripgrep: add module * ripgrep: Apply suggestions from code review Co-authored-by: Naïm Favier <n@monade.li> * ripgrep: fix maintainers Co-authored-by: Naïm Favier <n@monade.li> * ripgrep: rename config into arguments --------- Co-authored-by: Naïm Favier <n@monade.li>	2023-06-02 17:59:12 +02:00
Dan	3876cc613a	Translate using Weblate (Ukrainian) Currently translated at 100.0% (18 of 18 strings) Co-authored-by: Dan <denqwerta@gmail.com> Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/uk/ Translation: Home Manager/Home Manager Modules	2023-06-01 00:44:11 +02:00
Mohammad Abdolirad	04f6c2925b	Translate using Weblate (Persian) Currently translated at 30.3% (10 of 33 strings) Co-authored-by: Mohammad Abdolirad <m.abdolirad@gmail.com> Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/fa/ Translation: Home Manager/Home Manager CLI	2023-06-01 00:44:11 +02:00
gallegonovato	efed2ccd9f	Translate using Weblate (Spanish) Currently translated at 100.0% (18 of 18 strings) Co-authored-by: gallegonovato <fran-carro@hotmail.es> Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/es/ Translation: Home Manager/Home Manager Modules	2023-06-01 00:44:11 +02:00
Robert Helgesson	4d8fedfd29	Translate using Weblate (Swedish) Currently translated at 100.0% (18 of 18 strings) Co-authored-by: Robert Helgesson <robert@rycee.net> Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/sv/ Translation: Home Manager/Home Manager Modules	2023-06-01 00:44:11 +02:00
Hosted Weblate	76a816a896	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/ Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/ Translation: Home Manager/Home Manager CLI Translation: Home Manager/Home Manager Modules	2023-06-01 00:44:11 +02:00
Naïm Favier	96078e4a93	Fix release notes (#4044 )	2023-06-01 00:44:06 +02:00
Emily	53ccbe0170	fish: use babelfish for `hm-session-vars.sh` (#4012 ) * home-environment: add `home.sessionVariablesPackage` Allow the `hm-session-vars.sh` derivation to be referenced from other modules, e.g. to translate it to fish with babelfish at build time. * fish: use babelfish for `hm-session-vars.sh` Translate `hm-session-vars.sh` to fish at system build time, significantly decreasing shell startup time. Based on https://github.com/NixOS/nixpkgs/pull/108947 by @kevingriffin.	2023-06-01 00:01:27 +02:00
Robert Helgesson	f1490b8caf	Switch current unstable version to 23.11	2023-05-31 19:11:30 +02:00
@@ -1 +1 @@
 .05
 .11