Merge PR #1560

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,7 @@ pull-request.
 
 Also make sure to read the guidelines found at
 
-  https://github.com/rycee/home-manager/blob/master/doc/contributing.adoc#sec-guidelines
+  https://github.com/nix-community/home-manager/blob/master/doc/contributing.adoc#sec-guidelines
 
 -->
 
@@ -25,7 +25,7 @@ Also make sure to read the guidelines found at
 
 - [ ] Code tested through `nix-shell --pure tests -A run.all`.
 
-- [ ] Test cases updated/added. See [example](https://github.com/rycee/home-manager/commit/f3fbb50b68df20da47f9b0def5607857fcc0d021#diff-b61a6d542f9036550ba9c401c80f00ef).
+- [ ] Test cases updated/added. See [example](https://github.com/nix-community/home-manager/commit/f3fbb50b68df20da47f9b0def5607857fcc0d021#diff-b61a6d542f9036550ba9c401c80f00ef).
 
 - [ ] Commit messages are formatted like
 
@@ -35,10 +35,10 @@ Also make sure to read the guidelines found at
     {long description}
     ```
 
-    See [CONTRIBUTING](https://github.com/rycee/home-manager/blob/master/doc/contributing.adoc#sec-commit-style) for more information and [recent commit messages](https://github.com/rycee/home-manager/commits/master) for examples.
+    See [CONTRIBUTING](https://github.com/nix-community/home-manager/blob/master/doc/contributing.adoc#sec-commit-style) for more information and [recent commit messages](https://github.com/nix-community/home-manager/commits/master) for examples.
 
 - If this PR adds a new module
 
-  - [ ] Added myself as module maintainer. See [example](https://github.com/rycee/home-manager/blob/068ff76a10e95820f886ac46957edcff4e44621d/modules/programs/lesspipe.nix#L6).
+  - [ ] Added myself as module maintainer. See [example](https://github.com/nix-community/home-manager/blob/068ff76a10e95820f886ac46957edcff4e44621d/modules/programs/lesspipe.nix#L6).
 
   - [ ] Added myself and the module files to `.github/CODEOWNERS`.

.github/workflows/github_pages.yml

@@ -0,0 +1,28 @@
+name: GitHub Pages
+on:
+  push:
+    branches:
+      - master
+jobs:
+  publish:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cachix/install-nix-action@v10
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v6
+      with:
+        name: nix-community
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - run: |
+        nix-build -A docs.html
+        cp -r result/share/doc/home-manager public
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./public

.github/workflows/test.yml

@@ -14,5 +14,9 @@ jobs:
     - uses: cachix/install-nix-action@v10
       with:
         nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v6
+      with:
+        name: nix-community
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: nix-shell . -A install
     - run: nix-shell --pure --max-jobs 4 tests -A run.all

README.md

@@ -358,8 +358,8 @@ an issue.
 [nixAllowedUsers]: https://nixos.org/nix/manual/#conf-allowed-users
 [nixosAllowedUsers]: https://nixos.org/nixos/manual/options.html#opt-nix.allowedUsers
 [Z shell]: http://zsh.sourceforge.net/
-[manual]: https://rycee.gitlab.io/home-manager/
+[manual]: https://nix-community.github.io/home-manager/
-[configuration options]: https://rycee.gitlab.io/home-manager/options.html
+[configuration options]: https://nix-community.github.io/home-manager/options.html
 [#home-manager]: https://webchat.freenode.net/?url=irc%3A%2F%2Firc.freenode.net%2Fhome-manager
 [freenode]: https://freenode.net/
 [channel logs]: https://logs.nix.samueldr.com/home-manager/

doc/contributing.adoc

@@ -1,14 +1,14 @@
 [[ch-contributing]]
 == Contributing
 
-:open-issues: https://github.com/rycee/home-manager/issues
+:open-issues: https://github.com/nix-community/home-manager/issues
-:new-issue: https://github.com/rycee/home-manager/issues/new
+:new-issue: https://github.com/nix-community/home-manager/issues/new
 :fork-a-repo: https://help.github.com/articles/fork-a-repo/
 :create-a-pull-request: https://help.github.com/articles/creating-a-pull-request/
 :seven-rules: https://chris.beams.io/posts/git-commit/#seven-rules
-:news-nix: https://github.com/rycee/home-manager/blob/master/modules/misc/news.nix
+:news-nix: https://github.com/nix-community/home-manager/blob/master/modules/misc/news.nix
 :nixfmt: https://github.com/serokell/nixfmt/
-:example-commit-message: https://github.com/rycee/home-manager/commit/69f8e47e9e74c8d3d060ca22e18246b7f7d988ef
+:example-commit-message: https://github.com/nix-community/home-manager/commit/69f8e47e9e74c8d3d060ca22e18246b7f7d988ef
 
 Contributions to Home Manager are very welcome. To make the process as smooth as possible for both you and the Home Manager maintainers we provide some guidelines that we ask you to follow. See <<sec-contrib-getting-started>> for information on how to set up a suitable development environment and <<sec-guidelines>> for the actual guidelines.
 

doc/default.nix

@@ -33,7 +33,7 @@ let
     } ++ [ scrubbedPkgsModule ];
     moduleRootPaths = [ ./.. ];
     mkModuleUrl = path:
-      "https://github.com/rycee/home-manager/blob/master/${path}#blob-path";
+      "https://github.com/nix-community/home-manager/blob/master/${path}#blob-path";
     channelName = "home-manager";
     docBook.id = "home-manager-options";
   };

doc/installation.xml

@@ -62,14 +62,14 @@
      running
     </para>
 <screen>
-<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>$</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager</userinput>
 <prompt>$</prompt> <userinput>nix-channel --update</userinput>
 </screen>
     <para>
      if you are following Nixpkgs master or an unstable channel and
     </para>
 <screen>
-<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
+<prompt>$</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
 <prompt>$</prompt> <userinput>nix-channel --update</userinput>
 </screen>
     <para>
@@ -150,7 +150,7 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
   </para>
 
 <screen language="console">
-<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager</userinput>
 <prompt>#</prompt> <userinput>nix-channel --update</userinput>
 </screen>
 
@@ -159,7 +159,7 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
   </para>
 
 <screen language="console">
-<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
 <prompt>#</prompt> <userinput>nix-channel --update</userinput>
 </screen>
 
@@ -249,7 +249,7 @@ home-manager.useGlobalPkgs = true;
   </para>
 
 <screen language="console">
-<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager</userinput>
 <prompt>#</prompt> <userinput>nix-channel --update</userinput>
 </screen>
 
@@ -258,7 +258,7 @@ home-manager.useGlobalPkgs = true;
   </para>
 
 <screen language="console">
-<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
 <prompt>#</prompt> <userinput>nix-channel --update</userinput>
 </screen>
 

doc/man-home-manager.xml

@@ -512,7 +512,7 @@
   <para>
    Please report any bugs on the
    <link
-   xlink:href="https://github.com/rycee/home-manager/issues">project
+   xlink:href="https://github.com/nix-community/home-manager/issues">project
    issue tracker</link>.
   </para>
  </refsection>

doc/manual.xml

@@ -20,7 +20,7 @@
    are hosted courtesy of <link xlink:href="https://github.com/samueldr/">samueldr</link>.
    If your problem is caused by a bug in Home Manager then it should
    be reported on the
-   <link xlink:href="https://github.com/rycee/home-manager/issues">Home Manager issue tracker</link>.
+   <link xlink:href="https://github.com/nix-community/home-manager/issues">Home Manager issue tracker</link>.
   </para>
   <note>
    <para>

home-manager/install.nix

@@ -71,7 +71,7 @@ runCommand "home-manager-install" {
 
     Uh oh, the installation failed! Please create an issue at
 
-        https://github.com/rycee/home-manager/issues
+        https://github.com/nix-community/home-manager/issues
 
     if the error seems to be the fault of Home Manager.
     EOF

modules/misc/news.nix

@@ -508,7 +508,7 @@ in
           configuration you can add
 
               imports = [
-                "''${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos"
+                "''${builtins.fetchTarball https://github.com/nix-community/home-manager/archive/master.tar.gz}/nixos"
               ];
 
           to your 'configuration.nix' file. This will introduce a new
@@ -1363,7 +1363,7 @@ in
 
           To learn more, see the installation section of the manual
 
-            https://rycee.gitlab.io/home-manager/#sec-install-nixos-module
+            https://nix-community.github.io/home-manager/#sec-install-nixos-module
         '';
       }
 

modules/programs/zsh.nix

@@ -465,7 +465,7 @@ in
         '') cfg.plugins)}
 
         # History options should be set in .zshrc and after oh-my-zsh sourcing.
-        # See https://github.com/rycee/home-manager/issues/177.
+        # See https://github.com/nix-community/home-manager/issues/177.
         HISTSIZE="${toString cfg.history.size}"
         SAVEHIST="${toString cfg.history.save}"
         ${if versionAtLeast config.home.stateVersion "20.03"
@@ -493,7 +493,7 @@ in
 
     (mkIf cfg.oh-my-zsh.enable {
       # Make sure we create a cache directory since some plugins expect it to exist
-      # See: https://github.com/rycee/home-manager/issues/761
+      # See: https://github.com/nix-community/home-manager/issues/761
       home.file."${config.xdg.cacheHome}/oh-my-zsh/.keep".text = "";
     })
 

modules/services/window-managers/i3-sway/i3.nix

@@ -250,7 +250,7 @@ in {
         warnings = [
           ("'xsession.windowManager.i3.config.startup.*.workspace' is deprecated, "
             + "use 'xsession.windowManager.i3.config.assigns' instead."
-            + "See https://github.com/rycee/home-manager/issues/265.")
+            + "See https://github.com/nix-community/home-manager/issues/265.")
         ];
       })
   ]);

modules/services/window-managers/i3-sway/lib/options.nix

@@ -42,7 +42,7 @@ let
         description = ''
           Launch application on a particular workspace. DEPRECATED:
           Use <varname><link linkend="opt-xsession.windowManager.i3.config.assigns">xsession.windowManager.i3.config.assigns</link></varname>
-          instead. See <link xlink:href="https://github.com/rycee/home-manager/issues/265"/>.
+          instead. See <link xlink:href="https://github.com/nix-community/home-manager/issues/265"/>.
         '';
       };
     };

modules/targets/darwin.nix

@@ -2,7 +2,7 @@
 
 {
   # Disabled for now due to conflicting behavior with nix-darwin. See
-  # https://github.com/rycee/home-manager/issues/1341#issuecomment-687286866
+  # https://github.com/nix-community/home-manager/issues/1341#issuecomment-687286866
   config = lib.mkIf (false && pkgs.stdenv.hostPlatform.isDarwin) {
     # Install MacOS applications to the user environment.
     home.file."Applications/Home Manager Apps".source = let

modules/targets/generic-linux.nix

@@ -39,7 +39,7 @@ in {
     '';
 
     # We need to source both nix.sh and hm-session-vars.sh as noted in
-    # https://github.com/rycee/home-manager/pull/797#issuecomment-544783247
+    # https://github.com/nix-community/home-manager/pull/797#issuecomment-544783247
     programs.bash.initExtra = ''
       . "${pkgs.nix}/etc/profile.d/nix.sh"
       . "${profileDirectory}/etc/profile.d/hm-session-vars.sh"

tests/modules/programs/waybar/broken-settings.nix

@@ -68,7 +68,7 @@ in {
 
     nmt.description = ''
       Test for the broken configuration
-      https://github.com/rycee/home-manager/pull/1329#issuecomment-653253069
+      https://github.com/nix-community/home-manager/pull/1329#issuecomment-653253069
     '';
     nmt.script = ''
       assertPathNotExists home-files/.config/waybar/style.css

tests/modules/programs/waybar/default.nix

@@ -3,6 +3,6 @@
     ./systemd-with-graphical-session-target.nix;
   waybar-styling = ./styling.nix;
   waybar-settings-complex = ./settings-complex.nix;
-  # Broken configuration from https://github.com/rycee/home-manager/pull/1329#issuecomment-653253069
+  # Broken configuration from https://github.com/nix-community/home-manager/pull/1329#issuecomment-653253069
   waybar-broken-settings = ./broken-settings.nix;
 }

tests/modules/targets-darwin/default.nix

@@ -1,5 +1,5 @@
 {
   # Disabled for now due to conflicting behavior with nix-darwin. See
-  # https://github.com/rycee/home-manager/issues/1341#issuecomment-687286866
+  # https://github.com/nix-community/home-manager/issues/1341#issuecomment-687286866
   #targets-darwin = ./darwin.nix;
 }