Merge branch 'master' into polybar-config

.github/CODEOWNERS

@@ -1,5 +1,7 @@
 *                                                     @rycee
 
+/flake.nix                                            @bqv @kisik21
+
 /modules/home-environment.nix                         @rycee
 
 /modules/misc/dconf.nix                               @gnidorah @rycee
@@ -11,6 +13,9 @@
 
 /modules/misc/news.nix                                @rycee
 
+/modules/misc/numlock.nix                             @evanjs
+/tests/modules/misc/numlock                           @evanjs
+
 /modules/misc/pam.nix                                 @rycee
 /tests/modules/misc/pam                               @rycee
 
@@ -28,6 +33,9 @@
 
 /modules/programs/aria2.nix                           @JustinLovinger
 
+/modules/programs/autojump.nix                        @evanjs
+/tests/modules/programs/autojump                      @evanjs
+
 /modules/programs/autorandr.nix                       @uvNikita
 
 /modules/programs/bash.nix                            @rycee
@@ -48,6 +56,9 @@
 
 /modules/programs/firefox.nix                         @rycee
 
+/modules/programs/gh.nix                              @Gerschtli
+/tests/modules/programs/gh                            @Gerschtli
+
 /modules/programs/git.nix                             @rycee
 
 /modules/programs/gnome-terminal.nix                  @rycee
@@ -58,6 +69,8 @@
 
 /modules/programs/i3status.nix                        @JustinLovinger
 
+/modules/programs/i3status-rust.nix                   @workflow
+
 /modules/programs/keychain.nix                        @marsam
 
 /modules/programs/lesspipe.nix                        @rycee
@@ -71,8 +84,19 @@
 
 /modules/programs/matplotlib.nix                      @rprospero
 
+/modules/programs/mbsync.nix                          @KarlJoad
+/tests/modules/programs/mbsync                        @KarlJoad
+
+/modules/programs/mcfly.nix                           @marsam
+
 /modules/programs/mpv.nix                             @tadeokondrak
 
+/modules/programs/mu.nix                              @KarlJoad
+
+/modules/programs/ncmpcpp.nix                         @olmokramer
+/tests/modules/programs/ncmpcpp                       @olmokramer
+/tests/modules/programs/ncmpcpp-linux                 @olmokramer
+
 /modules/programs/ne.nix                              @cwyc
 /tests/modules/programs/ne                            @cwyc
 
@@ -103,12 +127,19 @@
 
 /modules/programs/texlive.nix                         @rycee
 
+/modules/programs/waybar.nix                          @berbiche
+/tests/modules/programs/waybar                        @berbiche
+
 /modules/programs/z-lua.nix                           @marsam
 
 /modules/programs/zathura.nix                         @rprospero
 
 /modules/programs/zoxide.nix                          @marsam
 
+/modules/programs/zsh/prezto.nix                      @NickHu
+
+/modules/services/caffeine.nix                        @uvNikita
+
 /modules/services/cbatticon.nix                       @pmiddend
 
 /modules/services/clipmenu.nix                        @DamienCassou
@@ -124,6 +155,8 @@
 
 /modules/services/fluidsynth.nix                      @Valodim
 
+/modules/services/gammastep.nix                       @petabyteboy
+
 /modules/services/gnome-keyring.nix                   @rycee
 
 /modules/services/gpg-agent.nix                       @rycee
@@ -134,6 +167,9 @@
 
 /modules/services/imapnotify.nix                      @nickhu
 
+/modules/services/kanshi.nix                          @nurelin
+/tests/modules/services/kanshi                        @nurelin
+
 /modules/services/kdeconnect.nix                      @adisbladis
 
 /modules/services/keepassx.nix                        @rycee
@@ -180,6 +216,9 @@
 
 /modules/services/window-managers/i3-sway/sway.nix    @alexarice
 
+/modules/services/wlsunset.nix                        @matrss
+/tests/modules/services/wlsunset                      @matrss
+
 /modules/services/xcape.nix                           @nickhu
 
 /modules/services/xembed-sni-proxy.nix                @rycee

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,18 @@
+<!--
+
+If you are encountering the error
+
+  element xref: validity error : IDREF attribute linkend references an unknown ID "opt-home.file._name__.source"
+
+then it means that you are using an old version of Home Manager, such
+as the release-20.03 branch, with a recent version of Nixpkgs, such as
+version 20.09 or master. See https://git.io/JTb6K for more.
+
+In general, please check if there already exists a relevant issue
+before creating a new one.
+
+-->
+
 ### Issue description
 
 <!--

