ci: bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
htop: fix order or header_columns setting (backport) (#2443 )
2022-03-07 01:25:15 +00:00 · 2021-11-30 09:15:21 -05:00 · 2021-11-26 10:11:34 +01:00 · 2021-11-26 10:11:22 +01:00 · 2021-11-26 10:10:13 +01:00 · 2021-11-15 23:33:21 +00:00
248 changed files with 1102 additions and 5779 deletions
@@ -4,9 +4,6 @@

 /modules/home-environment.nix                         @rycee

-/modules/i18n/input-method                            @Kranzes
-/tests/modules/i18n/input-method                      @Kranzes
-
 /modules/misc/dconf.nix                               @gnidorah @rycee

 /modules/misc/fontconfig.nix                          @rycee
@@ -40,11 +37,6 @@
 /modules/misc/xdg-system-dirs.nix                     @tadfisher
 /tests/modules/misc/xdg/system-dirs.nix               @tadfisher

-/modules/misc/xdg-desktop-entries.nix                 @cwyc
-/tests/modules/misc/xdg/desktop-entries.nix           @cwyc
-/tests/modules/misc/xdg/desktop-full-expected.desktop @cwyc
-/tests/modules/misc/xdg/desktop-min-expected.desktop  @cwyc
-
 /modules/programs/aria2.nix                           @JustinLovinger

 /modules/programs/autojump.nix                        @evanjs
@@ -80,13 +72,10 @@

 /modules/programs/git.nix                             @rycee

-/modules/programs/gnome-terminal.nix                  @kamadorueda @rycee
+/modules/programs/gnome-terminal.nix                  @rycee

 /modules/programs/go.nix                              @rvolosatovs

-/modules/programs/himalaya.nix                        @ambroisie
-/tests/modules/programs/himalaya                      @ambroisie
-
 /modules/programs/home-manager.nix                    @rycee

 /modules/programs/htop.nix                            @bjpbakker
@@ -95,6 +84,8 @@

 /modules/programs/i3status-rust.nix                   @workflow

+/modules/programs/java.nix                            @ShamrockLee
+
 /modules/programs/keychain.nix                        @marsam

 /modules/programs/lazygit.nix                         @kalhauge
@@ -110,9 +101,6 @@

 /modules/programs/matplotlib.nix                      @rprospero

-/modules/programs/mangohud.nix                        @ZerataX
-/tests/modules/programs/mangohud                      @ZerataX
-
 /modules/programs/mbsync.nix                          @KarlJoad
 /tests/modules/programs/mbsync                        @KarlJoad

@@ -157,13 +145,8 @@

 /modules/programs/pidgin.nix                          @rycee

-/modules/programs/piston-cli.nix                      @ethancedwards8
-
 /modules/programs/powerline-go.nix                    @DamienCassou

-/modules/programs/rbw.nix                             @ambroisie
-/tests/modules/programs/rbw                           @ambroisie
-
 /modules/programs/rofi.nix                            @thiagokokada
 /tests/modules/programs/rofi                          @thiagokokada

@@ -178,17 +161,10 @@
 /modules/programs/scmpuff.nix                         @cpcloud
 /tests/modules/programs/scmpuff                       @cpcloud

-/modules/programs/senpai.nix                          @malte-v
-
-/modules/programs/sm64ex.nix                          @ivarwithoutbones
-/tests/modules/programs/sm64ex                        @ivarwithoutbones
-
 /modules/programs/ssh.nix                             @rycee

 /modules/programs/starship.nix                        @marsam

-/modules/programs/terminator.nix                      @chisui
-
 /modules/programs/texlive.nix                         @rycee

 /modules/programs/topgrade.nix                        @msfjarvis
@@ -197,9 +173,6 @@
 /modules/programs/waybar.nix                          @berbiche
 /tests/modules/programs/waybar                        @berbiche

-/modules/programs/xmobar.nix                          @t4ccer
-/tests/modules/programs/xmobar                        @t4ccer
-
 /modules/programs/z-lua.nix                           @marsam

 /modules/programs/zathura.nix                         @rprospero
@@ -217,9 +190,6 @@

 /modules/services/clipmenu.nix                        @DamienCassou

-/modules/services/devilspie2.nix                      @dawidsowa
-/tests/modules/services/devilspie2                    @dawidsowa
-
 /modules/services/dropbox.nix                         @eyJhb
 /tests/modules/services/dropbox                       @eyJhb

@@ -266,9 +236,6 @@

 /modules/services/network-manager-applet.nix          @rycee

-/modules/services/pantalaimon.nix                     @jojosch
-/tests/modules/services/pantalaimon                   @jojosch
-
 /modules/services/parcellite.nix                      @gleber

 /modules/services/pass-secret-service.nix             @cab404
@@ -304,16 +271,10 @@

 /modules/services/taskwarrior-sync.nix                @minijackson @pacien

-/modules/services/trayer.nix                          @AndreasMager
-/tests/modules/services/trayer                        @AndreasMager
-
 /modules/services/udiskie.nix                         @rycee

 /modules/services/unison.nix                          @pacien

-/modules/services/window-managers/bspwm               @ncfavier
-/tests/modules/services/window-managers/bspwm         @ncfavier
-
 /modules/services/window-managers/i3-sway/i3.nix      @sumnerevans
 /tests/modules/services/window-managers/i3            @sumnerevans

@@ -329,8 +290,6 @@

 /modules/services/xembed-sni-proxy.nix                @rycee

-/modules/services/xidlehook.nix                       @dschrempf
-
 /modules/services/xscreensaver.nix                    @rycee

 /modules/services/xsuspender.nix                      @offlinehacker
@@ -342,5 +301,3 @@
 /modules/xresources.nix                               @rycee

 /modules/xsession.nix                                 @rycee
-
-/modules/services/volnoti.nix                         @IvanMalison
@@ -0,0 +1,31 @@
+<!--
+
+Don't forget to check if there already exists a relevant issue before
+creating a new one.
+
+-->
+
+### Issue description
+
+<!--
+Please describe the issue. For support and help please use the IRC
+channel #home-manager at irc.oftc.net or Matrix room
+https://matrix.to/#/#hm:rycee.net instead.
+-->
+
+### Meta
+
+#### Maintainer CC
+
+<!--
+Please @ people who are in the `meta.maintainers` list of the
+offending module. If in doubt, check `git blame` for whoever last
+touched something.
+-->
+
+#### Technical details
+
+<!--
+Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the
+result.
+-->
@@ -1,15 +0,0 @@
---
-name: Feature request
-about: Ask for a new feature to be added (module, program, etc.)
-title: ''
-labels: feature request
-assignees: rycee, berbiche, sumnerevans
-
---
-
-<!--
-Note: Please search to see if the feature has already been requested
-->
-
-### Description
-
@@ -1,46 +0,0 @@
-name: Bug Report
-description: File a bug/issue
-title: 'bug: '
-labels: [bug, triage]
-
-# We cannot use nix-community/home-manager
-# See https://github.com/dear-github/dear-github/issues/170
-assignees: [rycee, berbiche, sumnerevans]
-
-body:
- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: |
-      Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
- type: textarea
-  attributes:
-    label: Issue description
-    description: |
-      Please describe the issue.
-
-      For support and help please use the IRC channel #home-manager at irc.oftc.net or
-      Matrix room <https://matrix.to/#/#hm:rycee.net> instead.
-  validations:
-    required: false
- type: textarea
-  attributes:
-    label: Maintainer CC
-    description: |
-      Please @ people who are in the `meta.maintainers` list of the offending module.
-      If in doubt, check `git blame` for whoever last touched something.
-  validations:
-    required: false
- type: textarea
-  id: system
-  attributes:
-    label: System information
-    description: |
-      Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
-    render: markdown
-  validations:
-    required: true
-
@@ -10,8 +10,8 @@ jobs:
        os: [ubuntu-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v13
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v16
      with:
        nix_path: nixpkgs=channel:nixos-unstable
    - uses: cachix/cachix-action@v10
@@ -10,10 +10,11 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v13
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v16
      with:
-        nix_path: nixpkgs=channel:nixos-unstable
+        install_url: https://releases.nixos.org/nix/nix-2.3.16/install
+        nix_path: nixpkgs=channel:nixos-21.05
    - uses: cachix/cachix-action@v10
      with:
        name: nix-community
@@ -1 +0,0 @@
-21.11
@@ -40,8 +40,6 @@ error: build of ‘/nix/store/b37x3s7pzxbasfqhaca5dqbf3pjjw0ip-user-environment.

 The solution is typically to uninstall the package from the environment using `nix-env --uninstall` and reattempt the Home Manager generation switch.

-You could also opt to unistall _all_ of the packages from your profile with `nix-env --uninstall '*'`.
-
 === Why are the session variables not set?

 Home Manager is only able to set session variables automatically if it manages your Bash or Z shell configuration. If you don't want to let Home Manager manage your shell then you will have to manually source the `~/.nix-profile/etc/profile.d/hm-session-vars.sh` file in an appropriate way. In Bash and Z shell this can be done by adding
@@ -41,10 +41,6 @@
    news
   </arg>

-   <arg choice="plain">
-    option <replaceable>option.name</replaceable>
-   </arg>
-
   <arg choice="plain">
    packages
   </arg>
@@ -254,18 +250,6 @@
      </para>
     </listitem>
    </varlistentry>
-    <varlistentry>
-     <term>
-      <option>option <replaceable>option.name</replaceable></option>
-     </term>
-     <listitem>
-      <para>
-       Inspect the given option name in the home configuration, like <citerefentry>
-       <refentrytitle>nixos-option</refentrytitle>
-       <manvolnum>8</manvolnum> </citerefentry>.
-      </para>
-     </listitem>
-    </varlistentry>
    <varlistentry>
     <term>
      <option>packages</option>
@@ -6,8 +6,6 @@ This section lists the release notes for stable versions of Home Manager and the

 :leveloffset: 1

-include::rl-2111.adoc[]
-
 include::rl-2105.adoc[]

 include::rl-2009.adoc[]
@@ -1,43 +0,0 @@
-[[sec-release-21.11]]
-== Release 21.11
-
-This is the current unstable branch and the information in this
-section is therefore not final.
-
-[[sec-release-21.11-highlights]]
-=== Highlights
-
-This release has the following notable changes:
-
-* All Home Manager modules are now loaded on all platforms. With this
-change you will get a more descriptive error message if you attempt to
-enable a module that is incompatible with the host platform.
-+
-Previously, modules that were platform specific would only be loaded
-on that particular platform. For example, a module defining a
-https://systemd.io/[systemd] service would only be loaded when the
-host platform was Linux. This reduced evaluation times, simplified the
-generated documentation, and made it impossible to accidentally use
-modules that do not support the host platform.
-+
-While the above benefits are quite nice, avoiding module loads also
-brings a few problems. For example, the
-https://nix-community.github.io/home-manager/[public documentation]
-will only show the options available for Linux hosts and the
-documentation cannot make references to options within modules that
-are unavailable on some hosts. Finally, users who wish to use the same
-configuration file for different platforms cannot do so, even if the
-platform incompatible options are unused.
-+
-Ultimately, the benefits of loading all modules won and the behavior
-has now changed. For associated discussion see
-https://github.com/nix-community/home-manager/issues/1906[issue #1906].
-
-[[sec-release-21.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
-"21.11" or later.
-
-* Nothing has happened.
@@ -26,15 +26,25 @@ find . -name '*.nix' \
  ! -path ./modules/lib/file-type.nix \
  ! -path ./modules/manual.nix \
  ! -path ./modules/misc/news.nix \
+  ! -path ./modules/misc/nixpkgs.nix \
+  ! -path ./modules/misc/xdg.nix \
+  ! -path ./modules/modules.nix \
  ! -path ./modules/programs/bash.nix \
+  ! -path ./modules/programs/firefox.nix \
  ! -path ./modules/programs/gpg.nix \
  ! -path ./modules/programs/ssh.nix \
  ! -path ./modules/programs/tmux.nix \
  ! -path ./modules/programs/zsh.nix \
  ! -path ./modules/services/gpg-agent.nix \
  ! -path ./modules/services/mpd.nix \
+  ! -path ./modules/services/sxhkd.nix \
+  ! -path ./modules/systemd.nix \
  ! -path ./nix-darwin/default.nix \
  ! -path ./tests/default.nix \
  ! -path ./tests/modules/home-environment/session-variables.nix \
  ! -path ./tests/modules/programs/gpg/override-defaults.nix \
+  ! -path ./tests/modules/programs/zsh/session-variables.nix \
+  ! -path ./tests/modules/services/sxhkd/service.nix \
+  ! -path ./tests/modules/systemd/services.nix \
+  ! -path ./tests/modules/systemd/session-variables.nix \
  -exec nixfmt $CHECK_ARG {} +
@@ -62,7 +62,6 @@
 # generations
 # help
 # news
-# option
 # packages
 # remove-generations
 # switch
@@ -87,7 +86,6 @@
 #
 #   help
 #   edit
-#   option
 #   build
 #   switch
 #   generations
@@ -133,9 +131,6 @@
 #
 #   edit         Open the home configuration in $EDITOR
 #
-#   option OPTION.NAME
-#                Inspect configuration option named OPTION.NAME.
-#
 #   build        Build configuration into result directory
 #
 #   switch       Build and activate configuration
@@ -283,7 +278,7 @@ _home-manager_completions ()
    #--------------------------#

    local Subcommands
-    Subcommands=( "help" "edit" "option" "build" "instantiate" "switch" "generations" "remove-generations" "expire-generations" "packages" "news" "uninstall" )
+    Subcommands=( "help" "edit" "build" "instantiate" "switch" "generations" "remove-generations" "expire-generations" "packages" "news" "uninstall" )

    # ^ « home-manager »'s subcommands.

@@ -359,4 +354,4 @@ _home-manager_completions ()

 complete -F _home-manager_completions -o default home-manager

-#complete -W "help edit option build switch generations remove-generations expire-generations packages news" home-manager
+#complete -W "help edit build switch generations remove-generations expire-generations packages news" home-manager
@@ -1,62 +0,0 @@
-#!/bin/env fish
-##################################################
-
-# « home-manager » command-line fish completion
-#
-# © 2021 "Ariel AxionL" <i at axionl dot me>
-#
-# MIT License
-#
-
-##################################################
-
-### Functions
-function __home_manager_generations --description "Get all generations"
-    for i in (home-manager generations)
-        set -l split (string split " " $i)
-        set -l gen_id $split[5]
-        set -l gen_datetime $split[1..2]
-        set -l gen_hash (string match -r '\w{32}' $i)
-        echo $gen_id\t$gen_datetime $gen_hash
-    end
-end
-
-
-### SubCommands
-complete -c home-manager -n "__fish_use_subcommand" -f -a "help" -d "Print home-manager help"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "edit" -d "Open the home configuration in $EDITOR"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "option" -d "Inspect configuration option"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "build" -d "Build configuration into result directory"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "instantiate" -d "Instantiate the configuration and print the resulting derivation"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "switch" -d "Build and activate configuration"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "generations" -d "List all home environment generations"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "packages" -d "List all packages installed in home-manager-path"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "news" -d "Show news entries in a pager"
-complete -c home-manager -n "__fish_use_subcommand" -f -a "uninstall" -d "Remove Home Manager"
-
-complete -c home-manager -n "__fish_use_subcommand" -x -a "remove-generations" -d "Remove indicated generations"
-complete -c home-manager -n "__fish_seen_subcommand_from remove-generations" -f -ka '(__home_manager_generations)'
-
-complete -c home-manager -n "__fish_use_subcommand" -x -a "expire-generations" -d "Remove generations older than TIMESTAMP"
-
-### Options
-complete -c home-manager -F -s f -l "file" -d "The home configuration file"
-complete -c home-manager -x -s A -d "Select an expression in the configuration file"
-complete -c home-manager -F -s I -d "Add a path to the Nix expression search path"
-complete -c home-manager -F -l "flake" -d "Use home-manager configuration at specified flake-uri"
-complete -c home-manager -F -s b -d "Move existing files to new path rather than fail"
-complete -c home-manager -f -s v -l "verbose" -d "Verbose output"
-complete -c home-manager -f -s n -l "dry-run" -d "Do a dry run, only prints what actions would be taken"
-complete -c home-manager -f -s h -l "help" -d "Print this help"
-
-complete -c home-manager -x -l "arg" -d "Override inputs passed to home-manager.nix"
-complete -c home-manager -x -l "argstr" -d "Like --arg but the value is a string"
-complete -c home-manager -x -l "cores" -d "Threads per job (e.g. -j argument to make)"
-complete -c home-manager -x -l "debug"
-complete -c home-manager -f -l "keep-failed" -d "Keep temporary directory used by failed builds"
-complete -c home-manager -f -l "keep-going" -d "Keep going in case of failed builds"
-complete -c home-manager -x -s j -l "max-jobs" -d "Max number of build jobs in parallel"
-complete -c home-manager -x -l "option" -d "Set Nix configuration option"
-complete -c home-manager -f -l "show-trace" -d "Print stack trace of evaluation errors"
-complete -c home-manager -f -l "substitute"
-complete -c home-manager -f -l "no-substitute"
@@ -25,7 +25,6 @@ case "$state" in
    _values 'command' \
      'help[help]' \
      'edit[edit]' \
-      'option[inspect option]' \
      'build[build]' \
      'switch[switch]' \
      'generations[list generations]' \
@@ -1,6 +1,4 @@
-{ runCommand, lib, bash, callPackage, coreutils, findutils, gnused, less
-# used for pkgs.path for nixos-option
-, pkgs
+{ runCommand, lib, bash, coreutils, findutils, gnused, less

 # Extra path to Home Manager. If set then this path will be tried
 # before `$HOME/.config/nixpkgs/home-manager` and
@@ -11,9 +9,6 @@ let

  pathStr = if path == null then "" else path;

-  nixos-option = pkgs.nixos-option or (callPackage
-    (pkgs.path + "/nixos/modules/installer/tools/nixos-option") { });
-
 in runCommand "home-manager" {
  preferLocalBuild = true;
  allowSubstitutes = false;
@@ -32,13 +27,10 @@ in runCommand "home-manager" {
    --subst-var-by findutils "${findutils}" \
    --subst-var-by gnused "${gnused}" \
    --subst-var-by less "${less}" \
-    --subst-var-by nixos-option "${nixos-option}" \
    --subst-var-by HOME_MANAGER_PATH '${pathStr}'

  install -D -m755 ${./completion.bash} \
    $out/share/bash-completion/completions/home-manager
  install -D -m755 ${./completion.zsh} \
    $out/share/zsh/site-functions/_home-manager
-  install -D -m755 ${./completion.fish} \
-    $out/share/fish/vendor_completions.d/home-manager.fish
 ''
@@ -1,7 +1,7 @@
 #!@bash@/bin/bash

 # Prepare to use tools from Nixpkgs.
-PATH=@coreutils@/bin:@findutils@/bin:@gnused@/bin:@less@/bin:@nixos-option@/bin${PATH:+:}$PATH
+PATH=@coreutils@/bin:@findutils@/bin:@gnused@/bin:@less@/bin${PATH:+:}$PATH

 set -euo pipefail

@@ -97,46 +97,6 @@ function setFlakeAttribute() {
    fi
 }

-function doInspectOption() {
-    setFlakeAttribute
-    if [[ -v FLAKE_CONFIG_URI ]]; then
-        errorEcho "Can't inspect options of a flake configuration"
-        exit 1
-    fi
-    setConfigFile
-    setHomeManagerNixPath
-
-    local extraArgs=("$@")
-
-    for p in "${EXTRA_NIX_PATH[@]}"; do
-        extraArgs=("${extraArgs[@]}" "-I" "$p")
-    done
-
-    if [[ -v VERBOSE ]]; then
-        extraArgs=("${extraArgs[@]}" "--show-trace")
-    fi
-
-    local HOME_MANAGER_CONFIG_NIX HOME_MANAGER_CONFIG_ATTRIBUTE_NIX
-    HOME_MANAGER_CONFIG_NIX=${HOME_MANAGER_CONFIG//'\'/'\\'}
-    HOME_MANAGER_CONFIG_NIX=${HOME_MANAGER_CONFIG_NIX//'"'/'\"'}
-    HOME_MANAGER_CONFIG_NIX=${HOME_MANAGER_CONFIG_NIX//$'\n'/$'\\n'}
-    HOME_MANAGER_CONFIG_ATTRIBUTE_NIX=${HOME_MANAGER_CONFIG_ATTRIBUTE//'\'/'\\'}
-    HOME_MANAGER_CONFIG_ATTRIBUTE_NIX=${HOME_MANAGER_CONFIG_ATTRIBUTE_NIX//'"'/'\"'}
-    HOME_MANAGER_CONFIG_ATTRIBUTE_NIX=${HOME_MANAGER_CONFIG_ATTRIBUTE_NIX//$'\n'/$'\\n'}
-    local modulesExpr
-    modulesExpr="let confPath = \"${HOME_MANAGER_CONFIG_NIX}\"; "
-    modulesExpr+="confAttr = \"${HOME_MANAGER_CONFIG_ATTRIBUTE_NIX}\"; in "
-    modulesExpr+="(import <home-manager/modules> {"
-    modulesExpr+=" configuration = if confAttr == \"\" then confPath else (import confPath).\${confAttr};"
-    modulesExpr+=" pkgs = import <nixpkgs> {}; check = true; })"
-
-    nixos-option \
-        --options_expr "$modulesExpr.options" \
-        --config_expr "$modulesExpr.config" \
-        "${extraArgs[@]}" \
-        "${PASSTHROUGH_OPTS[@]}"
-}
-
 function doInstantiate() {
    setFlakeAttribute
    if [[ -v FLAKE_CONFIG_URI ]]; then
@@ -527,9 +487,6 @@ function doHelp() {
    echo
    echo "  edit         Open the home configuration in \$EDITOR"
    echo
-    echo "  option OPTION.NAME"
-    echo "               Inspect configuration option named OPTION.NAME."
-    echo
    echo "  build        Build configuration into result directory"
    echo
    echo "  instantiate  Instantiate the configuration and print the resulting derivation"
@@ -567,7 +524,7 @@ while [[ $# -gt 0 ]]; do
    opt="$1"
    shift
    case $opt in
-        build|instantiate|option|edit|expire-generations|generations|help|news|packages|remove-generations|switch|uninstall)
+        build|instantiate|edit|expire-generations|generations|help|news|packages|remove-generations|switch|uninstall)
            COMMAND="$opt"
            ;;
        -A)
@@ -624,12 +581,12 @@ while [[ $# -gt 0 ]]; do
            export VERBOSE=1
            ;;
        --version)
-            echo 21.11
+            echo 21.05
            exit 0
            ;;
        *)
            case $COMMAND in
-                expire-generations|remove-generations|option)
+                expire-generations|remove-generations)
                    COMMAND_ARGS+=("$opt")
                    ;;
                *)
@@ -674,9 +631,6 @@ case $COMMAND in
            doExpireGenerations "${COMMAND_ARGS[@]}"
        fi
        ;;
-    option)
-        doInspectOption "${COMMAND_ARGS[@]}"
-        ;;
    packages)
        doListPackages
        ;;
@@ -45,7 +45,7 @@ runCommand "home-manager-install" {
      # You can update Home Manager without changing this value. See
      # the Home Manager release notes for a list of state version
      # changes in each release.
-      home.stateVersion = "21.11";
+      home.stateVersion = "21.05";
    }
    EOF
    fi
@@ -332,10 +332,7 @@ let
      (mkIf (config.flavor == "gmail.com") {
        userName = mkDefault config.address;

-        imap = {
-          host = "imap.gmail.com";
-          port = 993;
-        };
+        imap = { host = "imap.gmail.com"; };

        smtp = {
          host = "smtp.gmail.com";
@@ -36,7 +36,7 @@ let
 in {
  meta.maintainers = with maintainers; [ midchildan ];

-  config = mkIf pkgs.hostPlatform.isLinux {
+  config = {
    # For shell sessions.
    home.sessionVariables = localeVars;

@@ -39,28 +39,6 @@ in
  };

  config = {
-    assertions = [(
-      let
-        dups =
-          attrNames
-            (filterAttrs (n: v: v > 1)
-            (foldAttrs (acc: v: acc + v) 0
-            (mapAttrsToList (n: v: { ${v.target} = 1; }) cfg)));
-        dupsStr = concatStringsSep ", " dups;
-      in {
-        assertion = dups == [];
-        message = ''
-          Conflicting managed target files: ${dupsStr}
-
-          This may happen, for example, if you have a configuration similar to
-
-              home.file = {
-                conflict1 = { source = ./foo.nix; target = "baz"; };
-                conflict2 = { source = ./bar.nix; target = "baz"; };
-              }'';
-      })
-    ];
-
    lib.file.mkOutOfStoreSymlink = path:
      let
        pathStr = toString path;
@@ -75,7 +53,7 @@ in
        # Paths that should be forcibly overwritten by Home Manager.
        # Caveat emptor!
        forcedPaths =
-          concatMapStringsSep " " (p: ''"$HOME"/${escapeShellArg p}'')
+          concatMapStringsSep " " (p: ''"$HOME/${p}"'')
            (mapAttrsToList (n: v: v.target)
            (filterAttrs (n: v: v.force) cfg));

@@ -84,7 +62,7 @@ in

          # A symbolic link whose target path matches this pattern will be
          # considered part of a Home Manager generation.
-          homeFilePattern="$(readlink -e ${escapeShellArg builtins.storeDir})/*-home-manager-files/*"
+          homeFilePattern="$(readlink -e "${builtins.storeDir}")/*-home-manager-files/*"

          forcedPaths=(${forcedPaths})

@@ -162,13 +140,12 @@ in
    # source and target generation.
    home.activation.linkGeneration = hm.dag.entryAfter ["writeBoundary"] (
      let
-        link = pkgs.writeShellScript "link" ''
-          rootPath="$1"
-          newGenFiles="$2"
-          shift 2
+        link = pkgs.writeText "link" ''
+          newGenFiles="$1"
+          shift
          for sourcePath in "$@" ; do
            relativePath="''${sourcePath#$newGenFiles/}"
-            targetPath="$rootPath/$relativePath"
+            targetPath="$HOME/$relativePath"
            if [[ -e "$targetPath" && ! -L "$targetPath" && -n "$HOME_MANAGER_BACKUP_EXT" ]] ; then
              backup="$targetPath.$HOME_MANAGER_BACKUP_EXT"
              $DRY_RUN_CMD mv $VERBOSE_ARG "$targetPath" "$backup" || errorEcho "Moving '$targetPath' failed!"
@@ -178,18 +155,17 @@ in
          done
        '';

-        cleanup = pkgs.writeShellScript "cleanup" ''
+        cleanup = pkgs.writeText "cleanup" ''
          . ${./lib-bash/color-echo.sh}

          # A symbolic link whose target path matches this pattern will be
          # considered part of a Home Manager generation.
-          homeFilePattern="$(readlink -e ${escapeShellArg builtins.storeDir})/*-home-manager-files/*"
+          homeFilePattern="$(readlink -e "${builtins.storeDir}")/*-home-manager-files/*"

-          rootPath="$1"
-          newGenFiles="$2"
-          shift 2
+          newGenFiles="$1"
+          shift 1
          for relativePath in "$@" ; do
-            targetPath="$rootPath/$relativePath"
+            targetPath="$HOME/$relativePath"
            if [[ -e "$newGenFiles/$relativePath" ]] ; then
              $VERBOSE_ECHO "Checking $targetPath: exists"
            elif [[ ! "$(readlink "$targetPath")" == $homeFilePattern ]] ; then
@@ -201,8 +177,7 @@ in
              # Recursively delete empty parent directories.
              targetDir="$(dirname "$relativePath")"
              if [[ "$targetDir" != "." ]] ; then
-                # TODO
-                # pushd "$HOME" > /dev/null
+                pushd "$HOME" > /dev/null

                # Call rmdir with a relative path excluding $HOME.
                # Otherwise, it might try to delete $HOME and exit
@@ -211,7 +186,7 @@ in
                    -p --ignore-fail-on-non-empty \
                    "$targetDir"

-                # popd > /dev/null
+                popd > /dev/null
              fi
            fi
          done
@@ -219,17 +194,12 @@ in
      in
        ''
          function linkNewGen() {
-            echo "Creating home file links"
-
-            local rootPath=
-            if [[ $newGenLayoutVersion -eq 0 ]] ; then
-              rootPath="$HOME"
-            fi
+            echo "Creating home file links in $HOME"

            local newGenFiles
            newGenFiles="$(readlink -e "$newGenPath/home-files")"
            find "$newGenFiles" \( -type f -or -type l \) \
-              -exec bash ${link} "$rootPath" "$newGenFiles" {} +
+              -exec bash ${link} "$newGenFiles" {} +
          }

          function cleanOldGen() {
@@ -237,35 +207,17 @@ in
              return
            fi

-            echo "Cleaning up orphan links"
+            echo "Cleaning up orphan links from $HOME"

            local newGenFiles oldGenFiles
            newGenFiles="$(readlink -e "$newGenPath/home-files")"
            oldGenFiles="$(readlink -e "$oldGenPath/home-files")"

-            # When transitioning from layout 0 to 1 we need to prefix all old
-            # paths with the home directory. Conversely, if we ever go from
-            # layout 1 to 0 we need to "subtract" the home directory from the
-            # old generation path, this is done by appending an "antiprefix" to
-            # the layout 1 paths.
-            local prefix= antiprefix=
-            if [[ $oldGenLayoutVersion -eq 0 && $newGenLayoutVersion -ge 1 ]] ; then
-              prefix="''${HOME#/}/"
-            elif [[ $oldGenLayoutVersion -ge 1 && $newGenLayoutVersion -eq 0 ]] ; then
-              antiprefix="/$HOME"
-            fi
-
-            local rootPath=
-            if [[ $newGenLayoutVersion -eq 0 ]] ; then
-              rootPath="$HOME"
-            fi
-
-            $VERBOSE_ECHO "Orphan link cleanup uses prefix=$prefix antiprefix=$antiprefix rootPath=$rootPath"
-
-            # Apply the cleanup script on each leaf in the old generation. The
-            # find command below will print the relative path of the entry.
-            find "$oldGenFiles$antiprefix" '(' -type f -or -type l ')' -printf "$prefix%P\0" \
-              | xargs -0 bash ${cleanup} "$rootPath" "$newGenFiles"
+            # Apply the cleanup script on each leaf in the old
+            # generation. The find command below will print the
+            # relative path of the entry.
+            find "$oldGenFiles" '(' -type f -or -type l ')' -printf '%P\0' \
+              | xargs -0 bash ${cleanup} "$newGenFiles"
          }

          cleanOldGen
@@ -283,9 +235,7 @@ in
    );

    home.activation.checkFilesChanged = hm.dag.entryBefore ["linkGeneration"] (
-      let
-        homeDirArg = escapeShellArg homeDirectory;
-      in ''
+      ''
        function _cmp() {
          if [[ -d $1 && -d $2 ]]; then
            diff -rq "$1" "$2" &> /dev/null
@@ -294,15 +244,11 @@ in
          fi
        }
        declare -A changedFiles
-      '' + concatMapStrings (v:
-        let
-          sourceArg = escapeShellArg (sourceStorePath v);
-          targetArg = escapeShellArg v.target;
-        in ''
-          _cmp ${sourceArg} ${homeDirArg}/${targetArg} \
-            && changedFiles[${targetArg}]=0 \
-            || changedFiles[${targetArg}]=1
-        '') (filter (v: v.onChange != "") (attrValues cfg))
+      '' + concatMapStrings (v: ''
+        _cmp "${sourceStorePath v}" "${homeDirectory}/${v.target}" \
+          && changedFiles["${v.target}"]=0 \
+          || changedFiles["${v.target}"]=1
+      '') (filter (v: v.onChange != "") (attrValues cfg))
      + ''
        unset -f _cmp
      ''
@@ -310,7 +256,7 @@ in

    home.activation.onFilesChange = hm.dag.entryAfter ["linkGeneration"] (
      concatMapStrings (v: ''
-        if [[ ''${changedFiles[${escapeShellArg v.target}]} -eq 1 ]]; then
+        if [[ ${"$\{changedFiles"}["${v.target}"]} -eq 1 ]]; then
          ${v.onChange}
        fi
      '') (filter (v: v.onChange != "") (attrValues cfg))
@@ -318,10 +264,12 @@ in

    # Symlink directories and files that have the right execute bit.
    # Copy files that need their execute bit changed.
-    home-files = pkgs.runCommandLocal
+    home-files = pkgs.runCommand
      "home-manager-files"
      {
        nativeBuildInputs = [ pkgs.xorg.lndir ];
+        preferLocalBuild = true;
+        allowSubstitutes = false;
      }
      (''
        mkdir -p $out
@@ -335,15 +283,6 @@ in
          local executable="$3"
          local recursive="$4"

-          # If the target already exists then we have a collision. Note, this
-          # should not happen due to the assertion found in the 'files' module.
-          # We therefore simply log the conflict and otherwise ignore it, mainly
-          # to make the `files-target-config` test work as expected.
-          if [[ -e "$realOut/$relTarget" ]]; then
-            echo "File conflict for file '$relTarget'" >&2
-            return
-          fi
-
          # Figure out the real absolute path to the target.
          local target
          target="$(realpath -m "$realOut/$relTarget")"
@@ -373,16 +373,6 @@ in
      description = "The package containing the complete activation script.";
    };

-    home.extraActivationPath = mkOption {
-      internal = true;
-      type = types.listOf types.package;
-      default = [ ];
-      description = ''
-        Extra packages to add to <envar>PATH</envar> within the activation
-        script.
-      '';
-    };
-
    home.extraBuilderCommands = mkOption {
      type = types.lines;
      default = "";
@@ -400,21 +390,6 @@ in
        Extra commands to run in the Home Manager profile builder.
      '';
    };
-
-    home.enableNixpkgsReleaseCheck = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Determines whether to check for release version mismatch between Home
-        Manager and Nixpkgs. Using mismatched versions is likely to cause errors
-        and unexpected behavior. It is therefore highly recommended to use a
-        release of Home Manager than corresponds with your chosen release of
-        Nixpkgs.
-        </para><para>
-        When this option is enabled and a mismatch is detected then a warning
-        will be printed when the user configuration is being built.
-      '';
-    };
  };

  config = {
@@ -429,31 +404,6 @@ in
      }
    ];

-    warnings =
-      let
-        hmRelease = fileContents ../.release;
-        nixpkgsRelease = pkgs.lib.trivial.release;
-        releaseMismatch =
-          config.home.enableNixpkgsReleaseCheck
-          && hmRelease != nixpkgsRelease;
-      in
-        optional releaseMismatch ''
-          You are using
-
-            Home Manager version ${hmRelease} and
-            Nixpkgs version ${nixpkgsRelease}.
-
-          Using mismatched versions is likely to cause errors and unexpected
-          behavior. It is therefore highly recommended to use a release of Home
-          Manager than corresponds with your chosen release of Nixpkgs.
-
-          If you insist then you can disable this warning by adding
-
-            home.enableNixpkgsReleaseCheck = false;
-
-          to your configuration.
-        '';
-
    home.username =
      mkIf (versionOlder config.home.stateVersion "20.09")
        (mkDefault (builtins.getEnv "USER"));
@@ -580,17 +530,15 @@ in

        # Programs that always should be available on the activation
        # script's PATH.
-        activationBinPaths = lib.makeBinPath (
-          [
-            pkgs.bash
-            pkgs.coreutils
-            pkgs.diffutils        # For `cmp` and `diff`.
-            pkgs.findutils
-            pkgs.gnugrep
-            pkgs.gnused
-            pkgs.ncurses          # For `tput`.
-          ] ++ config.home.extraActivationPath
-        )
+        activationBinPaths = lib.makeBinPath [
+          pkgs.bash
+          pkgs.coreutils
+          pkgs.diffutils        # For `cmp` and `diff`.
+          pkgs.findutils
+          pkgs.gnugrep
+          pkgs.gnused
+          pkgs.ncurses          # For `tput`.
+        ]
        + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";

        activationScript = pkgs.writeShellScript "activation-script" ''
@@ -622,13 +570,6 @@ in
            mkdir $out/bin
            ln -s $out/activate $out/bin/home-manager-generation

-            # The generation directory layout version.
-            #
-            # - Version 0 (also implied when file is missing) means
-            #   "legacy layout".
-            # - Version 1 adds full home file paths.
-            echo 0 > $out/version
-
            substituteInPlace $out/activate \
              --subst-var-by GENERATION_DIR $out

@@ -1,106 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-let
-
-  cfg = config.i18n.inputMethod;
-
-  gtk2Cache = pkgs.runCommandLocal "gtk2-immodule.cache" {
-    buildInputs = [ pkgs.gtk2 cfg.package ];
-  } ''
-    mkdir -p $out/etc/gtk-2.0/
-    GTK_PATH=${cfg.package}/lib/gtk-2.0/ \
-      gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
-  '';
-
-  gtk3Cache = pkgs.runCommandLocal "gtk3-immodule.cache" {
-    buildInputs = [ pkgs.gtk3 cfg.package ];
-  } ''
-    mkdir -p $out/etc/gtk-3.0/
-    GTK_PATH=${cfg.package}/lib/gtk-3.0/ \
-      gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
-  '';
-
-in {
-  imports =
-    [ ./fcitx.nix ./fcitx5.nix ./hime.nix ./kime.nix ./nabi.nix ./uim.nix ];
-
-  options.i18n = {
-    inputMethod = {
-      enabled = mkOption {
-        type = types.nullOr
-          (types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]);
-        default = null;
-        example = "fcitx";
-        description = ''
-          Select the enabled input method. Input methods is a software to input
-          symbols that are not available on standard input devices.
-          </para><para>
-          Input methods are specially used to input Chinese, Japanese and Korean
-          characters.
-          </para><para>
-          Currently the following input methods are available in Home Manager:
-
-          <variablelist>
-          <varlistentry>
-            <term><literal>fcitx</literal></term>
-            <listitem><para>
-              A customizable lightweight input method
-              extra input engines can be added using
-              <literal>i18n.inputMethod.fcitx.engines</literal>.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><literal>fcitx5</literal></term>
-            <listitem><para>
-              The next generation of fcitx,
-              addons (including engines, dictionaries, skins) can be added using
-              <literal>i18n.inputMethod.fcitx5.addons</literal>.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><literal>nabi</literal></term>
-            <listitem><para>
-              A Korean input method based on XIM. Nabi doesn't support Qt 5.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><literal>uim</literal></term>
-            <listitem><para>
-              The universal input method, is a library with a XIM bridge.
-              uim mainly support Chinese, Japanese and Korean.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><literal>hime</literal></term>
-            <listitem><para>An extremely easy-to-use input method framework.</para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><literal>kime</literal></term>
-            <listitem><para>A Korean IME.</para></listitem>
-          </varlistentry>
-          </variablelist>
-        '';
-      };
-
-      package = mkOption {
-        internal = true;
-        type = types.nullOr types.path;
-        default = null;
-        description = ''
-          The input method method package.
-        '';
-      };
-    };
-  };
-
-  config = mkIf (cfg.enabled != null) {
-    assertions = [
-      (hm.assertions.assertPlatform "i18n.inputMethod" pkgs platforms.linux)
-    ];
-
-    home.packages = [ cfg.package gtk2Cache gtk3Cache ];
-  };
-
-  meta.maintainers = with lib; [ hm.maintainers.kranzes ];
-}
@@ -1,50 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.i18n.inputMethod.fcitx;
-  fcitxPackage = pkgs.fcitx.override { plugins = cfg.engines; };
-  fcitxEngine = types.package // {
-    name = "fcitx-engine";
-    check = x:
-      types.package.check x && attrByPath [ "meta" "isFcitxEngine" ] false x;
-  };
-in {
-  options = {
-
-    i18n.inputMethod.fcitx = {
-      engines = mkOption {
-        type = with types; listOf fcitxEngine;
-        default = [ ];
-        example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]";
-        description = let
-          enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines;
-          engines = concatStringsSep ", "
-            (map (name: "<literal>${name}</literal>") (attrNames enginesDrv));
-        in "Enabled Fcitx engines. Available engines are: ${engines}.";
-      };
-    };
-
-  };
-
-  config = mkIf (config.i18n.inputMethod.enabled == "fcitx") {
-    i18n.inputMethod.package = fcitxPackage;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
-      XMODIFIERS = "@im=fcitx";
-    };
-
-    systemd.user.services.fcitx-daemon = {
-      Unit = {
-        Description = "Fcitx input method editor";
-        PartOf = [ "graphical-session.desktop" ];
-      };
-      Service.ExecStart = "${fcitxPackage}/bin/fcitx";
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -1,42 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  im = config.i18n.inputMethod;
-  cfg = im.fcitx5;
-  fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
-in {
-  options = {
-    i18n.inputMethod.fcitx5 = {
-      addons = mkOption {
-        type = with types; listOf package;
-        default = [ ];
-        example = literalExample "with pkgs; [ fcitx5-rime ]";
-        description = ''
-          Enabled Fcitx5 addons.
-        '';
-      };
-    };
-  };
-
-  config = mkIf (im.enabled == "fcitx5") {
-    i18n.inputMethod.package = fcitx5Package;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
-      XMODIFIERS = "@im=fcitx";
-    };
-
-    systemd.user.services.fcitx5-daemon = {
-      Unit = {
-        Description = "Fcitx5 input method editor";
-        PartOf = [ "graphical-session.target" ];
-      };
-      Service.ExecStart = "${fcitx5Package}/bin/fcitx5";
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -1,23 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib; {
-  config = mkIf (config.i18n.inputMethod.enabled == "hime") {
-    i18n.inputMethod.package = pkgs.hime;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "hime";
-      QT_IM_MODULE = "hime";
-      XMODIFIERS = "@im=hime";
-    };
-
-    systemd.user.services.hime-daemon = {
-      Unit = {
-        Description = "Hime input method editor";
-        PartOf = [ "graphical-session.desktop" ];
-      };
-      Service.ExecStart = "${pkgs.hime}/bin/hime";
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -1,58 +0,0 @@
-{ config, pkgs, lib, generators, ... }:
-with lib;
-let
-  cfg = config.i18n.inputMethod.kime;
-  yamlFormat = pkgs.formats.yaml { };
-in {
-  options = {
-    i18n.inputMethod.kime = {
-      config = mkOption {
-        type = yamlFormat.type;
-        default = { };
-        example = literalExample ''
-          {
-            daemon = {
-              modules = ["Xim" "Indicator"];
-            };
-
-            indicator = {
-              icon_color = "White";
-            };
-
-            engine = {
-              hangul = {
-                layout = "dubeolsik";
-              };
-            };
-          }
-        '';
-        description = ''
-          kime configuration. Refer to
-          <link xlink:href="https://github.com/Riey/kime/blob/develop/docs/CONFIGURATION.md"/>
-          for details on supported values.
-        '';
-      };
-    };
-  };
-
-  config = mkIf (config.i18n.inputMethod.enabled == "kime") {
-    i18n.inputMethod.package = pkgs.kime;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "kime";
-      QT_IM_MODULE = "kime";
-      XMODIFIERS = "@im=kime";
-    };
-
-    xdg.configFile."kime/config.yaml".text =
-      replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config);
-
-    systemd.user.services.kime-daemon = {
-      Unit = { Description = "Kime input method editor"; };
-      PartOf = [ "graphical-session.target" ];
-      Service.ExecStart = "${pkgs.kime}/bin/kime";
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -1,23 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib; {
-  config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
-    i18n.inputMethod.package = pkgs.nabi;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "nabi";
-      QT_IM_MODULE = "nabi";
-      XMODIFIERS = "@im=nabi";
-    };
-
-    systemd.user.services.nabi-daemon = {
-      Unit = {
-        Description = "Nabi input method editor";
-        PartOf = [ "graphical-session.desktop" ];
-      };
-      Service.ExecStart = "${pkgs.nabi}/bin/nabi";
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -1,45 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let cfg = config.i18n.inputMethod.uim;
-in {
-  options = {
-
-    i18n.inputMethod.uim = {
-      toolbar = mkOption {
-        type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
-        default = "gtk";
-        example = "gtk-systray";
-        description = ''
-          Selected UIM toolbar.
-        '';
-      };
-    };
-
-  };
-
-  config = mkIf (config.i18n.inputMethod.enabled == "uim") {
-    i18n.inputMethod.package = pkgs.uim;
-
-    home.sessionVariables = {
-      GTK_IM_MODULE = "uim";
-      QT_IM_MODULE = "uim";
-      XMODIFIERS = "@im=uim";
-    };
-
-    systemd.user.services.uim-daemon = {
-      Unit = {
-        Description = "Uim input method editor";
-        PartOf = [ "graphical-session.desktop" ];
-      };
-      Service.ExecStart = toString
-        (pkgs.writeShellScript "start-uim-xim-and-uim-toolbar" ''
-          ${pkgs.uim}/bin/uim-xim &
-          ${pkgs.uim}/bin/uim-toolbar-${cfg.toolbar}
-        '');
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
-}
@@ -5,17 +5,9 @@ function setupVars() {
    local profilesPath="$nixStateDir/profiles/per-user/$USER"
    local gcPath="$nixStateDir/gcroots/per-user/$USER"

-    declare -gr genProfilePath="$profilesPath/home-manager"
-    declare -gr newGenPath="@GENERATION_DIR@";
-    declare -gr newGenGcPath="$gcPath/current-home"
-
-    declare -g newGenLayoutVersion
-    if [[ -f $newGenPath/version ]]; then
-        newGenLayoutVersion=$(< "$newGenPath/version")
-    else
-        newGenLayoutVersion=0
-    fi
-    readonly newGenLayoutVersion
+    genProfilePath="$profilesPath/home-manager"
+    newGenPath="@GENERATION_DIR@";
+    newGenGcPath="$gcPath/current-home"

    local greatestGenNum
    greatestGenNum=$( \
@@ -31,14 +23,7 @@ function setupVars() {
    fi

    if [[ -e $profilesPath/home-manager ]] ; then
-        declare -g oldGenPath oldGenLayoutVersion
        oldGenPath="$(readlink -e "$profilesPath/home-manager")"
-        if [[ -f $oldGenPath/version ]]; then
-            oldGenLayoutVersion=$(< "$oldGenPath/version")
-        else
-            oldGenLayoutVersion=0
-        fi
-        readonly oldGenPath oldGenLayoutVersion
    fi

    $VERBOSE_ECHO "Sanity checking oldGenNum and oldGenPath"
@@ -1,14 +0,0 @@
-{ lib }:
-
-{
-  assertPlatform = module: pkgs: platforms: {
-    assertion = lib.elem pkgs.stdenv.hostPlatform.system platforms;
-    message = let
-      platformsStr = lib.concatStringsSep "\n"
-        (map (p: "  - ${p}") (lib.sort (a: b: a < b) platforms));
-    in ''
-      The module ${module} does not support your platform. It only supports
-
-      ${platformsStr}'';
-  };
-}
@@ -16,8 +16,6 @@ rec {
        entryBefore = d.dagEntryBefore;
      };

-  assertions = import ./assertions.nix { inherit lib; };
-
  gvariant = import ./gvariant.nix { inherit lib; };
  maintainers = import ./maintainers.nix;
  strings = import ./strings.nix { inherit lib; };
@@ -25,12 +25,6 @@
    github = "cwyc";
    githubId = 16950437;
  };
-  chisui = {
-    name = "Philipp Dargel";
-    email = "chisui@users.noreply.github.com";
-    github = "chisui";
-    githubId = 4526429;
-  };
  olmokramer = {
    name = "Olmo Kramer";
    email = "olmokramer@users.noreply.github.com";
@@ -43,16 +37,6 @@
    github = "kalhauge";
    githubId = 1182166;
  };
-  kamadorueda = {
-    name = "Kevin Amado";
-    email = "kamadorueda@gmail.com";
-    github = "kamadorueda";
-    githubId = 47480384;
-    keys = [{
-      longkeyid = "rsa4096/0x04D0CEAF916A9A40";
-      fingerprint = "2BE3 BAFD 793E A349 ED1F  F00F 04D0 CEAF 916A 9A40";
-    }];
-  };
  kubukoz = {
    name = "Jakub Kozłowski";
    email = "kubukoz@users.noreply.github.com";
@@ -103,22 +87,4 @@
    githubId = 12465195;
    name = "Bruno BELANYI";
  };
-  malvo = {
-    email = "malte@malvo.org";
-    github = "malte-v";
-    githubId = 34393802;
-    name = "Malte Voos";
-  };
-  kranzes = {
-    email = "personal@ilanjoselevich.com";
-    github = "Kranzes";
-    githubId = 56614642;
-    name = "Ilan Joselevich";
-  };
-  mager = {
-    email = "andreas@mager.eu";
-    github = "AndreasMager";
-    githubId = 5646732;
-    name = "Andreas Mager";
-  };
 }
@@ -2049,104 +2049,9 @@ in
      }

      {
-        time = "2021-05-10T20:41:44+00:00";
+        time = "2021-10-03T20:00:52+00:00";
        message = ''
-          A new module is available: 'programs.rbw'.
-        '';
-      }
-
-      {
-        time = "2021-05-30T15:22:10+00:00";
-        message = ''
-          A new module is available: 'programs.piston-cli'.
-        '';
-      }
-
-      {
-        time = "2021-06-02T04:24:10+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.xidlehook'.
-        '';
-      }
-
-      {
-        time = "2021-06-07T20:44:00+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.pantalaimon'.
-        '';
-      }
-
-      {
-        time = "2021-06-12T05:00:22+00:00";
-        message = ''
-          A new module is available: 'programs.mangohud'.
-        '';
-      }
-
-      {
-        time = "2021-06-16T01:26:16+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          The xmonad module now compiles the configuration before
-          linking the binary to the place xmonad expects to find
-          the compiled configuration (the binary).
-
-          This breaks recompilation of xmonad (i.e. the 'q' binding or
-          'xmonad --recompile').
-
-          If this behavior is undesirable, do not use the
-          'xsession.windowManager.xmonad.config' option. Instead, set the
-          contents of the configuration file with
-          'home.file.".xmonad/config.hs".text = "content of the file"'
-          or 'home.file.".xmonad/config.hs".source = ./path-to-config'.
-        '';
-      }
-
-      {
-        time = "2021-06-24T22:36:11+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'i18n.inputMethod'.
-        '';
-      }
-
-      {
-        time = "2021-06-22T14:43:53+00:00";
-        message = ''
-          A new module is available: 'programs.himalaya'.
-        '';
-      }
-
-      {
-        time = "2021-07-11T17:45:56+00:00";
-        message = ''
-          A new module is available: 'programs.sm64ex'.
-        '';
-      }
-
-      {
-        time = "2021-07-15T13:38:32+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.xsettingsd'.
-        '';
-      }
-
-      {
-        time = "2021-07-14T20:06:18+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.volnoti'.
-        '';
-      }
-
-      {
-        time = "2021-07-23T22:22:31+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.trayer'.
+          A new module is available: 'programs.java'.
        '';
      }
    ];
@@ -6,31 +6,40 @@ with lib;

 let

-  isConfig = x: builtins.isAttrs x || builtins.isFunction x;
+  isConfig = x:
+    builtins.isAttrs x || builtins.isFunction x;

-  optCall = f: x: if builtins.isFunction f then f x else f;
+  optCall = f: x:
+    if builtins.isFunction f
+    then f x
+    else f;

  mergeConfig = lhs_: rhs_:
    let
      lhs = optCall lhs_ { inherit pkgs; };
      rhs = optCall rhs_ { inherit pkgs; };
-    in lhs // rhs // optionalAttrs (lhs ? packageOverrides) {
+    in
+    lhs // rhs //
+    optionalAttrs (lhs ? packageOverrides) {
      packageOverrides = pkgs:
-        optCall lhs.packageOverrides pkgs
-        // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs;
-    } // optionalAttrs (lhs ? perlPackageOverrides) {
+        optCall lhs.packageOverrides pkgs //
+        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    } //
+    optionalAttrs (lhs ? perlPackageOverrides) {
      perlPackageOverrides = pkgs:
-        optCall lhs.perlPackageOverrides pkgs
-        // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs;
+        optCall lhs.perlPackageOverrides pkgs //
+        optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs;
    };

  configType = mkOptionType {
    name = "nixpkgs-config";
    description = "nixpkgs config";
    check = x:
-      let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
+      let traceXIfNot = c:
+            if c x then true
+            else lib.traceSeqN 1 x false;
      in traceXIfNot isConfig;
-    merge = args: fold (def: mergeConfig def.value) { };
+    merge = args: fold (def: mergeConfig def.value) {};
  };

  overlayType = mkOptionType {
@@ -40,9 +49,13 @@ let
    merge = lib.mergeOneOption;
  };

-  _pkgs = import pkgsPath (filterAttrs (n: v: v != null) config.nixpkgs);
+  _pkgs = import pkgsPath (
+    filterAttrs (n: v: v != null) config.nixpkgs
+  );

-in {
+in
+
+{
  options.nixpkgs = {
    config = mkOption {
      default = null;
@@ -78,16 +91,17 @@ in {

    overlays = mkOption {
      default = null;
-      example = literalExample ''
-        [ (self: super: {
-            openssh = super.openssh.override {
-              hpnSupport = true;
-              withKerberos = true;
-              kerberos = self.libkrb5;
+      example = literalExample
+        ''
+          [ (self: super: {
+              openssh = super.openssh.override {
+                hpnSupport = true;
+                withKerberos = true;
+                kerberos = self.libkrb5;
+              };
            };
-          };
-        ) ]
-      '';
+          ) ]
+        '';
      type = types.nullOr (types.listOf overlayType);
      description = ''
        List of overlays to use with the Nix Packages collection. (For
@@ -130,10 +144,9 @@ in {
    _module.args = {
      pkgs = mkOverride modules.defaultPriority _pkgs;
      pkgs_i686 =
-        if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then
-          _pkgs.pkgsi686Linux
-        else
-          { };
+        if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86
+        then _pkgs.pkgsi686Linux
+        else { };
    };
  };
 }
@@ -12,10 +12,6 @@ in {
  options = { xsession.numlock.enable = mkEnableOption "Num Lock"; };

  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "xsession.numlock" pkgs platforms.linux)
-    ];
-
    systemd.user.services.numlockx = {
      Unit = {
        Description = "NumLockX";
@@ -25,11 +25,6 @@ in {
  };

  config = mkIf (cfg.rules != [ ]) {
-    assertions = [
-      (hm.assertions.assertPlatform "systemd.user.tmpfiles" pkgs
-        platforms.linux)
-    ];
-
    xdg = {
      dataFile."user-tmpfiles.d/home-manager.conf" = {
        text = ''
@@ -5,16 +5,8 @@ with lib;
 {
  options = {
    home.stateVersion = mkOption {
-      type = types.enum [
-        "18.09"
-        "19.03"
-        "19.09"
-        "20.03"
-        "20.09"
-        "21.03"
-        "21.05"
-        "21.11"
-      ];
+      type =
+        types.enum [ "18.09" "19.03" "19.09" "20.03" "20.09" "21.03" "21.05" ];
      default = "18.09";
      description = ''
        It is occasionally necessary for Home Manager to change
@@ -1,183 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  desktopEntry = {
-    options = {
-      # Since this module uses the nixpkgs/pkgs/build-support/make-desktopitem function, 
-      # our options and defaults follow its parameters, with the following exceptions:
-
-      # `desktopName` on makeDesktopItem is controlled by `name`.
-      # This is what we'd commonly consider the name of the application.
-      # `name` on makeDesktopItem is controlled by this module's key in the attrset.
-      # This is the file's filename excluding ".desktop".
-
-      # `extraEntries` on makeDesktopItem is controlled by `extraConfig`,
-      # and `extraDesktopEntries` by `settings`,
-      # to match what's commonly used by other home manager modules.
-
-      # `startupNotify` on makeDesktopItem asks for "true" or "false" strings,
-      # for usability's sake we ask for a boolean.
-
-      # `mimeType` and `categories` on makeDesktopItem ask for a string in the format "one;two;three;",
-      # for the same reason we ask for a list of strings.
-
-      # Descriptions are taken from the desktop entry spec: 
-      # https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys
-
-      type = mkOption {
-        description = "The type of the desktop entry.";
-        default = "Application";
-        type = types.enum [ "Application" "Link" "Directory" ];
-      };
-
-      exec = mkOption {
-        description = "Program to execute, possibly with arguments.";
-        type = types.str;
-      };
-
-      icon = mkOption {
-        description = "Icon to display in file manager, menus, etc.";
-        type = types.nullOr types.str;
-        default = null;
-      };
-
-      comment = mkOption {
-        description = "Tooltip for the entry.";
-        type = types.nullOr types.str;
-        default = null;
-      };
-
-      terminal = mkOption {
-        description = "Whether the program runs in a terminal window.";
-        type = types.bool;
-        default = false;
-      };
-
-      name = mkOption {
-        description = "Specific name of the application.";
-        type = types.str;
-      };
-
-      genericName = mkOption {
-        description = "Generic name of the application.";
-        type = types.nullOr types.str;
-        default = null;
-      };
-
-      mimeType = mkOption {
-        description = "The MIME type(s) supported by this application.";
-        type = types.nullOr (types.listOf types.str);
-        default = null;
-      };
-
-      categories = mkOption {
-        description =
-          "Categories in which the entry should be shown in a menu.";
-        type = types.nullOr (types.listOf types.str);
-        default = null;
-      };
-
-      startupNotify = mkOption {
-        description = ''
-          If true, it is KNOWN that the application will send a "remove" 
-          message when started with the <literal>DESKTOP_STARTUP_ID</literal> 
-          environment variable set. If false, it is KNOWN that the application 
-          does not work with startup notification at all.'';
-        type = types.nullOr types.bool;
-        default = null;
-      };
-
-      extraConfig = mkOption {
-        description = ''
-          Extra configuration. Will be appended to the end of the file and 
-          may thus contain extra sections.
-        '';
-        type = types.lines;
-        default = "";
-      };
-
-      settings = mkOption {
-        type = types.attrsOf types.string;
-        description = ''
-          Extra key-value pairs to add to the <literal>[Desktop Entry]</literal> section. 
-          This may override other values.
-        '';
-        default = { };
-        example = literalExample ''
-          {
-            Keywords = "calc;math";
-            DBusActivatable = "false";
-          }
-        '';
-      };
-
-      fileValidation = mkOption {
-        type = types.bool;
-        description = "Whether to validate the generated desktop file.";
-        default = true;
-      };
-    };
-  };
-
-  #formatting helpers
-  ifNotNull = a: a': if a == null then null else a';
-  stringBool = bool: if bool then "true" else "false";
-  semicolonList = list:
-    (concatStringsSep ";" list) + ";"; # requires trailing semicolon
-
-  #passes config options to makeDesktopItem in expected format
-  makeFile = name: config:
-    pkgs.makeDesktopItem {
-      name = name;
-      type = config.type;
-      exec = config.exec;
-      icon = config.icon;
-      comment = config.comment;
-      terminal = config.terminal;
-      desktopName = config.name;
-      genericName = config.genericName;
-      mimeType = ifNotNull config.mimeType (semicolonList config.mimeType);
-      categories =
-        ifNotNull config.categories (semicolonList config.categories);
-      startupNotify =
-        ifNotNull config.startupNotify (stringBool config.startupNotify);
-      extraEntries = config.extraConfig;
-      extraDesktopEntries = config.settings;
-    };
-in {
-  meta.maintainers = with maintainers; [ cwyc ];
-
-  options.xdg.desktopEntries = mkOption {
-    description = ''
-      Desktop Entries allow applications to be shown in your desktop environment's app launcher. </para><para>
-      You can define entries for programs without entries or override existing entries. </para><para>
-      See <link xlink:href="https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys" /> for more information on options.
-    '';
-    default = { };
-    type = types.attrsOf (types.submodule desktopEntry);
-    example = literalExample ''
-      {
-        firefox = {
-          name = "Firefox";
-          genericName = "Web Browser";
-          exec = "firefox %U";
-          terminal = false;
-          categories = [ "Application" "Network" "WebBrowser" ];
-          mimeType = [ "text/html" "text/xml" ];
-        };
-      }
-    '';
-  };
-
-  config = mkIf (config.xdg.desktopEntries != { }) {
-    assertions = [
-      (hm.assertions.assertPlatform "xdg.desktopEntries" pkgs platforms.linux)
-    ];
-
-    home.packages = (map hiPrio # we need hiPrio to override existing entries
-      (attrsets.mapAttrsToList makeFile config.xdg.desktopEntries));
-  };
-
-}
@@ -73,9 +73,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xdg.mimeApps" pkgs platforms.linux) ];
-
    # Deprecated but still used by some applications.
    xdg.dataFile."applications/mimeapps.list".source =
      config.xdg.configFile."mimeapps.list".source;
@@ -10,9 +10,7 @@ in {
  options = {
    xdg.mime.enable = mkOption {
      type = types.bool;
-      default = pkgs.hostPlatform.isLinux;
-      defaultText =
-        literalExample "true if host platform is Linux, false otherwise";
+      default = true;
      description = ''
        Whether to install programs and files to support the
        XDG Shared MIME-info specification and XDG MIME Applications
@@ -26,9 +24,6 @@ in {
  };

  config = mkIf config.xdg.mime.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xdg.mime" pkgs platforms.linux) ];
-
    home.packages = [
      # Explicitly install package to provide basic mime types.
      pkgs.shared-mime-info
@@ -36,12 +36,6 @@ in {
  };

  config = mkMerge [
-    (mkIf (cfg.config != [ ] || cfg.data != [ ]) {
-      assertions = [
-        (hm.assertions.assertPlatform "xdg.systemDirs" pkgs platforms.linux)
-      ];
-    })
-
    (mkIf (cfg.config != [ ]) {
      home.sessionVariables.XDG_CONFIG_DIRS =
        "${configDirs}\${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}";
@@ -103,9 +103,6 @@ in {
      XDG_VIDEOS_DIR = cfg.videos;
    } // cfg.extraConfig;
  in mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xdg.userDirs" pkgs platforms.linux) ];
-
    xdg.configFile."user-dirs.dirs".text = let
      # For some reason, these need to be wrapped with quotes to be valid.
      wrapped = mapAttrs (_: value: ''"${value}"'') directories;
@@ -16,10 +16,14 @@ let
  defaultDataHome = "${config.home.homeDirectory}/.local/share";

  getXdgDir = name: fallback:
-    let value = builtins.getEnv name;
-    in if value != "" then value else fallback;
+    let
+      value = builtins.getEnv name;
+    in
+      if value != "" then value else fallback;

-in {
+in
+
+{
  options.xdg = {
    enable = mkEnableOption "management of XDG base directories";

@@ -33,7 +37,7 @@ in {

    configFile = mkOption {
      type = fileType "<varname>xdg.configHome</varname>" cfg.configHome;
-      default = { };
+      default = {};
      description = ''
        Attribute set of files to link into the user's XDG
        configuration home.
@@ -50,7 +54,7 @@ in {

    dataFile = mkOption {
      type = fileType "<varname>xdg.dataHome</varname>" cfg.dataHome;
-      default = { };
+      default = {};
      description = ''
        Attribute set of files to link into the user's XDG
        data home.
@@ -1,245 +1,240 @@
 { pkgs

-# Note, this should be "the standard library" + HM extensions.
+  # Note, this should be "the standard library" + HM extensions.
 , lib

-# Whether to enable module type checking.
+  # Whether to enable module type checking.
 , check ? true

-  # If disabled, the pkgs attribute passed to this function is used instead.
-, useNixpkgsModule ? true }:
+# If disabled, the pkgs attribute passed to this function is used instead.
+, useNixpkgsModule ? true
+}:

 with lib;

 let

-  modules = [
-    ./accounts/email.nix
-    ./config/i18n.nix
-    ./files.nix
-    ./home-environment.nix
-    ./i18n/input-method/default.nix
-    ./manual.nix
-    ./misc/dconf.nix
-    ./misc/debug.nix
-    ./misc/fontconfig.nix
-    ./misc/gtk.nix
-    ./misc/lib.nix
-    ./misc/news.nix
-    ./misc/numlock.nix
-    ./misc/pam.nix
-    ./misc/qt.nix
-    ./misc/submodule-support.nix
-    ./misc/tmpfiles.nix
-    ./misc/version.nix
-    ./misc/vte.nix
-    ./misc/xdg-desktop-entries.nix
-    ./misc/xdg-mime-apps.nix
-    ./misc/xdg-mime.nix
-    ./misc/xdg-system-dirs.nix
-    ./misc/xdg-user-dirs.nix
-    ./misc/xdg.nix
-    ./programs/abook.nix
-    ./programs/afew.nix
-    ./programs/alacritty.nix
-    ./programs/alot.nix
-    ./programs/aria2.nix
-    ./programs/astroid.nix
-    ./programs/autojump.nix
-    ./programs/autorandr.nix
-    ./programs/bash.nix
-    ./programs/bat.nix
-    ./programs/beets.nix
-    ./programs/broot.nix
-    ./programs/browserpass.nix
-    ./programs/chromium.nix
-    ./programs/command-not-found/command-not-found.nix
-    ./programs/dircolors.nix
-    ./programs/direnv.nix
-    ./programs/eclipse.nix
-    ./programs/emacs.nix
-    ./programs/exa.nix
-    ./programs/feh.nix
-    ./programs/firefox.nix
-    ./programs/fish.nix
-    ./programs/foot.nix
-    ./programs/fzf.nix
-    ./programs/getmail.nix
-    ./programs/gh.nix
-    ./programs/git.nix
-    ./programs/gnome-terminal.nix
-    ./programs/go.nix
-    ./programs/gpg.nix
-    ./programs/himalaya.nix
-    ./programs/home-manager.nix
-    ./programs/htop.nix
-    ./programs/i3status-rust.nix
-    ./programs/i3status.nix
-    ./programs/info.nix
-    ./programs/irssi.nix
-    ./programs/jq.nix
-    ./programs/kakoune.nix
-    ./programs/keychain.nix
-    ./programs/kitty.nix
-    ./programs/lazygit.nix
-    ./programs/lesspipe.nix
-    ./programs/lf.nix
-    ./programs/lieer.nix
-    ./programs/lsd.nix
-    ./programs/man.nix
-    ./programs/mangohud.nix
-    ./programs/matplotlib.nix
-    ./programs/mbsync.nix
-    ./programs/mcfly.nix
-    ./programs/mercurial.nix
-    ./programs/mpv.nix
-    ./programs/msmtp.nix
-    ./programs/mu.nix
-    ./programs/ncmpcpp.nix
-    ./programs/ncspot.nix
-    ./programs/ne.nix
-    ./programs/neomutt.nix
-    ./programs/neovim.nix
-    ./programs/newsboat.nix
-    ./programs/nix-index.nix
-    ./programs/noti.nix
-    ./programs/notmuch.nix
-    ./programs/nushell.nix
-    ./programs/obs-studio.nix
-    ./programs/octant.nix
-    ./programs/offlineimap.nix
-    ./programs/opam.nix
-    ./programs/password-store.nix
-    ./programs/pazi.nix
-    ./programs/pet.nix
-    ./programs/pidgin.nix
-    ./programs/piston-cli.nix
-    ./programs/powerline-go.nix
-    ./programs/qutebrowser.nix
-    ./programs/rbw.nix
-    ./programs/readline.nix
-    ./programs/rofi-pass.nix
-    ./programs/rofi.nix
-    ./programs/rtorrent.nix
-    ./programs/sbt.nix
-    ./programs/scmpuff.nix
-    ./programs/senpai.nix
-    ./programs/skim.nix
-    ./programs/sm64ex.nix
-    ./programs/ssh.nix
-    ./programs/starship.nix
-    ./programs/taskwarrior.nix
-    ./programs/terminator.nix
-    ./programs/termite.nix
-    ./programs/texlive.nix
-    ./programs/tmux.nix
-    ./programs/topgrade.nix
-    ./programs/urxvt.nix
-    ./programs/vim.nix
-    ./programs/vscode.nix
-    ./programs/vscode/haskell.nix
-    ./programs/waybar.nix
-    ./programs/xmobar.nix
-    ./programs/z-lua.nix
-    ./programs/zathura.nix
-    ./programs/zoxide.nix
-    ./programs/zplug.nix
-    ./programs/zsh.nix
-    ./programs/zsh/prezto.nix
-    ./services/barrier.nix
-    ./services/blueman-applet.nix
-    ./services/caffeine.nix
-    ./services/cbatticon.nix
-    ./services/clipmenu.nix
-    ./services/compton.nix
-    ./services/devilspie2.nix
-    ./services/dropbox.nix
-    ./services/dunst.nix
-    ./services/dwm-status.nix
-    ./services/emacs.nix
-    ./services/etesync-dav.nix
-    ./services/flameshot.nix
-    ./services/fluidsynth.nix
-    ./services/getmail.nix
-    ./services/gnome-keyring.nix
-    ./services/gpg-agent.nix
-    ./services/grobi.nix
-    ./services/hound.nix
-    ./services/imapnotify.nix
-    ./services/kanshi.nix
-    ./services/kbfs.nix
-    ./services/kdeconnect.nix
-    ./services/keepassx.nix
-    ./services/keybase.nix
-    ./services/keynav.nix
-    ./services/lieer.nix
-    ./services/lorri.nix
-    ./services/mako.nix
-    ./services/mbsync.nix
-    ./services/mpd.nix
-    ./services/mpdris2.nix
-    ./services/mpris-proxy.nix
-    ./services/muchsync.nix
-    ./services/network-manager-applet.nix
-    ./services/nextcloud-client.nix
-    ./services/owncloud-client.nix
-    ./services/pantalaimon.nix
-    ./services/parcellite.nix
-    ./services/pass-secret-service.nix
-    ./services/password-store-sync.nix
-    ./services/pasystray.nix
-    ./services/pbgopy.nix
-    ./services/picom.nix
-    ./services/plan9port.nix
-    ./services/playerctld.nix
-    ./services/polybar.nix
-    ./services/poweralertd.nix
-    ./services/pulseeffects.nix
-    ./services/random-background.nix
-    ./services/redshift-gammastep/gammastep.nix
-    ./services/redshift-gammastep/redshift.nix
-    ./services/rsibreak.nix
-    ./services/screen-locker.nix
-    ./services/spotifyd.nix
-    ./services/stalonetray.nix
-    ./services/status-notifier-watcher.nix
-    ./services/sxhkd.nix
-    ./services/syncthing.nix
-    ./services/taffybar.nix
-    ./services/trayer.nix
-    ./services/tahoe-lafs.nix
-    ./services/taskwarrior-sync.nix
-    ./services/udiskie.nix
-    ./services/unclutter.nix
-    ./services/unison.nix
-    ./services/volnoti.nix
-    ./services/window-managers/awesome.nix
-    ./services/window-managers/bspwm/default.nix
-    ./services/window-managers/i3-sway/i3.nix
-    ./services/window-managers/i3-sway/sway.nix
-    ./services/window-managers/xmonad.nix
-    ./services/wlsunset.nix
-    ./services/xcape.nix
-    ./services/xembed-sni-proxy.nix
-    ./services/xidlehook.nix
-    ./services/xscreensaver.nix
-    ./services/xsettingsd.nix
-    ./services/xsuspender.nix
-    ./systemd.nix
-    ./targets/darwin
-    ./targets/generic-linux.nix
-    ./xcursor.nix
-    ./xresources.nix
-    ./xsession.nix
-    (pkgs.path + "/nixos/modules/misc/assertions.nix")
-    (pkgs.path + "/nixos/modules/misc/meta.nix")
-  ] ++ optional useNixpkgsModule ./misc/nixpkgs.nix;
+  hostPlatform = pkgs.stdenv.hostPlatform;
+
+  loadModule = file: { condition ? true }: {
+    inherit file condition;
+  };
+
+  allModules = [
+    (loadModule ./accounts/email.nix { })
+    (loadModule ./config/i18n.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./files.nix { })
+    (loadModule ./home-environment.nix { })
+    (loadModule ./manual.nix { })
+    (loadModule ./misc/dconf.nix { })
+    (loadModule ./misc/debug.nix { })
+    (loadModule ./misc/fontconfig.nix { })
+    (loadModule ./misc/gtk.nix { })
+    (loadModule ./misc/lib.nix { })
+    (loadModule ./misc/news.nix { })
+    (loadModule ./misc/nixpkgs.nix { condition = useNixpkgsModule; })
+    (loadModule ./misc/numlock.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/pam.nix { })
+    (loadModule ./misc/qt.nix { })
+    (loadModule ./misc/submodule-support.nix { })
+    (loadModule ./misc/tmpfiles.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/version.nix { })
+    (loadModule ./misc/vte.nix { })
+    (loadModule ./misc/xdg-system-dirs.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg-mime.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg-mime-apps.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg-user-dirs.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg.nix { })
+    (loadModule ./programs/abook.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/afew.nix { })
+    (loadModule ./programs/alacritty.nix { })
+    (loadModule ./programs/alot.nix { })
+    (loadModule ./programs/aria2.nix { })
+    (loadModule ./programs/astroid.nix { })
+    (loadModule ./programs/autojump.nix { })
+    (loadModule ./programs/autorandr.nix { })
+    (loadModule ./programs/bash.nix { })
+    (loadModule ./programs/bat.nix { })
+    (loadModule ./programs/beets.nix { })
+    (loadModule ./programs/broot.nix { })
+    (loadModule ./programs/browserpass.nix { })
+    (loadModule ./programs/chromium.nix { })
+    (loadModule ./programs/command-not-found/command-not-found.nix { })
+    (loadModule ./programs/dircolors.nix { })
+    (loadModule ./programs/direnv.nix { })
+    (loadModule ./programs/eclipse.nix { })
+    (loadModule ./programs/emacs.nix { })
+    (loadModule ./programs/exa.nix { })
+    (loadModule ./programs/feh.nix { })
+    (loadModule ./programs/firefox.nix { })
+    (loadModule ./programs/fish.nix { })
+    (loadModule ./programs/foot.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/fzf.nix { })
+    (loadModule ./programs/getmail.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/gh.nix { })
+    (loadModule ./programs/git.nix { })
+    (loadModule ./programs/gnome-terminal.nix { })
+    (loadModule ./programs/go.nix { })
+    (loadModule ./programs/gpg.nix { })
+    (loadModule ./programs/home-manager.nix { })
+    (loadModule ./programs/htop.nix { })
+    (loadModule ./programs/i3status.nix { })
+    (loadModule ./programs/i3status-rust.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/info.nix { })
+    (loadModule ./programs/irssi.nix { })
+    (loadModule ./programs/lieer.nix { })
+    (loadModule ./programs/java.nix { })
+    (loadModule ./programs/jq.nix { })
+    (loadModule ./programs/kakoune.nix { })
+    (loadModule ./programs/keychain.nix { })
+    (loadModule ./programs/kitty.nix { })
+    (loadModule ./programs/lazygit.nix { })
+    (loadModule ./programs/lesspipe.nix { })
+    (loadModule ./programs/lf.nix { })
+    (loadModule ./programs/lsd.nix { })
+    (loadModule ./programs/man.nix { })
+    (loadModule ./programs/matplotlib.nix { })
+    (loadModule ./programs/mbsync.nix { })
+    (loadModule ./programs/mcfly.nix { })
+    (loadModule ./programs/mercurial.nix { })
+    (loadModule ./programs/mpv.nix { })
+    (loadModule ./programs/msmtp.nix { })
+    (loadModule ./programs/mu.nix { })
+    (loadModule ./programs/ncmpcpp.nix { })
+    (loadModule ./programs/ncspot.nix { })
+    (loadModule ./programs/ne.nix { })
+    (loadModule ./programs/neomutt.nix { })
+    (loadModule ./programs/neovim.nix { })
+    (loadModule ./programs/newsboat.nix { })
+    (loadModule ./programs/nix-index.nix { })
+    (loadModule ./programs/noti.nix { })
+    (loadModule ./programs/notmuch.nix { })
+    (loadModule ./programs/nushell.nix { })
+    (loadModule ./programs/obs-studio.nix { })
+    (loadModule ./programs/octant.nix { })
+    (loadModule ./programs/offlineimap.nix { })
+    (loadModule ./programs/opam.nix { })
+    (loadModule ./programs/password-store.nix { })
+    (loadModule ./programs/pazi.nix { })
+    (loadModule ./programs/pet.nix { })
+    (loadModule ./programs/pidgin.nix { })
+    (loadModule ./programs/powerline-go.nix { })
+    (loadModule ./programs/qutebrowser.nix { })
+    (loadModule ./programs/readline.nix { })
+    (loadModule ./programs/rofi.nix { })
+    (loadModule ./programs/rofi-pass.nix {  })
+    (loadModule ./programs/rtorrent.nix { })
+    (loadModule ./programs/scmpuff.nix { })
+    (loadModule ./programs/skim.nix { })
+    (loadModule ./programs/starship.nix { })
+    (loadModule ./programs/sbt.nix { })
+    (loadModule ./programs/ssh.nix { })
+    (loadModule ./programs/taskwarrior.nix { })
+    (loadModule ./programs/termite.nix { })
+    (loadModule ./programs/texlive.nix { })
+    (loadModule ./programs/tmux.nix { })
+    (loadModule ./programs/topgrade.nix { })
+    (loadModule ./programs/urxvt.nix { })
+    (loadModule ./programs/vim.nix { })
+    (loadModule ./programs/vscode.nix { })
+    (loadModule ./programs/vscode/haskell.nix { })
+    (loadModule ./programs/waybar.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/z-lua.nix { })
+    (loadModule ./programs/zathura.nix { })
+    (loadModule ./programs/zoxide.nix { })
+    (loadModule ./programs/zplug.nix { })
+    (loadModule ./programs/zsh.nix { })
+    (loadModule ./programs/zsh/prezto.nix { })
+    (loadModule ./services/barrier.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/blueman-applet.nix { })
+    (loadModule ./services/caffeine.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/cbatticon.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/clipmenu.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/compton.nix { })
+    (loadModule ./services/dropbox.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/dunst.nix { })
+    (loadModule ./services/dwm-status.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/emacs.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/etesync-dav.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/flameshot.nix { })
+    (loadModule ./services/fluidsynth.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/redshift-gammastep/gammastep.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/getmail.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/gnome-keyring.nix { })
+    (loadModule ./services/gpg-agent.nix { })
+    (loadModule ./services/grobi.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/hound.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/imapnotify.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/kanshi.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/kbfs.nix { })
+    (loadModule ./services/kdeconnect.nix { })
+    (loadModule ./services/keepassx.nix { })
+    (loadModule ./services/keybase.nix { })
+    (loadModule ./services/keynav.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/lieer.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/lorri.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/mako.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/mbsync.nix { })
+    (loadModule ./services/mpd.nix { })
+    (loadModule ./services/mpdris2.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/mpris-proxy.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/muchsync.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/network-manager-applet.nix { })
+    (loadModule ./services/nextcloud-client.nix { })
+    (loadModule ./services/owncloud-client.nix { })
+    (loadModule ./services/parcellite.nix { })
+    (loadModule ./services/pass-secret-service.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/password-store-sync.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/pasystray.nix { })
+    (loadModule ./services/pbgopy.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/picom.nix { })
+    (loadModule ./services/plan9port.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/playerctld.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/polybar.nix { })
+    (loadModule ./services/poweralertd.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/pulseeffects.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/random-background.nix { })
+    (loadModule ./services/redshift-gammastep/redshift.nix { })
+    (loadModule ./services/rsibreak.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/screen-locker.nix { })
+    (loadModule ./services/stalonetray.nix { })
+    (loadModule ./services/status-notifier-watcher.nix { })
+    (loadModule ./services/spotifyd.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/sxhkd.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/syncthing.nix { })
+    (loadModule ./services/taffybar.nix { })
+    (loadModule ./services/tahoe-lafs.nix { })
+    (loadModule ./services/taskwarrior-sync.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/udiskie.nix { })
+    (loadModule ./services/unclutter.nix { })
+    (loadModule ./services/unison.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/window-managers/awesome.nix { })
+    (loadModule ./services/window-managers/bspwm/default.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/window-managers/i3-sway/i3.nix { })
+    (loadModule ./services/window-managers/i3-sway/sway.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/window-managers/xmonad.nix { })
+    (loadModule ./services/wlsunset.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/xcape.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/xembed-sni-proxy.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/xscreensaver.nix { })
+    (loadModule ./services/xsuspender.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./systemd.nix { })
+    (loadModule ./targets/darwin { condition = hostPlatform.isDarwin; })
+    (loadModule ./targets/generic-linux.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./xcursor.nix { })
+    (loadModule ./xresources.nix { })
+    (loadModule ./xsession.nix { })
+    (loadModule (pkgs.path + "/nixos/modules/misc/assertions.nix") { })
+    (loadModule (pkgs.path + "/nixos/modules/misc/meta.nix") { })
+  ];
+
+  modules = map (getAttr "file") (filter (getAttr "condition") allModules);

  pkgsModule = { config, ... }: {
    config = {
      _module.args.baseModules = modules;
-      _module.args.pkgsPath = lib.mkDefault
-        (if versionAtLeast config.home.stateVersion "20.09" then
+      _module.args.pkgsPath = lib.mkDefault (
+        if versionAtLeast config.home.stateVersion "20.09" then
          pkgs.path
        else
          <nixpkgs>);
@@ -251,4 +246,6 @@ let
    };
  };

-in modules ++ [ pkgsModule ]
+in
+
+  modules ++ [ pkgsModule ]
@@ -27,11 +27,7 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "programs.abook" pkgs platforms.linux) ];
-
    home.packages = [ pkgs.abook ];
-
    xdg.configFile."abook/abookrc" = mkIf (cfg.extraConfig != "") {
      text = ''
        # Generated by Home Manager.
@@ -11,8 +11,13 @@ let
    dir = "bin";
    src = ./command-not-found.pl;
    isExecutable = true;
+    inherit (pkgs) perl;
    inherit (cfg) dbPath;
-    perl = pkgs.perl.withPackages (p: [ p.DBDSQLite p.StringShellQuote ]);
+    perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ") [
+      pkgs.perlPackages.DBI
+      pkgs.perlPackages.DBDSQLite
+      pkgs.perlPackages.StringShellQuote
+    ]);
  };

  shInit = commandNotFoundHandlerName: ''
@@ -1,4 +1,4 @@
-#! @perl@/bin/perl -w
+#! @perl@/bin/perl -w @perlFlags@

 use strict;
 use DBI;
@@ -29,17 +29,16 @@ if (!defined $res || scalar @$res == 0) {
        exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
    } else {
        print STDERR <<EOF;
-The program '$program' is not in your PATH. You can make it available in an
-ephemeral shell by typing:
-  nix-shell -p $package
+The program ‘$program’ is currently not installed. You can install it by typing:
+  nix-env -iA nixos.$package
 EOF
    }
 } else {
    print STDERR <<EOF;
-The program '$program' is not in your PATH. It is provided by several packages.
-You can make it available in an ephemeral shell by typing one of the following:
+The program ‘$program’ is currently not installed. It is provided by
+several packages. You can install it by typing one of the following:
 EOF
-    print STDERR "  nix-shell -p $_->{package}\n" foreach @$res;
+    print STDERR "  nix-env -iA nixos.$_->{package}\n" foreach @$res;
 }

 exit 127;
@@ -9,15 +9,19 @@ let
  cfg = config.programs.firefox;

  mozillaConfigPath =
-    if isDarwin then "Library/Application Support/Mozilla" else ".mozilla";
+    if isDarwin
+    then "Library/Application Support/Mozilla"
+    else ".mozilla";

-  firefoxConfigPath = if isDarwin then
-    "Library/Application Support/Firefox"
-  else
-    "${mozillaConfigPath}/firefox";
+  firefoxConfigPath =
+    if isDarwin
+    then "Library/Application Support/Firefox"
+    else "${mozillaConfigPath}/firefox";

  profilesPath =
-    if isDarwin then "${firefoxConfigPath}/Profiles" else firefoxConfigPath;
+    if isDarwin
+    then "${firefoxConfigPath}/Profiles"
+    else firefoxConfigPath;

  # The extensions path shared by all profiles; will not be supported
  # by future Firefox versions.
@@ -28,17 +32,24 @@ let
    paths = cfg.extensions;
  };

-  profiles = flip mapAttrs' cfg.profiles (_: profile:
-    nameValuePair "Profile${toString profile.id}" {
-      Name = profile.name;
-      Path = if isDarwin then "Profiles/${profile.path}" else profile.path;
-      IsRelative = 1;
-      Default = if profile.isDefault then 1 else 0;
-    }) // {
-      General = { StartWithLastProfile = 1; };
+  profiles =
+    flip mapAttrs' cfg.profiles (_: profile:
+      nameValuePair "Profile${toString profile.id}" {
+        Name = profile.name;
+        Path =
+          if isDarwin
+          then "Profiles/${profile.path}"
+          else profile.path;
+        IsRelative = 1;
+        Default = if profile.isDefault then 1 else 0;
+      }
+    ) // {
+      General = {
+        StartWithLastProfile = 1;
+      };
    };

-  profilesIni = generators.toINI { } profiles;
+  profilesIni = generators.toINI {} profiles;

  mkUserJs = prefs: extraPrefs: ''
    // Generated by Home Manager.
@@ -50,15 +61,17 @@ let
    ${extraPrefs}
  '';

-in {
+in
+
+{
  meta.maintainers = [ maintainers.rycee ];

  imports = [
-    (mkRemovedOptionModule [ "programs" "firefox" "enableAdobeFlash" ]
+    (mkRemovedOptionModule ["programs" "firefox" "enableAdobeFlash"]
      "Support for this option has been removed.")
-    (mkRemovedOptionModule [ "programs" "firefox" "enableGoogleTalk" ]
+    (mkRemovedOptionModule ["programs" "firefox" "enableGoogleTalk"]
      "Support for this option has been removed.")
-    (mkRemovedOptionModule [ "programs" "firefox" "enableIcedTea" ]
+    (mkRemovedOptionModule ["programs" "firefox" "enableIcedTea"]
      "Support for this option has been removed.")
  ];

@@ -68,10 +81,10 @@ in {

      package = mkOption {
        type = types.package;
-        default = if versionAtLeast config.home.stateVersion "19.09" then
-          pkgs.firefox
-        else
-          pkgs.firefox-unwrapped;
+        default =
+          if versionAtLeast config.home.stateVersion "19.09"
+          then pkgs.firefox
+          else pkgs.firefox-unwrapped;
        defaultText = literalExample "pkgs.firefox";
        example = literalExample ''
          pkgs.firefox.override {
@@ -93,7 +106,7 @@ in {

      extensions = mkOption {
        type = types.listOf types.package;
-        default = [ ];
+        default = [];
        example = literalExample ''
          with pkgs.nur.repos.rycee.firefox-addons; [
            https-everywhere
@@ -128,7 +141,7 @@ in {
      };

      profiles = mkOption {
-        type = types.attrsOf (types.submodule ({ config, name, ... }: {
+        type = types.attrsOf (types.submodule ({config, name, ...}: {
          options = {
            name = mkOption {
              type = types.str;
@@ -146,7 +159,7 @@ in {

            settings = mkOption {
              type = with types; attrsOf (either bool (either int str));
-              default = { };
+              default = {};
              example = literalExample ''
                {
                  "browser.startup.homepage" = "https://nixos.org";
@@ -211,7 +224,7 @@ in {
            };
          };
        }));
-        default = { };
+        default = {};
        description = "Attribute set of Firefox profiles.";
      };

@@ -230,27 +243,36 @@ in {

  config = mkIf cfg.enable {
    assertions = [
-      (let
-        defaults =
-          catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
-      in {
-        assertion = cfg.profiles == { } || length defaults == 1;
-        message = "Must have exactly one default Firefox profile but found "
-          + toString (length defaults) + optionalString (length defaults > 1)
-          (", namely " + concatStringsSep ", " defaults);
-      })
+      (
+        let
+          defaults =
+            catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
+        in {
+          assertion = cfg.profiles == {} || length defaults == 1;
+          message =
+            "Must have exactly one default Firefox profile but found "
+            + toString (length defaults)
+            + optionalString (length defaults > 1)
+                (", namely " + concatStringsSep ", " defaults);
+        }
+      )

-      (let
-        duplicates = filterAttrs (_: v: length v != 1) (zipAttrs
-          (mapAttrsToList (n: v: { "${toString v.id}" = n; }) (cfg.profiles)));
+      (
+        let
+          duplicates =
+            filterAttrs (_: v: length v != 1)
+            (zipAttrs
+            (mapAttrsToList (n: v: { "${toString v.id}" = n; })
+            (cfg.profiles)));

-        mkMsg = n: v: "  - ID ${n} is used by ${concatStringsSep ", " v}";
-      in {
-        assertion = duplicates == { };
-        message = ''
-          Must not have Firefox profiles with duplicate IDs but
-        '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
-      })
+          mkMsg = n: v: "  - ID ${n} is used by ${concatStringsSep ", " v}";
+        in {
+          assertion = duplicates == {};
+          message =
+            "Must not have Firefox profiles with duplicate IDs but\n"
+            + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
+        }
+      )
    ];

    warnings = optional (cfg.enableGnomeExtensions or false) ''
@@ -260,53 +282,65 @@ in {
      its example for how to do this.
    '';

-    home.packages = let
-      # The configuration expected by the Firefox wrapper.
-      fcfg = { enableGnomeExtensions = cfg.enableGnomeExtensions; };
-
-      # A bit of hackery to force a config into the wrapper.
-      browserName = cfg.package.browserName or (builtins.parseDrvName
-        cfg.package.name).name;
-
-      # The configuration expected by the Firefox wrapper builder.
-      bcfg = setAttrByPath [ browserName ] fcfg;
-
-      package = if isDarwin then
-        cfg.package
-      else if versionAtLeast config.home.stateVersion "19.09" then
-        cfg.package.override (old: { cfg = old.cfg or { } // fcfg; })
-      else
-        (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { };
-    in [ package ];
-
-    home.file = mkMerge ([{
-      "${mozillaConfigPath}/${extensionPath}" = mkIf (cfg.extensions != [ ]) {
-        source = "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
-        recursive = true;
-      };
-
-      "${firefoxConfigPath}/profiles.ini" =
-        mkIf (cfg.profiles != { }) { text = profilesIni; };
-    }] ++ flip mapAttrsToList cfg.profiles (_: profile: {
-      "${profilesPath}/${profile.path}/.keep".text = "";
-
-      "${profilesPath}/${profile.path}/chrome/userChrome.css" =
-        mkIf (profile.userChrome != "") { text = profile.userChrome; };
-
-      "${profilesPath}/${profile.path}/chrome/userContent.css" =
-        mkIf (profile.userContent != "") { text = profile.userContent; };
-
-      "${profilesPath}/${profile.path}/user.js" =
-        mkIf (profile.settings != { } || profile.extraConfig != "") {
-          text = mkUserJs profile.settings profile.extraConfig;
+    home.packages =
+      let
+        # The configuration expected by the Firefox wrapper.
+        fcfg = {
+          enableGnomeExtensions = cfg.enableGnomeExtensions;
        };

-      "${profilesPath}/${profile.path}/extensions" =
-        mkIf (cfg.extensions != [ ]) {
+        # A bit of hackery to force a config into the wrapper.
+        browserName = cfg.package.browserName
+          or (builtins.parseDrvName cfg.package.name).name;
+
+        # The configuration expected by the Firefox wrapper builder.
+        bcfg = setAttrByPath [browserName] fcfg;
+
+        package =
+          if isDarwin then
+            cfg.package
+          else if versionAtLeast config.home.stateVersion "19.09" then
+            cfg.package.override (old: { cfg = old.cfg or {} // fcfg; })
+          else
+            (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { };
+      in
+        [ package ];
+
+    home.file = mkMerge (
+      [{
+        "${mozillaConfigPath}/${extensionPath}" = mkIf (cfg.extensions != []) {
+          source = "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
+          recursive = true;
+        };
+
+        "${firefoxConfigPath}/profiles.ini" = mkIf (cfg.profiles != {}) {
+          text = profilesIni;
+        };
+      }]
+      ++ flip mapAttrsToList cfg.profiles (_: profile: {
+        "${profilesPath}/${profile.path}/.keep".text = "";
+
+        "${profilesPath}/${profile.path}/chrome/userChrome.css" =
+          mkIf (profile.userChrome != "") {
+            text = profile.userChrome;
+          };
+
+        "${profilesPath}/${profile.path}/chrome/userContent.css" =
+          mkIf (profile.userContent != "") {
+            text = profile.userContent;
+          };
+
+        "${profilesPath}/${profile.path}/user.js" =
+          mkIf (profile.settings != {} || profile.extraConfig != "") {
+            text = mkUserJs profile.settings profile.extraConfig;
+          };
+
+        "${profilesPath}/${profile.path}/extensions" = mkIf (cfg.extensions != []) {
          source = "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
          recursive = true;
          force = true;
        };
-    }));
+      })
+    );
  };
 }
@@ -49,9 +49,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "programs.foot" pkgs platforms.linux) ];
-
    home.packages = [ cfg.package ];

    xdg.configFile."foot/foot.ini" = mkIf (cfg.settings != { }) {
@@ -148,20 +148,20 @@ in {

    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
      if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-        . ${cfg.package}/share/fzf/completion.bash
-        . ${cfg.package}/share/fzf/key-bindings.bash
+        . ${pkgs.fzf}/share/fzf/completion.bash
+        . ${pkgs.fzf}/share/fzf/key-bindings.bash
      fi
    '';

    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
      if [[ $options[zle] = on ]]; then
-        . ${cfg.package}/share/fzf/completion.zsh
-        . ${cfg.package}/share/fzf/key-bindings.zsh
+        . ${pkgs.fzf}/share/fzf/completion.zsh
+        . ${pkgs.fzf}/share/fzf/key-bindings.zsh
      fi
    '';

    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-      source ${cfg.package}/share/fzf/key-bindings.fish && fzf_key_bindings
+      source ${pkgs.fzf}/share/fzf/key-bindings.fish && fzf_key_bindings
    '';
  };
 }
@@ -55,10 +55,6 @@ in {
  };

  config = mkIf getmailEnabled {
-    assertions = [
-      (hm.assertions.assertPlatform "programs.getmail" pkgs platforms.linux)
-    ];
-
    home.file = foldl' (a: b: a // b) { }
      (map (a: { "${renderConfigFilepath a}".text = renderAccountConfig a; })
        accounts);
@@ -187,12 +187,6 @@ let
        '';
      };

-      boldIsBright = mkOption {
-        default = null;
-        type = types.nullOr types.bool;
-        description = "Whether bold text is shown in bright colors.";
-      };
-
      deleteBinding = mkOption {
        default = "delete-sequence";
        type = eraseBinding;
@@ -240,12 +234,6 @@ let
        type = types.bool;
        description = "Turn on/off the terminal's bell.";
      };
-
-      transparencyPercent = mkOption {
-        default = null;
-        type = types.nullOr (types.ints.between 0 100);
-        description = "Background transparency in percent.";
-      };
    };
  });

@@ -253,7 +241,6 @@ let
    {
      audible-bell = pcfg.audibleBell;
      visible-name = pcfg.visibleName;
-      scroll-on-output = pcfg.scrollOnOutput;
      scrollbar-policy = if pcfg.showScrollbar then "always" else "never";
      scrollback-lines = pcfg.scrollbackLines;
      cursor-shape = pcfg.cursorShape;
@@ -286,9 +273,7 @@ let
      } else {
        bold-color-same-as-fg = false;
        bold-color = pcfg.colors.boldColor;
-      }) // optionalAttrs (pcfg.boldIsBright != null) {
-        bold-is-bright = pcfg.boldIsBright;
-      } // (if (pcfg.colors.cursor != null) then {
+      }) // (if (pcfg.colors.cursor != null) then {
        cursor-colors-set = true;
        cursor-foreground-color = pcfg.colors.cursor.foreground;
        cursor-background-color = pcfg.colors.cursor.background;
@@ -300,14 +285,10 @@ let
        highlight-background-color = pcfg.colors.highlight.background;
      } else {
        highlight-colors-set = false;
-      }) // optionalAttrs (pcfg.transparencyPercent != null) {
-        background-transparency-percent = pcfg.transparencyPercent;
-        use-theme-transparency = false;
-        use-transparent-background = true;
-      }));
+      })));

 in {
-  meta.maintainers = with maintainers; [ kamadorueda rycee ];
+  meta.maintainers = [ maintainers.rycee ];

  options = {
    programs.gnome-terminal = {
@@ -1,100 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.programs.himalaya;
-
-  enabledAccounts =
-    lib.filterAttrs (_: a: a.himalaya.enable) (config.accounts.email.accounts);
-
-  tomlFormat = pkgs.formats.toml { };
-
-  himalayaConfig = let
-    toHimalayaConfig = account:
-      {
-        email = account.address;
-        name = account.realName;
-        default = account.primary;
-
-        # FIXME: does not support disabling TLS altogether
-        # NOTE: does not accept sequence of strings for password commands
-        imap-login = account.userName;
-        imap-passwd-cmd = lib.escapeShellArgs account.passwordCommand;
-        imap-host = account.imap.host;
-        imap-port = account.imap.port;
-        imap-starttls = account.imap.tls.useStartTls;
-
-        smtp-login = account.userName;
-        smtp-passwd-cmd = lib.escapeShellArgs account.passwordCommand;
-        smtp-host = account.smtp.host;
-        smtp-port = account.smtp.port;
-        smtp-starttls = account.imap.tls.useStartTls;
-      } // (lib.optionalAttrs (account.signature.showSignature == "append") {
-        # FIXME: signature cannot be attached
-        signature = account.signature.text;
-      }) // account.himalaya.settings;
-  in {
-    # NOTE: will not start without this configured, but each account overrides it
-    name = "";
-  } // cfg.settings // (lib.mapAttrs (_: toHimalayaConfig) enabledAccounts);
-in {
-  meta.maintainers = with lib.hm.maintainers; [ ambroisie ];
-
-  options = with lib; {
-    programs.himalaya = {
-      enable = mkEnableOption "himalaya mail client";
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.himalaya;
-        defaultText = literalExample "pkgs.himalaya";
-        description = ''
-          Package providing the <command>himalaya</command> mail client.
-        '';
-      };
-
-      settings = mkOption {
-        type = tomlFormat.type;
-        default = { };
-        example = lib.literalExample ''
-          {
-            default-page-size = 50;
-          }
-        '';
-        description = ''
-          Global <command>himalaya</command> configuration values.
-        '';
-      };
-    };
-
-    accounts.email.accounts = mkOption {
-      type = with types;
-        attrsOf (submodule {
-          options.himalaya = {
-            enable = mkEnableOption ''
-              the himalaya mail client for this account
-            '';
-
-            settings = mkOption {
-              type = tomlFormat.type;
-              default = { };
-              example = lib.literalExample ''
-                {
-                  default-page-size = 50;
-                }
-              '';
-              description = ''
-                Extra settings to add to this <command>himalaya</command>
-                account configuration.
-              '';
-            };
-          };
-        });
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-
-    xdg.configFile."himalaya/config.toml".source =
-      tomlFormat.generate "himalaya-config.toml" himalayaConfig;
-  };
-}
@@ -623,45 +623,53 @@ in {
      rightModes = deprecate "right_meter_modes" "meters.right"
        (ifNonNull cfg.meters (map (m: m.mode) cfg.meters.right));

-      settings' = cfg.settings // (filterAttrs (_: v: !isNull v) {
-        fields = deprecate "fields" "fields"
-          (ifNonNull cfg.fields (map (n: fields.${n}) cfg.fields));
-        sort_key = deprecate "sort_key" "sortKey"
-          (ifNonNull cfg.sortKey fields.${cfg.sortKey});
-        sort_direction = deprecate' "sort_direction" "sortDescending";
-        hide_threads = deprecate' "hide_threads" "hideThreads";
-        hide_kernel_threads =
-          deprecate' "hide_kernel_threads" "hideKernelThreads";
-        hide_userland_threads =
-          deprecate' "hide_userland_threads" "hideUserlandThreads";
-        shadow_other_users = deprecate' "shadow_other_users" "shadowOtherUsers";
-        show_thread_names = deprecate' "show_thread_names" "showThreadNames";
-        show_program_path = deprecate' "show_program_path" "showProgramPath";
-        highlight_base_name =
-          deprecate' "highlight_base_name" "highlightBaseName";
-        highlight_megabytes =
-          deprecate' "highlight_megabytes" "highlightMegabytes";
-        highlight_threads = deprecate' "highlight_threads" "highlightThreads";
-        tree_view = deprecate' "tree_view" "treeView";
-        header_margin = deprecate' "header_margin" "headerMargin";
-        detailed_cpu_time = deprecate' "detailed_cpu_time" "detailedCpuTime";
-        cpu_count_from_zero =
-          deprecate' "cpu_count_from_zero" "cpuCountFromZero";
-        show_cpu_usage = deprecate' "show_cpu_usage" "showCpuUsage";
-        show_cpu_frequency = deprecate' "show_cpu_frequency" "showCpuFrequency";
-        update_process_names =
-          deprecate' "update_process_names" "updateProcessNames";
-        account_guest_in_cpu_meter =
-          deprecate' "account_guest_in_cpu_meter" "accountGuestInCpuMeter";
-        color_scheme = deprecate' "color_scheme" "colorScheme";
-        enable_mouse = deprecate' "enable_mouse" "enableMouse";
-        delay = deprecate' "delay" "delay";
-        left_meters = leftMeters;
-        left_meter_modes = leftModes;
-        right_meters = rightMeters;
-        right_meter_modes = rightModes;
-        vim_mode = deprecate' "vim_mode" "vimMode";
-      });
-    in concatStringsSep "\n" (mapAttrsToList formatOption settings');
+      before = optionalAttrs (cfg.settings ? header_layout) {
+        inherit (cfg.settings) header_layout;
+      };
+
+      settings' = (removeAttrs cfg.settings (attrNames before))
+        // (filterAttrs (_: v: !isNull v) {
+          fields = deprecate "fields" "fields"
+            (ifNonNull cfg.fields (map (n: fields.${n}) cfg.fields));
+          sort_key = deprecate "sort_key" "sortKey"
+            (ifNonNull cfg.sortKey fields.${cfg.sortKey});
+          sort_direction = deprecate' "sort_direction" "sortDescending";
+          hide_threads = deprecate' "hide_threads" "hideThreads";
+          hide_kernel_threads =
+            deprecate' "hide_kernel_threads" "hideKernelThreads";
+          hide_userland_threads =
+            deprecate' "hide_userland_threads" "hideUserlandThreads";
+          shadow_other_users =
+            deprecate' "shadow_other_users" "shadowOtherUsers";
+          show_thread_names = deprecate' "show_thread_names" "showThreadNames";
+          show_program_path = deprecate' "show_program_path" "showProgramPath";
+          highlight_base_name =
+            deprecate' "highlight_base_name" "highlightBaseName";
+          highlight_megabytes =
+            deprecate' "highlight_megabytes" "highlightMegabytes";
+          highlight_threads = deprecate' "highlight_threads" "highlightThreads";
+          tree_view = deprecate' "tree_view" "treeView";
+          header_margin = deprecate' "header_margin" "headerMargin";
+          detailed_cpu_time = deprecate' "detailed_cpu_time" "detailedCpuTime";
+          cpu_count_from_zero =
+            deprecate' "cpu_count_from_zero" "cpuCountFromZero";
+          show_cpu_usage = deprecate' "show_cpu_usage" "showCpuUsage";
+          show_cpu_frequency =
+            deprecate' "show_cpu_frequency" "showCpuFrequency";
+          update_process_names =
+            deprecate' "update_process_names" "updateProcessNames";
+          account_guest_in_cpu_meter =
+            deprecate' "account_guest_in_cpu_meter" "accountGuestInCpuMeter";
+          color_scheme = deprecate' "color_scheme" "colorScheme";
+          enable_mouse = deprecate' "enable_mouse" "enableMouse";
+          delay = deprecate' "delay" "delay";
+          left_meters = leftMeters;
+          left_meter_modes = leftModes;
+          right_meters = rightMeters;
+          right_meter_modes = rightModes;
+          vim_mode = deprecate' "vim_mode" "vimMode";
+        });
+    in concatStringsSep "\n" (mapAttrsToList formatOption before
+      ++ mapAttrsToList formatOption settings');
  };
 }
@@ -42,8 +42,8 @@ in {
              {
                block = "memory";
                display_type = "memory";
-                format_mem = "{mem_used_percents}";
-                format_swap = "{swap_used_percents}";
+                format_mem = "{Mup}%";
+                format_swap = "{SUp}%";
              }
              {
                block = "cpu";
@@ -205,8 +205,8 @@ in {
             {
               block = "memory";
               display_type = "memory";
-               format_mem = "{mem_used_percents}";
-               format_swap = "{swap_used_percents}";
+               format_mem = "{Mup}%";
+               format_swap = "{SUp}%";
             }
             {
               block = "cpu";
@@ -249,11 +249,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "programs.i3status-rust" pkgs
-        platforms.linux)
-    ];
-
    home.packages = [ cfg.package ];

    xdg.configFile = mapAttrs' (cfgFileSuffix: cfg:
@@ -35,9 +35,6 @@ let
          use_ssl = "${boolStr v.server.ssl.enable}";
          ssl_verify = "${boolStr v.server.ssl.verify}";
          autoconnect = "${boolStr v.server.autoConnect}";
-          ${lib.optionalString (v.server.ssl.certificateFile != null) ''
-          ssl_cert = "${v.server.ssl.certificateFile}";
-          ''}
        }
      ''));

@@ -121,15 +118,6 @@ let
            default = true;
            description = "Whether the SSL certificate should be verified.";
          };
-
-          certificateFile = mkOption {
-            type = types.nullOr types.path;
-            default = null;
-            description = ''
-              Path to a file containing the certificate used for
-              client authentication to the server.
-            '';
-          };
        };

        autoConnect = mkOption {
@@ -0,0 +1,46 @@
+# This module provides JAVA_HOME, with a different way to install java locally.
+# This module is modified from the NixOS module `programs.java`
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.java;
+
+in {
+  meta.maintainers = with maintainers; [ ShamrockLee ];
+
+  options = {
+    programs.java = {
+      enable = mkEnableOption "" // {
+        description = ''
+          Install the Java development kit and set the <envar>JAVA_HOME</envar>
+          variable.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.jdk;
+        defaultText = "pkgs.jdk";
+        description = ''
+          Java package to install. Typical values are
+          <literal>pkgs.jdk</literal> or <literal>pkgs.jre</literal>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    home.sessionVariables = {
+      JAVA_HOME = fileContents (pkgs.runCommandLocal "java-home" { } ''
+        source "${cfg.package}/nix-support/setup-hook"
+        echo "$JAVA_HOME" > $out
+      '');
+    };
+  };
+}
@@ -1,106 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.mangohud;
-
-  settingsType = with types;
-    (oneOf [ bool int float str path (listOf (oneOf [ int str ])) ]);
-
-  renderOption = option:
-    rec {
-      int = toString option;
-      float = int;
-      path = int;
-      bool = "false";
-      string = option;
-      list = concatStringsSep "," (lists.forEach option (x: toString x));
-    }.${builtins.typeOf option};
-
-  renderLine = k: v: (if isBool v && v then k else "${k}=${renderOption v}");
-  renderSettings = attrs:
-    strings.concatStringsSep "\n" (attrsets.mapAttrsToList renderLine attrs)
-    + "\n";
-
-in {
-  options = {
-    programs.mangohud = {
-      enable = mkEnableOption "Mangohud";
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.mangohud;
-        defaultText = literalExample "pkgs.mangohud";
-        description = "The Mangohud package to install.";
-      };
-
-      enableSessionWide = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Sets environment variables so that 
-          MangoHud is started on any application that supports it.
-        '';
-      };
-
-      settings = mkOption {
-        type = with types; attrsOf settingsType;
-        default = { };
-        example = literalExample ''
-          {
-            output_folder = ~/Documents/mangohud/;
-            full = true;
-          }
-        '';
-        description = ''
-          Configuration written to
-          <filename>~/.config/MangoHud/MangoHud.conf</filename>. See
-          <link xlink:href="https://github.com/flightlessmango/MangoHud/blob/master/bin/MangoHud.conf"/>
-          for the default configuration.
-        '';
-      };
-
-      settingsPerApplication = mkOption {
-        type = with types; attrsOf (attrsOf settingsType);
-        default = { };
-        example = literalExample ''
-          {
-            mpv = {
-              no_display = true;
-            }
-          }
-        '';
-        description = ''
-          Sets MangoHud settings per application.
-          Configuration written to
-          <filename>~/.config/MangoHud/{application_name}.conf</filename>. See
-          <link xlink:href="https://github.com/flightlessmango/MangoHud/blob/master/bin/MangoHud.conf"/>
-          for the default configuration.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "programs.mangohud" pkgs platforms.linux)
-    ];
-
-    home.packages = [ cfg.package ];
-
-    home.sessionVariables = mkIf cfg.enableSessionWide {
-      MANGOHUD = 1;
-      MANGOHUD_DLSYM = 1;
-    };
-
-    xdg.configFile = {
-      "MangoHud/MangoHud.conf" =
-        mkIf (cfg.settings != { }) { text = renderSettings cfg.settings; };
-    } // mapAttrs'
-      (n: v: nameValuePair "MangoHud/${n}.conf" { text = renderSettings v; })
-      cfg.settingsPerApplication;
-  };
-
-  meta.maintainers = with maintainers; [ zeratax ];
-}
@@ -6,8 +6,6 @@ let

  cfg = config.programs.neovim;

-  jsonFormat = pkgs.formats.json { };
-
  extraPython3PackageType = mkOptionType {
    name = "extra-python3-packages";
    description = "python3 packages in python.withPackages format";
@@ -53,7 +51,8 @@ let
        (map (x: if x ? plugin && x.optional == true then x.plugin else null)
          cfg.plugins);
    };
-    beforePlugins = "";
+    customRC = cfg.extraConfig
+      + pkgs.lib.concatMapStrings pluginConfig cfg.plugins;
  };

  extraMakeWrapperArgs = lib.optionalString (cfg.extraPackages != [ ])
@@ -132,15 +131,6 @@ in {
        '';
      };

-      generatedConfigViml = mkOption {
-        type = types.lines;
-        visible = true;
-        readOnly = true;
-        description = ''
-          Generated vimscript config.
-        '';
-      };
-
      package = mkOption {
        type = types.package;
        default = pkgs.neovim-unwrapped;
@@ -228,44 +218,6 @@ in {
          This option is mutually exclusive with <varname>configure</varname>.
        '';
      };
-
-      coc = {
-        enable = mkEnableOption "Coc";
-
-        settings = mkOption {
-          type = jsonFormat.type;
-          default = { };
-          example = literalExample ''
-            {
-              "suggest.noselect" = true;
-              "suggest.enablePreview" = true;
-              "suggest.enablePreselect" = false;
-              "suggest.disableKind" = true;
-              languageserver = {
-                haskell = {
-                  command = "haskell-language-server-wrapper";
-                  args = [ "--lsp" ];
-                  rootPatterns = [
-                    "*.cabal"
-                    "stack.yaml"
-                    "cabal.project"
-                    "package.yaml"
-                    "hie.yaml"
-                  ];
-                  filetypes = [ "haskell" "lhaskell" ];
-                };
-              };
-            };
-          '';
-          description = ''
-            Extra configuration lines to add to
-            <filename>$XDG_CONFIG_HOME/nvim/coc-settings.json</filename>
-            See
-            <link xlink:href="https://github.com/neoclide/coc.nvim/wiki/Using-the-configuration-file" />
-            for options.
-          '';
-        };
-      };
    };
  };

@@ -274,8 +226,7 @@ in {
      inherit (cfg)
        extraPython3Packages withPython3 withNodeJs withRuby viAlias vimAlias;
      configure = cfg.configure // moduleConfigure;
-      plugins = cfg.plugins
-        ++ optionals cfg.coc.enable [ pkgs.vimPlugins.coc-nvim ];
+      plugins = cfg.plugins;
      customRC = cfg.extraConfig;
    };

@@ -289,22 +240,13 @@ in {
        configure.customRC -> programs.neovim.extraConfig
    '';

-    programs.neovim.generatedConfigViml = neovimConfig.neovimRcContent;
-
    home.packages = [ cfg.finalPackage ];

-    xdg.configFile."nvim/init.vim" = mkIf (neovimConfig.neovimRcContent != "") {
-      text = neovimConfig.neovimRcContent;
-    };
-    xdg.configFile."nvim/coc-settings.json" = mkIf cfg.coc.enable {
-      source = jsonFormat.generate "coc-settings.json" cfg.coc.settings;
-    };
-
+    xdg.configFile."nvim/init.vim".text = neovimConfig.neovimRcContent;
    programs.neovim.finalPackage = pkgs.wrapNeovimUnstable cfg.package
      (neovimConfig // {
        wrapperArgs = (lib.escapeShellArgs neovimConfig.wrapperArgs) + " "
          + extraMakeWrapperArgs;
-        wrapRc = false;
      });

    programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
@@ -6,6 +6,21 @@ let

  cfg = config.programs.obs-studio;

+  mkPluginEnv = packages:
+    let
+      pluginDirs = map (pkg: "${pkg}/share/obs/obs-plugins") packages;
+      plugins = concatMapStringsSep " " (p: "${p}/*") pluginDirs;
+    in pkgs.runCommand "obs-studio-plugins" {
+      preferLocalBuild = true;
+      allowSubstitutes = false;
+    } ''
+      mkdir $out
+      [[ '${plugins}' ]] || exit 0
+      for plugin in ${plugins}; do
+        ln -s "$plugin" $out/
+      done
+    '';
+
 in {
  meta.maintainers = [ maintainers.adisbladis ];

@@ -22,16 +37,9 @@ in {
        '';
      };

-      finalPackage = mkOption {
-        type = types.package;
-        visible = false;
-        readOnly = true;
-        description = "Resulting customized OBS Studio package.";
-      };
-
      plugins = mkOption {
        default = [ ];
-        example = literalExample "[ pkgs.obs-studio-plugins.wlrobs ]";
+        example = literalExample "[ pkgs.obs-linuxbrowser ]";
        description = "Optional OBS plugins.";
        type = types.listOf types.package;
      };
@@ -39,10 +47,9 @@ in {
  };

  config = mkIf cfg.enable {
-    home.packages = [ cfg.finalPackage ];
-    programs.obs-studio.finalPackage =
-      pkgs.wrapOBS.override { obs-studio = cfg.package; } {
-        plugins = cfg.plugins;
-      };
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."obs-studio/plugins" =
+      mkIf (cfg.plugins != [ ]) { source = mkPluginEnv cfg.plugins; };
  };
 }
@@ -58,8 +58,5 @@ in {
  config = mkIf cfg.enable {
    home.packages = [ cfg.package ];
    home.sessionVariables = cfg.settings;
-
-    xsession.importedVariables = mkIf config.xsession.enable
-      (mapAttrsToList (name: value: name) cfg.settings);
  };
 }
@@ -1,46 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.piston-cli;
-  yamlFormat = pkgs.formats.yaml { };
-in {
-  meta.maintainers = with maintainers; [ ethancedwards8 ];
-
-  options.programs.piston-cli = {
-    enable = mkEnableOption "piston-cli, code runner";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.piston-cli;
-      defaultText = literalExample "pkgs.piston-cli";
-      description = "The piston-cli package to use.";
-    };
-
-    settings = mkOption {
-      type = yamlFormat.type;
-      default = { };
-      example = literalExample ''
-        {
-          theme = "emacs";
-          box_style = "MINIMAL_DOUBLE_HEAD";
-          prompt_continuation = "...";
-          prompt_start = ">>>";
-        }
-      '';
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/piston-cli/config.yml</filename>.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-
-    xdg.configFile."piston-cli/config.yml" = mkIf (cfg.settings != { }) {
-      source = yamlFormat.generate "config.yml" cfg.settings;
-    };
-  };
-}
@@ -32,8 +32,6 @@ let
        ''config.bind("${k}", "${escape [ ''"'' ] c}", mode="${m}")'';
    in concatStringsSep "\n" (mapAttrsToList (formatKeyBinding m) b);

-  formatQuickmarks = n: s: "${n} ${s}";
-
 in {
  options.programs.qutebrowser = {
    enable = mkEnableOption "qutebrowser";
@@ -253,21 +251,6 @@ in {
      '';
    };

-    quickmarks = mkOption {
-      type = types.attrsOf types.str;
-      default = { };
-      description = ''
-        Quickmarks to add to qutebrowser's <filename>quickmarks</filename> file.
-        Note that when Home Manager manages your quickmarks, you cannot edit them at runtime.
-      '';
-      example = literalExample ''
-        {
-          nixpkgs = "https://github.com/NixOS/nixpkgs";
-          home-manager = "https://github.com/nix-community/home-manager";
-        }
-      '';
-    };
-
    extraConfig = mkOption {
      type = types.lines;
      default = "";
@@ -291,44 +274,13 @@ in {
      ++ optional (!cfg.enableDefaultBindings) "c.bindings.default = {}"
      ++ mapAttrsToList formatKeyBindings cfg.keyBindings
      ++ optional (cfg.extraConfig != "") cfg.extraConfig);
-
-    quickmarksFile = optionals (cfg.quickmarks != { }) concatStringsSep "\n"
-      ((mapAttrsToList formatQuickmarks cfg.quickmarks));
  in mkIf cfg.enable {
    home.packages = [ cfg.package ];

    home.file.".qutebrowser/config.py" =
      mkIf pkgs.stdenv.hostPlatform.isDarwin { text = qutebrowserConfig; };

-    home.file.".qutebrowser/quickmarks" =
-      mkIf (cfg.quickmarks != { } && pkgs.stdenv.hostPlatform.isDarwin) {
-        text = quickmarksFile;
-      };
-
    xdg.configFile."qutebrowser/config.py" =
-      mkIf pkgs.stdenv.hostPlatform.isLinux {
-        text = qutebrowserConfig;
-        onChange = ''
-          hash="$(echo -n $USER | md5sum | cut -d' ' -f1)"
-          socket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/qutebrowser/ipc-$hash"
-          if [ -S $socket ]; then
-            echo "Reloading qutebrowser"
-            command=${
-              escapeShellArg (builtins.toJSON {
-                args = [ ":config-source" ];
-                target_arg = null;
-                protocol_version = 1;
-              })
-            }
-            $DRY_RUN_CMD echo $command | ${pkgs.socat}/bin/socat -lf /dev/null - UNIX-CONNECT:$socket
-          fi
-          unset hash socket command
-        '';
-      };
-
-    xdg.configFile."qutebrowser/quickmarks" =
-      mkIf (cfg.quickmarks != { } && pkgs.stdenv.hostPlatform.isLinux) {
-        text = quickmarksFile;
-      };
+      mkIf pkgs.stdenv.hostPlatform.isLinux { text = qutebrowserConfig; };
  };
 }
@@ -1,116 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.programs.rbw;
-
-  jsonFormat = pkgs.formats.json { };
-
-  inherit (pkgs.stdenv.hostPlatform) isDarwin;
-
-  settingsModule = with lib;
-    types.submodule {
-      freeformType = jsonFormat.type;
-      options = {
-        email = mkOption {
-          type = types.str;
-          example = "name@example.com";
-          description = "The email address for your bitwarden account.";
-        };
-
-        base_url = mkOption {
-          type = with types; nullOr str;
-          default = null;
-          example = "bitwarden.example.com";
-          description =
-            "The base-url for a self-hosted bitwarden installation.";
-        };
-
-        identity_url = mkOption {
-          type = with types; nullOr str;
-          default = null;
-          example = "identity.example.com";
-          description = "The identity url for your bitwarden installation.";
-        };
-
-        lock_timeout = mkOption {
-          type = types.ints.unsigned;
-          default = 3600;
-          example = 300;
-          description = ''
-            The amount of time that your login information should be cached.
-          '';
-        };
-
-        pinentry = mkOption {
-          type = with types; either package (enum pkgs.pinentry.flavors);
-          example = "gnome3";
-          default = "gtk2";
-          description = ''
-            Which pinentry interface to use. Beware that
-            <literal>pinentry-gnome3</literal> may not work on non-Gnome
-            systems. You can fix it by adding the following to your
-            system configuration:
-            <programlisting language="nix">
-            services.dbus.packages = [ pkgs.gcr ];
-            </programlisting>
-            For this reason, the default is <literal>gtk2</literal> for
-            now.
-          '';
-          # we want the program in the config
-          apply = val:
-            if builtins.isString val then
-              "${pkgs.pinentry.${val}}/bin/pinentry"
-            else
-              "${val}/${val.binaryPath or "bin/pinentry"}";
-        };
-      };
-    };
-in {
-  meta.maintainers = with lib.hm.maintainers; [ ambroisie ];
-
-  options.programs.rbw = with lib; {
-    enable = mkEnableOption "rwb, a CLI Bitwarden client";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.rbw;
-      defaultText = literalExample "pkgs.rbw";
-      description = ''
-        Package providing the <command>rbw</command> tool and its
-        <command>rbw-agent</command> daemon.
-      '';
-    };
-
-    settings = mkOption {
-      type = types.nullOr settingsModule;
-      default = null;
-      example = literalExample ''
-        {
-          email = "name@example.com";
-          lock_timeout = 300;
-          pinentry = "gnome3";
-        }
-      '';
-      description = ''
-        rbw configuration, if not defined the configuration will not be
-        managed by Home Manager.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
-      home.packages = [ cfg.package ];
-    }
-
-    # Only manage configuration if not empty
-    (lib.mkIf (cfg.settings != null && !isDarwin) {
-      xdg.configFile."rbw/config.json".source =
-        jsonFormat.generate "rbw-config.json" cfg.settings;
-    })
-
-    (lib.mkIf (cfg.settings != null && isDarwin) {
-      home.file."Library/Application Support/rbw/config.json".source =
-        jsonFormat.generate "rbw-config.json" cfg.settings;
-    })
-  ]);
-}
@@ -207,15 +207,6 @@ in {
      '';
    };

-    plugins = mkOption {
-      default = [ ];
-      type = types.listOf types.package;
-      description = ''
-        List of rofi plugins to be installed.
-      '';
-      example = literalExample "[ pkgs.rofi-calc ]";
-    };
-
    width = mkOption {
      default = null;
      type = types.nullOr types.int;
@@ -402,29 +393,19 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "programs.rofi" pkgs platforms.linux)
-      {
-        assertion = cfg.theme == null || cfg.colors == null;
-        message = ''
-          Cannot use the rofi options 'theme' and 'colors' simultaneously.
-        '';
-      }
-    ];
+    assertions = [{
+      assertion = cfg.theme == null || cfg.colors == null;
+      message = ''
+        Cannot use the rofi options 'theme' and 'colors' simultaneously.
+      '';
+    }];

    lib.formats.rasi.mkLiteral = value: {
      _type = "literal";
      inherit value;
    };

-    home.packages = let
-      rofiWithPlugins = cfg.package.override
-        (old: rec { plugins = (old.plugins or [ ]) ++ cfg.plugins; });
-      rofiPackage = if builtins.hasAttr "override" cfg.package then
-        rofiWithPlugins
-      else
-        cfg.package;
-    in [ rofiPackage ];
+    home.packages = [ cfg.package ];

    home.file."${cfg.configPath}".text = toRasi {
      configuration = ({
@@ -1,73 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.senpai;
-  cfgFmt = pkgs.formats.yaml { };
-in {
-  options.programs.senpai = {
-    enable = mkEnableOption "senpai";
-    package = mkOption {
-      type = types.package;
-      default = pkgs.senpai;
-      defaultText = literalExample "pkgs.senpai";
-      description = "The <literal>senpai</literal> package to use.";
-    };
-    config = mkOption {
-      type = types.submodule {
-        freeformType = cfgFmt.type;
-        options = {
-          addr = mkOption {
-            type = types.str;
-            description = ''
-              The address (host[:port]) of the IRC server. senpai uses TLS
-              connections by default unless you specify no-tls option. TLS
-              connections default to port 6697, plain-text use port 6667.
-            '';
-          };
-          nick = mkOption {
-            type = types.str;
-            description = ''
-              Your nickname, sent with a NICK IRC message. It mustn't contain
-              spaces or colons (:).
-            '';
-          };
-          password = mkOption {
-            type = types.nullOr types.str;
-            default = null;
-            description = ''
-              Your password, used for SASL authentication. Note that it will
-              reside world-readable in the Nix store.
-            '';
-          };
-          no-tls = mkOption {
-            type = types.bool;
-            default = false;
-            description = "Disables TLS encryption.";
-          };
-        };
-      };
-      example = literalExample ''
-        {
-          addr = "libera.chat:6697";
-          nick = "nicholas";
-          password = "verysecurepassword";
-        }
-      '';
-      description = ''
-        Configuration for senpai. For a complete list of options, see
-        <citerefentry><refentrytitle>senpai</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry>.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-    xdg.configFile."senpai/senpai.yaml".source =
-      cfgFmt.generate "senpai.yaml" cfg.config;
-  };
-
-  meta.maintainers = [ hm.maintainers.malvo ];
-}
@@ -1,128 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.sm64ex;
-
-  # This is required for tests, we cannot overwrite the dummy package.
-  package = if cfg.region == null && cfg.baserom == null
-  && cfg.extraCompileFlags == null then
-    cfg.package
-
-  else
-    cfg.package.override (attrs:
-      { } // optionalAttrs (cfg.region != null) { region = cfg.region; }
-      // optionalAttrs (cfg.baserom != null) { baseRom = cfg.baserom; }
-      // optionalAttrs (cfg.extraCompileFlags != null) {
-        compileFlags = cfg.extraCompileFlags;
-      });
-
-  mkConfig = key: value:
-    let
-      generatedValue = if isBool value then
-        (if value then "true" else "false")
-      else if isList value then
-        concatStringsSep " " value
-      else
-        toString value;
-    in "${key} ${generatedValue}";
-
-in {
-  meta.maintainers = [ maintainers.ivar ];
-
-  options.programs.sm64ex = {
-    enable = mkEnableOption "sm64ex";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.sm64ex;
-      description = "The sm64ex package to use.";
-    };
-
-    region = mkOption {
-      type = types.nullOr (types.enum [ "us" "eu" "jp" ]);
-      default = null;
-      defaultText =
-        literalExample "us"; # This is set both in nixpkgs and upstream
-      description = ''
-        Your baserom's region. Note that only "us", "eu", and "jp" are supported.
-      '';
-      example = literalExample "jp";
-    };
-
-    baserom = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description =
-        "The path to the Super Mario 64 baserom to extract assets from.";
-      example = literalExample "/home/foo/baserom.us.z64";
-    };
-
-    extraCompileFlags = mkOption {
-      type = with types; nullOr (listOf str);
-      default = null;
-      description = ''
-        Extra flags to pass to the compiler. See
-        <link xlink:href="https://github.com/sm64pc/sm64ex/wiki/Build-options"/>
-        for more information.
-      '';
-      example = literalExample ''
-        [
-          "BETTERCAMERA=1"
-          "NODRAWINGDISTANCE=1"
-        ];
-      '';
-    };
-
-    settings = mkOption {
-      type = with types;
-        nullOr (attrsOf (either str (either int (either bool (listOf str)))));
-      default = null;
-      description =
-        "Settings for sm64ex's <filename>~/.local/share/sm64pc/sm64config.txt</filename> file.";
-      example = literalExample ''
-        {
-          fullscreen = false;
-          window_x = 0;
-          window_y = 0;
-          window_w = 1920;
-          window_h = 1080;
-          vsync = 1;
-          texture_filtering = 1;
-          master_volume = 127;
-          music_volume = 127;
-          sfx_volume = 127;
-          env_volume = 127;
-          key_a = [ "0026" "1000" "1103" ];
-          key_b = [ "0033" "1002" "1101" ];
-          key_start = [ "0039" "1006" "ffff" ];
-          key_l = [ "0034" "1007" "1104" ];
-          key_r = [ "0036" "100a" "1105" ];
-          key_z = [ "0025" "1009" "1102" ];
-          key_cup = [ "100b" "ffff" "ffff" ];
-          key_cdown = [ "100c" "ffff" "ffff" ];
-          key_cleft = [ "100d" "ffff" "ffff" ];
-          key_cright = [ "100e" "ffff" "ffff" ];
-          key_stickup = [ "0011" "ffff" "ffff" ];
-          key_stickdown = [ "001f" "ffff" "ffff" ];
-          key_stickleft = [ "001e" "ffff" "ffff" ];
-          key_stickright = [ "0020" "ffff" "ffff" ];
-          stick_deadzone = 16;
-          rumble_strength = 10;
-          skip_intro = 1;
-        };
-      '';
-    };
-  };
-
-  config = let
-    configFile = optionals (cfg.settings != null)
-      (concatStringsSep "\n" ((mapAttrsToList mkConfig cfg.settings)));
-  in mkIf cfg.enable {
-    home.packages = [ package ];
-
-    xdg.dataFile."sm64pc/sm64config.txt" =
-      mkIf (cfg.settings != null) { text = configFile; };
-  };
-}
@@ -1,75 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.programs.terminator;
-
-  toValue = val:
-    if val == null then
-      "None"
-    else if val == true then
-      "True"
-    else if val == false then
-      "False"
-    else
-      ''"${toString val}"'';
-
-  toConfigObject = let
-    toKey = depth: key:
-      if depth == 0 then key else toKey (depth - 1) "[${key}]";
-    toConfigObjectLevel = depth: obj:
-      flatten (mapAttrsToList (key: val:
-        if isAttrs val then
-          [ (toKey depth key) ] ++ toConfigObjectLevel (depth + 1) val
-        else
-          [ "${key} = ${toValue val}" ]) obj);
-  in obj: concatStringsSep "\n" (toConfigObjectLevel 1 obj);
-
-in {
-  meta.maintainers = [ maintainers.chisui ];
-
-  options.programs.terminator = {
-    enable = mkEnableOption "terminator, a tiling terminal emulator";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.terminator;
-      example = literalExample "pkgs.terminator";
-      description = "terminator package to install.";
-    };
-
-    config = mkOption {
-      default = { };
-      description = ''
-        configuration for terminator.
-        </para><para>
-        For a list of all possible options refer to the
-        <citerefentry>
-          <refentrytitle>terminator_config</refentrytitle>
-          <manvolnum>5</manvolnum>
-        </citerefentry>
-        man page.
-      '';
-      type = types.attrsOf types.anything;
-      example = literalExample ''
-        {
-          global_config.borderless = true;
-          profiles.default.background_color = "#002b36";
-        }
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "programs.terminator" pkgs platforms.linux)
-    ];
-
-    home.packages = [ cfg.package ];
-
-    xdg.configFile."terminator/config" =
-      mkIf (cfg.config != { }) { text = toConfigObject cfg.config; };
-  };
-}
@@ -353,26 +353,16 @@ in {
    in allWarnings;

  in mkIf cfg.enable (mkMerge [
-    {
-      assertions = [
-        (lib.hm.assertions.assertPlatform "programs.waybar" pkgs
-          lib.platforms.linux)
-      ];
-
-      home.packages = [ cfg.package ];
-    }
-
+    { home.packages = [ cfg.package ]; }
    (mkIf (cfg.settings != [ ]) {
      # Generate warnings about defined but unreferenced modules
      inherit warnings;

      xdg.configFile."waybar/config".source = configSource;
    })
-
    (mkIf (cfg.style != null) {
      xdg.configFile."waybar/style.css".text = cfg.style;
    })
-
    (mkIf cfg.systemd.enable {
      systemd.user.services.waybar = {
        Unit = {
@@ -1,59 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.programs.xmobar;
-in {
-  options.programs.xmobar = {
-    enable = mkEnableOption "Xmobar, a minimalistic status bar";
-
-    package = mkOption {
-      default = pkgs.haskellPackages.xmobar;
-      defaultText = literalExample "pkgs.haskellPackages.xmobar";
-      type = types.package;
-      description = ''
-        Package providing the <command>xmobar</command> binary.
-      '';
-    };
-
-    extraConfig = mkOption {
-      default = "";
-      example = literalExample ''
-        Config
-          { font        = "Fira Code"
-          , borderColor = "#d0d0d0"
-          , border      = FullB
-          , borderWidth = 3
-          , bgColor     = "#222"
-          , fgColor     = "grey"
-          , position    = TopSize C 99 30
-          , commands    =
-              [ Run Cpu ["-t", "cpu: <fc=#4eb4fa><bar> <total>%</fc>"] 10
-              , Run Network "enp3s0" ["-S", "True", "-t", "eth: <fc=#4eb4fa><rx></fc>/<fc=#4eb4fa><tx></fc>"] 10
-              , Run Memory ["-t","mem: <fc=#4eb4fa><usedbar> <usedratio>%</fc>"] 10
-              , Run Date "date: <fc=#4eb4fa>%a %d %b %Y %H:%M:%S </fc>" "date" 10
-              , Run StdinReader
-              ]
-          , sepChar     = "%"
-          , alignSep    = "}{"
-          , template    = "  %StdinReader% | %cpu% | %memory% | %enp3s0%  }{%date%  "
-          }
-      '';
-      type = types.lines;
-      description = ''
-        Extra configuration lines to add to
-        <filename>$XDG_CONFIG_HOME/xmobar/.xmobarrc</filename>.
-        See
-        <link xlink:href="https://xmobar.org/#configuration" />
-        for options.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-    xdg.configFile."xmobar/.xmobarrc".text = cfg.extraConfig;
-  };
-
-  meta.maintainers = with maintainers; [ t4ccer ];
-}
@@ -290,11 +290,6 @@ in
        description = "Enable zsh autosuggestions";
      };

-      enableSyntaxHighlighting = mkOption {
-        default = false;
-        description = "Enable zsh syntax highlighting";
-      };
-
      history = mkOption {
        type = historyModule;
        default = {};
@@ -487,10 +482,6 @@ in
          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
        }

-        ${optionalString cfg.enableSyntaxHighlighting
-          "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-        }
-
        # Environment variables
        . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
        ${envVarsStr}
@@ -6,12 +6,6 @@ in {

  meta.maintainers = with maintainers; [ kritnich ];

-  imports = [
-    (mkRemovedOptionModule [ "services" "barrier" "client" "tray" ] ''
-      The tray option is non-functional and has been removed.
-    '')
-  ];
-
  options.services.barrier = {

    client = {
@@ -35,6 +29,8 @@ in {
        '';
      };

+      tray = mkEnableOption "the system tray icon" // { default = true; };
+
      enableCrypto = mkEnableOption "crypto (SSL) plugin" // {
        default = true;
      };
@@ -55,11 +51,6 @@ in {
  };

  config = mkIf cfg.client.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.barrier" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.barrierc = {
      Unit = {
        Description = "Barrier Client daemon";
@@ -70,6 +61,7 @@ in {
      Service.ExecStart = with cfg.client;
        toString ([ "${pkgs.barrier}/bin/barrierc" ]
          ++ optional (name != null) "--name ${name}"
+          ++ optional (!tray) "--no-tray"
          ++ optional enableCrypto "--enable-crypto"
          ++ optional enableDragDrop "--enable-drag-drop" ++ extraFlags
          ++ [ server ]);
@@ -14,11 +14,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.caffeine" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.caffeine = {
      Unit = { Description = "caffeine"; };

@@ -98,11 +98,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.cbatticon" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ package ];

    systemd.user.services.cbatticon = {
@@ -21,11 +21,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.clipmenu" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ cfg.package ];

    systemd.user.services.clipmenu = {
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let cfg = config.services.devilspie2;
-in {
-  meta.maintainers = [ maintainers.dawidsowa ];
-
-  options = {
-    services.devilspie2 = {
-      enable = mkEnableOption ''
-        Devilspie2, a window matching utility, allowing the user to
-        perform scripted actions on windows as they are created'';
-
-      config = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Content of file placed in the devilspie2 config directory.
-        '';
-        example = ''
-          if (get_window_class() == "Gnome-terminal") then
-              make_always_on_top();
-          end
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.devilspie2" pkgs
-        lib.platforms.linux)
-    ];
-
-    systemd.user.services.devilspie2 = {
-      Service.ExecStart = "${pkgs.devilspie2}/bin/devilspie2";
-      Unit = {
-        Description = "devilspie2";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-
-    xdg.configFile."devilspie2/config.lua".text = cfg.config;
-  };
-}
@@ -28,11 +28,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.dropbox" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ pkgs.dropbox-cli ];

    systemd.user.services.dropbox = {
@@ -78,15 +78,7 @@ in {
      };

      settings = mkOption {
-        type = types.submodule {
-          freeformType = with types; attrsOf (attrsOf eitherStrBoolIntList);
-          options = {
-            global.icon_path = mkOption {
-              type = types.separatedString ":";
-              description = "Paths where dunst will look for icons.";
-            };
-          };
-        };
+        type = with types; attrsOf (attrsOf eitherStrBoolIntList);
        default = { };
        description = "Configuration written to ~/.config/dunst/dunstrc";
        example = literalExample ''
@@ -146,14 +138,11 @@ in {
          "status"
          "stock"
        ];
-
-        mkPath = { basePath, theme, category }:
-          "${basePath}/share/icons/${theme.name}/${theme.size}/${category}";
-      in concatMapStringsSep ":" mkPath (cartesianProductOfSets {
-        basePath = basePaths;
-        theme = themes;
-        category = categories;
-      });
+      in concatStringsSep ":" (concatMap (theme:
+        concatMap (basePath:
+          map (category:
+            "${basePath}/share/icons/${theme.name}/${theme.size}/${category}")
+          categories) basePaths) themes);

      systemd.user.services.dunst = {
        Unit = {
@@ -53,11 +53,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.dwm-status" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.dwm-status = {
      Unit = {
        Description = "DWM status service";
@@ -9,9 +9,6 @@ let
  emacsBinPath = "${cfg.package}/bin";
  emacsVersion = getVersion cfg.package;

-  clientWMClass =
-    if versionAtLeast emacsVersion "28" then "Emacsd" else "Emacs";
-
  # Adapted from upstream emacs.desktop
  clientDesktopItem = pkgs.writeTextDir "share/applications/emacsclient.desktop"
    (generators.toINI { } {
@@ -27,16 +24,26 @@ let
        GenericName = "Text Editor";
        MimeType =
          "text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;";
-        Categories = "Development;TextEditor;";
-        Keywords = "Text;Editor;";
-        StartupWMClass = clientWMClass;
+        Categories = "Utility;TextEditor;";
+        StartupWMClass = "Emacs";
      };
    });

  # Match the default socket path for the Emacs version so emacsclient continues
-  # to work without wrapping it.
-  socketDir = "%t/emacs";
-  socketPath = "${socketDir}/server";
+  # to work without wrapping it. It might be worthwhile to allow customizing the
+  # socket path, but we would want to wrap emacsclient in the user profile to
+  # connect to the alternative socket by default for Emacs 26, and set
+  # EMACS_SOCKET_NAME for Emacs 27.
+  #
+  # As systemd doesn't perform variable expansion for the ListenStream param, we
+  # would also have to solve the problem of matching the shell path to the path
+  # used in the socket unit, which would likely involve templating. It seems of
+  # little value for the most common use case of one Emacs daemon per user
+  # session.
+  socketPath = if versionAtLeast emacsVersion "27" then
+    "%t/emacs/server"
+  else
+    "%T/emacs%U/server";

 in {
  meta.maintainers = [ maintainers.tadfisher ];
@@ -75,30 +82,24 @@ in {

  config = mkIf cfg.enable (mkMerge [
    {
-      assertions = [
-        (lib.hm.assertions.assertPlatform "services.emacs" pkgs
-          lib.platforms.linux)
-      ];
+      assertions = [{
+        assertion = cfg.socketActivation.enable
+          -> versionAtLeast emacsVersion "26";
+        message = "Socket activation requires Emacs 26 or newer.";
+      }];

      systemd.user.services.emacs = {
        Unit = {
-          Description = "Emacs text editor";
+          Description = "Emacs: the extensible, self-documenting text editor";
          Documentation =
            "info:emacs man:emacs(1) https://gnu.org/software/emacs/";

          # Avoid killing the Emacs session, which may be full of
          # unsaved buffers.
          X-RestartIfChanged = false;
-        } // optionalAttrs (cfg.socketActivation.enable) {
-          # Emacs deletes its socket when shutting down, which systemd doesn't
-          # handle, resulting in a server without a socket.
-          # See https://github.com/nix-community/home-manager/issues/2018
-          RefuseManualStart = true;
        };

        Service = {
-          Type = "notify";
-
          # We wrap ExecStart in a login shell so Emacs starts with the user's
          # environment, most importantly $PATH and $NIX_PROFILES. It may be
          # worth investigating a more targeted approach for user services to
@@ -112,19 +113,10 @@ in {
              optionalString cfg.socketActivation.enable
              "=${escapeShellArg socketPath}"
            }"'';
-
-          # Emacs will exit with status 15 after having received SIGTERM, which
-          # is the default "KillSignal" value systemd uses to stop services.
-          SuccessExitStatus = 15;
-
+          # We use '(kill-emacs 0)' to avoid exiting with a failure code, which
+          # would restart the service immediately.
+          ExecStop = "${emacsBinPath}/emacsclient --eval '(kill-emacs 0)'";
          Restart = "on-failure";
-        } // optionalAttrs (cfg.socketActivation.enable) {
-          # Use read-only directory permissions to prevent emacs from
-          # deleting systemd's socket file before exiting.
-          ExecStartPost =
-            "${pkgs.coreutils}/bin/chmod --changes -w ${socketDir}";
-          ExecStopPost =
-            "${pkgs.coreutils}/bin/chmod --changes +w ${socketDir}";
        };
      } // optionalAttrs (!cfg.socketActivation.enable) {
        Install = { WantedBy = [ "default.target" ]; };
@@ -136,7 +128,7 @@ in {
    (mkIf cfg.socketActivation.enable {
      systemd.user.sockets.emacs = {
        Unit = {
-          Description = "Emacs text editor";
+          Description = "Emacs: the extensible, self-documenting text editor";
          Documentation =
            "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
        };
@@ -45,11 +45,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.etesync-dav" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ cfg.package ];

    systemd.user.services.etesync-dav = {
@@ -13,11 +13,6 @@ in {
  options = { services.flameshot = { enable = mkEnableOption "Flameshot"; }; };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.flameshot" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ package ];

    systemd.user.services.flameshot = {
@@ -37,11 +37,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.fluidsynth" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.fluidsynth = {
      Unit = {
        Description = "FluidSynth Daemon";
@@ -37,11 +37,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.getmail" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.getmail = {
      Unit = { Description = "getmail email fetcher"; };
      Service = { ExecStart = "${pkgs.getmail}/bin/getmail ${configFiles}"; };
@@ -25,11 +25,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.gnome-keyring" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.gnome-keyring = {
      Unit = {
        Description = "GNOME Keyring";
@@ -71,11 +71,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.grobi" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.grobi = {
      Unit = {
        Description = "grobi display auto config daemon";
@@ -59,11 +59,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.hound" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ pkgs.hound ];

    systemd.user.services.hound = {
@@ -77,8 +77,6 @@ in {
            + concatMapStringsSep ", " (a: a.name) badAccounts;
        };
    in [
-      (lib.hm.assertions.assertPlatform "services.imapnotify" pkgs
-        lib.platforms.linux)
      (checkAccounts (a: a.maildir == null) "maildir configuration")
      (checkAccounts (a: a.imap == null) "IMAP configuration")
      (checkAccounts (a: a.passwordCommand == null) "password command")
@@ -104,23 +104,26 @@ let
      };

      exec = mkOption {
-        type = types.nullOr types.str;
-        default = null;
+        type = with types; coercedTo str singleton (listOf str);
+        default = [ ];
        example =
-          "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1";
+          "[ \${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1 ]";
        description = ''
-          Command executed after the profile is succesfully applied.
+          Commands executed after the profile is succesfully applied.
+          Note that if you provide multiple commands, they will be
+          executed asynchronously with no guaranteed ordering.
        '';
      };
    };
  };

  profileStr = name:
-    { outputs, exec, ... }:
-    ''
+    { outputs, exec, ... }: ''
      profile ${name} {
-        ${concatStringsSep "\n  " (map outputStr outputs)}
-    '' + optionalString (exec != null) "  exec ${exec}\n" + ''
+        ${
+          concatStringsSep "\n  "
+          (map outputStr outputs ++ map (cmd: "exec ${cmd}") exec)
+        }
      }
    '';
 in {
@@ -187,10 +190,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.kanshi" pkgs
-        lib.platforms.linux)
-    ];

    xdg.configFile."kanshi/config".text = ''
      ${concatStringsSep "\n" (mapAttrsToList profileStr cfg.profiles)}
@@ -32,11 +32,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.kbfs" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.kbfs = {
      Unit = {
        Description = "Keybase File System";
@@ -10,11 +10,6 @@ in {
  options.services.keybase.enable = mkEnableOption "Keybase";

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.keybase" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ pkgs.keybase ];

    systemd.user.services.keybase = {
@@ -10,11 +10,6 @@ in {
  options.services.keynav = { enable = mkEnableOption "keynav"; };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.keynav" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.keynav = {
      Unit = {
        Description = "keynav";
@@ -61,11 +61,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.lieer" pkgs
-        lib.platforms.linux)
-    ];
-
    programs.lieer.enable = true;
    systemd.user.services = listToAttrs (map serviceUnit syncAccounts);
    systemd.user.timers = listToAttrs (map timerUnit syncAccounts);
@@ -21,11 +21,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.lorri" pkgs
-        lib.platforms.linux)
-    ];
-
    home.packages = [ cfg.package ];

    systemd.user = {
@@ -292,11 +292,7 @@ in {
    optionalString = name: val:
      lib.optionalString (val != null) "${name}=${val}";
  in mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "services.mako" pkgs platforms.linux) ];
-
    home.packages = [ pkgs.mako ];
-
    xdg.configFile."mako/config".text = ''
      ${optionalInteger "max-visible" cfg.maxVisible}
      ${optionalString "sort" cfg.sort}
@@ -76,11 +76,6 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.mbsync" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.mbsync = {
      Unit = { Description = "mbsync mailbox synchronization"; };

@@ -143,10 +143,6 @@ in {
  ###### implementation

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.mpd" pkgs
-        lib.platforms.linux)
-    ];

    systemd.user.services.mpd = {
      Unit = {
@@ -74,15 +74,10 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.mpdris2" pkgs
-        lib.platforms.linux)
-
-      {
-        assertion = config.services.mpd.enable;
-        message = "The mpdris2 module requires 'services.mpd.enable = true'.";
-      }
-    ];
+    assertions = [{
+      assertion = config.services.mpd.enable;
+      message = "The mpdris2 module requires 'services.mpd.enable = true'.";
+    }];

    xdg.configFile."mpDris2/mpDris2.conf".text = toIni mpdris2Conf;

@@ -13,11 +13,6 @@ in {
    "a proxy forwarding Bluetooth MIDI controls via MPRIS2 to control media players";

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.mpris-proxy" pkgs
-        lib.platforms.linux)
-    ];
-
    systemd.user.services.mpris-proxy = {
      Unit = {
        Description =
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]andGitHub	454abeb5a8	ci: bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-07 01:25:15 +00:00
Bart BakkerandGitHub	7329ffc6e9	htop: fix order or header_columns setting (backport) (#2443 ) Backport of !2435 to fix #2426 on release branch.	2021-11-30 09:15:21 -05:00
Robert Helgesson	7efd99ef87	firefox: fix test case (cherry picked from commit `a19f40d39d`)	2021-11-26 10:11:34 +01:00
Robert Helgesson	5721e19975	firefox: fix tests (cherry picked from commit `18461b5dda`)	2021-11-26 10:11:22 +01:00
dependabot[bot]andRobert Helgesson	2a8974098b	ci: bump cachix/install-nix-action from 15 to 16 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v15...v16) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `a28cf79a78`)	2021-11-26 10:10:13 +01:00
dependabot[bot]andGitHub	bcf03fa16a	ci: bump cachix/install-nix-action from 14 to 15 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 14 to 15. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v14...v15) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-11-15 23:33:21 +00:00
Robert Helgesson	4f1f57deca	ci: explicitly set Nix version	2021-11-16 00:22:44 +01:00
Robert Helgesson	ff2bed9dac	ci: update install-nix-action to v14.1 (cherry picked from commit `b5d738b5a3`)	2021-10-18 10:01:08 +02:00
LavaandRobert Helgesson	49695f33aa	xresources: Add path configuration option (#2141 ) * xresources: Add path configuration option This allows the user to move .Xresources somewhere else, which can help with decluttering the home directory. * xresources: Update xresources.path docs * xresources: Fix formatting (cherry picked from commit `dc4337d9fe`)	2021-10-07 10:54:10 +02:00
Naïm FavierandRobert Helgesson	68ec2dd609	xresources: load .Xresources in xsession.initExtra (cherry picked from commit `1e8d0beae4`)	2021-10-07 10:54:02 +02:00
Shamrock LeeandRobert Helgesson	382505714d	java: add module (cherry picked from commit `a4a8307897`)	2021-10-03 22:03:30 +02:00
Faye DuxovniandRobert Helgesson	0e58ffec58	kanshi: allow multiple exec statements per profile kanshi configurations can have more than one exec statement in a profile. This change allows services.kanshi.profiles.<name>.exec to be a list of strings rather than a single string. (cherry picked from commit `095f3e32ae`)	2021-10-03 18:25:35 +02:00
dependabot[bot]andRobert Helgesson	7d9ba15214	ci: bump cachix/install-nix-action from 13 to 14 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `5199bc841a`)	2021-09-14 00:53:31 +02:00
crazymanjinn GitHub bb010g	f5adb9be82	zsh: add `completionInit` option (#2046 ) (#2296 ) Factored out from original .zshrc construction. (cherry picked from commit `42847469b3`) Co-authored-by: bb010g <me@bb010g.com>	2021-08-27 10:57:07 -04:00
Connor PrussinandGitHub	9f2b766d0f	[nixos] Fix race condition with user units (#2286 ) (#2287 ) One of the things managed by the `home-manager-<username>` unit is the systemd user directory `.config/systemd/user`. However, this directory needs to be in place completely before systemd user sessions start up or the user sessions will come up with an incomplete listing of enabled units, etc. There was a race condition where nothing prevented `systemd-user-sessions.service` from starting ahead of the systemd user directory's initialization completing. This commit makes `home-manager-<username>` finishes _before_ we start `systemd-user-sessions.service` to avoid such race condition. This issue was probably not all that noticeable in most cases, but when using a non-persistent root config (i.e. tmp on / or https://grahamc.com/blog/erase-your-darlings) the race condition triggering causes all kinds of issues on each reboot.	2021-08-21 23:51:31 -04:00
Colin SummersandRobert Helgesson	b39647e52e	brave: fix config dir path (#2173 ) Changes install path for extensions from `~/.config/brave` to `~/.config/BraveSoftware/Brave-Browser` on Linux. (cherry picked from commit `9e3c402972`)	2021-07-30 14:55:12 +02:00
Bjørn ForsmanandRobert Helgesson	9c0abed522	taskwarrior: don't create dataLocation with home.file With programs.taskwarrior.dataLocation = /absolute/path (outside of $HOME) the current implementation wrongly creates $HOME/absolute/path (due to how home.file is implemented). Since taskwarrior creates the dataLocation automatically on first run, there is actually no need for HM to create that directory. Additional benefit, the .keep symlink that HM creates as a side-effect no longer appears in the taskwarrior data directory. Fixes #2207. (cherry picked from commit `6c984bd675`)	2021-07-24 22:27:24 +02:00
Naïm FavierandRobert Helgesson	03db229cc2	setxkbmap: reset options before setting new ones (#2160 ) (cherry picked from commit `4971b9cad0`)	2021-07-24 22:26:43 +02:00
KidandRobert Helgesson	88de11327c	README: fix outdated description (#2131 ) * README: fix outdated description (cherry picked from commit `04955ca970`)	2021-07-24 22:25:29 +02:00
Josh HollandandRobert Helgesson	35a24648d1	direnv: add enableFlakes option for enableNixDirenvIntegration (#2089 ) NixOS/nixpkgs@03310df843 disabled flake support by default, so we now need to build a custom package and use it if the user wants to `use flake` successfully. This should fix #2087. (cherry picked from commit `e0f2949c98`)	2021-06-21 00:35:57 +02:00
Naïm FavierandRobert Helgesson	d370447e28	nixos: set stopIfChanged to false (#2105 ) There is no ExecStop so we can just restart the service. (cherry picked from commit `4ed6705b0f`)	2021-06-21 00:35:14 +02:00
puzzlewolfandRobert Helgesson	2bfad60b73	etesync-dav: fix typo (#2067 ) Upstream (https://github.com/etesync/etesync-dav/blob/master/README.md#configuration-and-running) uses 37358 as default port. (cherry picked from commit `e9ed9c2e11`)	2021-06-21 00:32:23 +02:00
bb010gandRobert Helgesson	8d64c164fc	home-manager: pass on `--debug` option (#2049 ) * man-home-manager: remove trailing whitespace * home-manager: pass on `--debug` option (cherry picked from commit `5eb199e937`)	2021-06-21 00:32:22 +02:00
Naïm FavierandRobert Helgesson	ffd6c84c25	dunst: add the whole package to home.packages (#2079 ) The `dunst` package provides the `dunstctl` and `dunstify` command-line utilities which are useful to have. (cherry picked from commit `dba802c1d9`)	2021-06-21 00:32:21 +02:00
Robert Helgesson	d40f84a340	ci: run tests against nixos-21.05	2021-06-21 00:21:09 +02:00
Robert Helgesson	148d85ee83	docs: mark 21.05 as stable version (cherry picked from commit `5c1415d67f`)	2021-06-05 20:31:59 +02:00
Dusk BanksandRobert Helgesson	fd5fbb0a24	texlive: add `packageSet` option (cherry picked from commit `45f9cb06a9`)	2021-06-04 08:48:46 +02:00
Dusk BanksandRobert Helgesson	0ff5951285	texlive: "Texlive" -> "TeX Live" (cherry picked from commit `c12d53dd7c`)	2021-06-04 08:48:45 +02:00
Robert Helgesson	b8edffb918	Replace references to pkgs.gnome3 by pkgs.gnome (cherry picked from commit `d3cdabb5c9`)	2021-06-04 08:48:44 +02:00
Robert Helgesson	cd33531e59	docs: minor additional issue template update (cherry picked from commit `9e253a8c30`)	2021-06-04 08:48:18 +02:00
Robert Helgesson	8c72c4f981	docs: update issue template Most importantly change chat contact information. (cherry picked from commit `5573c10ea4`)	2021-06-04 08:48:17 +02:00
bb010gandRobert Helgesson	bfb65f2d8d	jq: add `package` option (cherry picked from commit `0e329cee4c`)	2021-06-04 08:48:16 +02:00
Robert Helgesson	913f722560	files: remove assertion on recursive onChange See discussion in https://github.com/nix-community/home-manager/pull/2031 (cherry picked from commit `d2aaeac42c`)	2021-06-04 08:48:15 +02:00
Robert Helgesson	2f997178fa	files: fix use of onChange with directory source Previously, the comparison would not handle directory comparison correctly, always finding that the source and target differed. This would trigger the `onChange` script on each activation. Fixes #2004 (cherry picked from commit `07ad6a4f76`)	2021-06-04 08:48:14 +02:00
Bart BakkerandGitHub	ffd4d9955b	htop: fix preserving the order of meters (#2068 ) (backport) Pass meters for formatting in a list of attrsets so that ordering can be preserved. In addition provide some mode-specific functions to create these attrsets, to make for a bit nicer config. This fixes #2060 on 21.05.	2021-06-03 22:29:06 -04:00