From c80859770ef9553fdd2f8c5e50f2a10716ff2fa6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 10 Dec 2019 18:23:23 +0100
Subject: [PATCH] nixos-option: Update completion

`nixpkgs` has a new `nixos-option` implementation!

* Use `.config` for completion to ensure submodules are completed
  properly.
* Update option set.
---
 _nixos-option | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/_nixos-option b/_nixos-option
index e351d05..0b44ca4 100644
--- a/_nixos-option
+++ b/_nixos-option
@@ -9,11 +9,9 @@ _nixos-option-opts() {
     fi
     local options='
       with import <nixpkgs/lib>;
-      filterAttrsRecursive
-        (k: _: substring 0 1 k != "_")
-        (evalModules {
-          modules = import <nixpkgs/nixos/modules/module-list.nix> ++ [ '"$mods"' ];
-        }).options
+      (evalModules {
+        modules = import <nixpkgs/nixos/modules/module-list.nix> ++ [ '"$mods"' ];
+      }).config
     '
 
     _nix_attr_paths $options
@@ -21,5 +19,5 @@ _nixos-option-opts() {
 
 _arguments \
     $__nix_search_path_args \
-    '--xml[Render as XML]' \
+    '--all[Print the values of all options.]' \
     ':NixOS module options:_nixos-option-opts'