.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@v12
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v8
+      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

@@ -11,8 +11,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v10
+    - uses: cachix/install-nix-action@v12
       with:
         nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v8
+      with:
+        name: nix-community
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - run: ./format -c
     - run: nix-shell . -A install
-    - run: nix-shell --pure --max-jobs 4 tests -A run.all
+    - run: nix-shell --pure tests -A run.all

.gitignore

@@ -1 +1,2 @@
+/flake.lock
 /result*

.gitlab-ci.yml

@@ -1,8 +1,7 @@
 image: nixos/nix:latest
 
 variables:
-  # Pinned 2020-03-28.
-  NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/05f0934825c2a0750d4888c4735f9420c906b388.tar.gz"
+  NIX_PATH: "nixpkgs=channel:nixos-unstable"
 
 stages:
   - test

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2020 Robert Helgesson and Home Manager contributors
+Copyright (c) 2017-2020 Home Manager contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -27,7 +27,7 @@ will write to your dconf store and cannot tell whether a configuration
 that it is about to be overwrite was from a previous Home Manager
 generation or from manual configuration.
 
-Home Manager targets [NixOS][] unstable and NixOS version 20.03 (the
+Home Manager targets [NixOS][] unstable and NixOS version 20.09 (the
 current stable version), it may or may not work on other Linux
 distributions and NixOS versions.
 
@@ -61,21 +61,23 @@ Currently the easiest way to install Home Manager is as follows:
     control this option using the
     [`nix.allowedUsers`][nixosAllowedUsers] system option.
 
+    Note that Nix 2.4 (`nixUnstable`) is not yet supported.
+
 2.  Add the appropriate Home Manager channel. Typically this is
 
     ```console
-    $ nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager
+    $ nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
     $ nix-channel --update
     ```
 
     if you are following Nixpkgs master or an unstable channel and
 
     ```console
-    $ nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
+    $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager
     $ nix-channel --update
     ```
 
-    if you follow a Nixpkgs version 20.03 channel.
+    if you follow a Nixpkgs version 20.09 channel.
 
     On NixOS you may need to log out and back in for the channel to
     become available. On non-NixOS you may have to add
@@ -129,8 +131,8 @@ configuration generations.
 
 As an example, let us expand the initial configuration file from the
 installation above to install the htop and fortune packages, install
-Emacs with a few extra packages enabled, install Firefox with the
-IcedTea plugin enabled, and enable the user gpg-agent service.
+Emacs with a few extra packages enabled, install Firefox with
+smooth scrolling enabled, and enable the user gpg-agent service.
 
 To satisfy the above setup we should elaborate the
 `~/.config/nixpkgs/home.nix` file as follows:
@@ -305,14 +307,49 @@ in your system configuration and
 
 in your Home Manager configuration.
 
+Nix Flakes
+----------
+
+Home Manager includes a `flake.nix` file for compatibility with [Nix Flakes][]
+for those that wish to use it as a module. A bare-minimum `flake.nix` would be
+as follows:
+
+```nix
+{
+  description = "NixOS configuration";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+  };
+
+  outputs = { home-manager, nixpkgs, ... }: {
+    nixosConfigurations = {
+      hostname = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.user = import ./home.nix;
+          }
+        ];
+      };
+    };
+  };
+}
+```
+
 Releases
 --------
 
 Home Manager is developed against `nixpkgs-unstable` branch, which
 often causes it to contain tweaks for changes/packages not yet
 released in stable NixOS. To avoid breaking users' configurations,
 Home Manager is released in branches corresponding to NixOS releases
-(e.g. `release-20.03`). These branches get fixes, but usually not new
+(e.g. `release-20.09`). These branches get fixes, but usually not new
 modules. If you need a module to be backported, then feel free to open
 an issue.
 
@@ -323,10 +360,11 @@ 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/
-[configuration options]: https://rycee.gitlab.io/home-manager/options.html
+[manual]: https://nix-community.github.io/home-manager/
+[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/
 [samueldr]: https://github.com/samueldr/
 [Nix Pills]: https://nixos.org/nixos/nix-pills/
+[Nix Flakes]: https://nixos.wiki/wiki/Flakes

doc/contributing.adoc

@@ -1,14 +1,14 @@
 [[ch-contributing]]
 == Contributing
 
-:open-issues: https://github.com/rycee/home-manager/issues
-:new-issue: https://github.com/rycee/home-manager/issues/new
+:open-issues: https://github.com/nix-community/home-manager/issues
+: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";
   };