From 731959ef0e5c793ecec055efcc7401c2bfdc92e1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 19 Oct 2020 20:56:00 +0200 Subject: [PATCH 1/4] ci: add cachix cache --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12be93e29..52e1badf2 100644 --- a/.github/workflows/test.yml +++ b/.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 From 1c4ced745c91795159e569ad34cb8d1a6ac2c9b4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 19 Oct 2020 21:04:32 +0200 Subject: [PATCH 2/4] ci: deploy the manual to GitHub Pages --- .github/workflows/github_pages.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/github_pages.yml diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml new file mode 100644 index 000000000..5baf396a2 --- /dev/null +++ b/.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 From 014d8deb600fe6c2ac78311801e1155fd6b74b8b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 19 Oct 2020 21:20:37 +0200 Subject: [PATCH 3/4] tree-wide: update url to the repo --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++---- doc/contributing.adoc | 8 ++++---- doc/default.nix | 2 +- doc/installation.xml | 12 ++++++------ doc/man-home-manager.xml | 2 +- doc/manual.xml | 2 +- home-manager/install.nix | 2 +- modules/misc/news.nix | 2 +- modules/programs/zsh.nix | 4 ++-- modules/services/window-managers/i3-sway/i3.nix | 2 +- .../services/window-managers/i3-sway/lib/options.nix | 2 +- modules/targets/darwin.nix | 2 +- modules/targets/generic-linux.nix | 2 +- tests/modules/programs/waybar/broken-settings.nix | 2 +- tests/modules/programs/waybar/default.nix | 2 +- tests/modules/targets-darwin/default.nix | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eb6eca762..6c68d75b2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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`. diff --git a/doc/contributing.adoc b/doc/contributing.adoc index a6c7a3278..dd68f296f 100644 --- a/doc/contributing.adoc +++ b/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 <> for information on how to set up a suitable development environment and <> for the actual guidelines. diff --git a/doc/default.nix b/doc/default.nix index 88e975614..6b8e229aa 100644 --- a/doc/default.nix +++ b/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"; }; diff --git a/doc/installation.xml b/doc/installation.xml index 3e1f75abb..bd8d0185c 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -62,14 +62,14 @@ running -$ 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 -$ 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.03.tar.gz home-manager $ nix-channel --update @@ -150,7 +150,7 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh -# 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 @@ -159,7 +159,7 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh -# 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.03.tar.gz home-manager # nix-channel --update @@ -249,7 +249,7 @@ home-manager.useGlobalPkgs = true; -# 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 @@ -258,7 +258,7 @@ home-manager.useGlobalPkgs = true; -# 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.03.tar.gz home-manager # nix-channel --update diff --git a/doc/man-home-manager.xml b/doc/man-home-manager.xml index 90f58063e..2f141d970 100644 --- a/doc/man-home-manager.xml +++ b/doc/man-home-manager.xml @@ -512,7 +512,7 @@ Please report any bugs on the project + xlink:href="https://github.com/nix-community/home-manager/issues">project issue tracker. diff --git a/doc/manual.xml b/doc/manual.xml index ff355d6ce..314d7c10a 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -20,7 +20,7 @@ are hosted courtesy of samueldr. If your problem is caused by a bug in Home Manager then it should be reported on the - Home Manager issue tracker. + Home Manager issue tracker. diff --git a/home-manager/install.nix b/home-manager/install.nix index 87252730e..50b5ea16a 100644 --- a/home-manager/install.nix +++ b/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 diff --git a/modules/misc/news.nix b/modules/misc/news.nix index e047d3af4..4db1edaba 100644 --- a/modules/misc/news.nix +++ b/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 diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix index feb2f2e8a..362daa3c0 100644 --- a/modules/programs/zsh.nix +++ b/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 = ""; }) diff --git a/modules/services/window-managers/i3-sway/i3.nix b/modules/services/window-managers/i3-sway/i3.nix index f7124e6fd..8cc01cd62 100644 --- a/modules/services/window-managers/i3-sway/i3.nix +++ b/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.") ]; }) ]); diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix index a82502917..f1d0436a5 100644 --- a/modules/services/window-managers/i3-sway/lib/options.nix +++ b/modules/services/window-managers/i3-sway/lib/options.nix @@ -42,7 +42,7 @@ let description = '' Launch application on a particular workspace. DEPRECATED: Use xsession.windowManager.i3.config.assigns - instead. See . + instead. See . ''; }; }; diff --git a/modules/targets/darwin.nix b/modules/targets/darwin.nix index cd7d8e289..118321e8f 100644 --- a/modules/targets/darwin.nix +++ b/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 diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix index 47fcc87b3..cf6b2bd87 100644 --- a/modules/targets/generic-linux.nix +++ b/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" diff --git a/tests/modules/programs/waybar/broken-settings.nix b/tests/modules/programs/waybar/broken-settings.nix index 68f0b90bf..f5ac39468 100644 --- a/tests/modules/programs/waybar/broken-settings.nix +++ b/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 diff --git a/tests/modules/programs/waybar/default.nix b/tests/modules/programs/waybar/default.nix index d50b1b8d3..cac5de664 100644 --- a/tests/modules/programs/waybar/default.nix +++ b/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; } diff --git a/tests/modules/targets-darwin/default.nix b/tests/modules/targets-darwin/default.nix index 5c04854ff..10e4111f7 100644 --- a/tests/modules/targets-darwin/default.nix +++ b/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; } From 9cf5f764e110aa1aeabbed160d009822425fae75 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 19 Oct 2020 21:22:35 +0200 Subject: [PATCH 4/4] tree-wide: update link to the doc --- README.md | 4 ++-- modules/misc/news.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 22b9094c6..4cdc1542b 100644 --- a/README.md +++ b/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/ -[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/ diff --git a/modules/misc/news.nix b/modules/misc/news.nix index 4db1edaba..9b3c5111b 100644 --- a/modules/misc/news.nix +++ b/modules/misc/news.nix @@ -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 ''; }