diff --git a/options.xhtml b/options.xhtml index 2afc4a322..ec89da195 100644 --- a/options.xhtml +++ b/options.xhtml @@ -2965,11 +2965,13 @@ explanation about possible values.

attribute set of string

Default:

{
-  command = "'\${pkgs.notmuch}/bin/notmuch address --format=json --output=recipients  date:6M..'";
-  regexp = "'\\[?{\"name\": \"(?P<name>.*)\", \"address\": \"(?P<email>.+)\", \"name-addr\": \".*\"}[,\\]]?'";
-  shellcommand_external_filtering = "False";
   type = "shellcommand";
+  command = "'${pkgs.notmuch}/bin/notmuch address --format=json --output=recipients  date:6M..'";
+  regexp =
+  "'\\[?{" + ''"name": "(?P<name>.*)", "address": "(?P<email>.+)", "name-addr": ".*"'' + "}[,\\]]?'";
+  shellcommand_external_filtering = "False";
 }
+
 

Example:

{
@@ -50336,7 +50338,7 @@ boolean

string

Default: -"\${pkgs.xdg-utils}/bin/xdg-open"

+${pkgs.xdg-utils}/bin/xdg-open

Declared by:

@@ -84135,8 +84137,9 @@ list of string

Type: absolute path

-

Default: -"\${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"

+

Default:

"${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2";
+
+

Declared by:

@@ -100850,7 +100853,7 @@ attribute set

{ }

Example: -{ main.activation_command = "\${pkgs.hello}/bin/hello"; }

+{ main.activation_command = "${pkgs.hello}/bin/hello"; }

Declared by:

@@ -101997,13 +102000,14 @@ for a list of available options.

attribute set of (string or list of string)

Default:

{
+  repeat = "watch";
+  sshcmd = "${pkgs.openssh}/bin/ssh";
+  ui = "text";
   auto = "true";
   batch = "true";
-  log = "false";
-  repeat = "watch";
-  sshcmd = "\${pkgs.openssh}/bin/ssh";
-  ui = "text";
+  log = "false"; # don't log to file, handled by systemd
 }
+
 

Declared by:

@@ -108679,13 +108683,6 @@ null or (submodule)

-

Example:

{
-  background = "#5f676a";
-  border = "#333333";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -108711,9 +108708,6 @@ null or string

-

Example: -"#000000"

-

Declared by:

@@ -108739,13 +108733,6 @@ null or (submodule)

-

Example:

{
-  background = "#900000";
-  border = "#2f343a";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -108852,13 +108839,6 @@ null or (submodule)

-

Example:

{
-  background = "#285577";
-  border = "#4c7899";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -108885,13 +108865,6 @@ null or (submodule)

-

Example:

{
-  background = "#222222";
-  border = "#333333";
-  text = "#888888";
-}
-
-

Declared by:

@@ -108917,9 +108890,6 @@ null or string

-

Example: -"#666666"

-

Declared by:

@@ -108945,9 +108915,6 @@ null or string

-

Example: -"#ffffff"

-

Declared by:

@@ -108974,13 +108941,6 @@ null or (submodule)

-

Example:

{
-  background = "#900000";
-  border = "#2f343a";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -109003,7 +108963,7 @@ null or (submodule)

string

Default: -"i3bar"

+i3bar

Example: "\${pkgs.waybar}/bin/waybar"

@@ -109089,9 +109049,6 @@ null or one of “hide”, “show”

-

Example: -"hide"

-

Declared by:

@@ -109143,9 +109100,6 @@ null or one of “dock”, “hide”, “invisible”

-

Example: -"dock"

-

Declared by:

@@ -109171,9 +109125,6 @@ null or one of “top”, “bottom”

-

Example: -"bottom"

-

Declared by:

@@ -109199,9 +109150,6 @@ null or string

-

Example: -"\${pkgs.i3status}/bin/i3status"

-

Declared by:

@@ -109227,9 +109175,6 @@ null or string

-

Example: -"*"

-

Declared by:

@@ -109256,9 +109201,6 @@ null or signed integer

-

Example: -null

-

Declared by:

@@ -109284,9 +109226,6 @@ null or boolean

-

Example: -true

-

Declared by:

@@ -109312,9 +109251,6 @@ null or boolean

-

Example: -true

-

Declared by:

@@ -110395,9 +110331,9 @@ attribute set of (null or string)

Example:

let
   modifier = config.wayland.windowManager.sway.config.modifier;
 in lib.mkOptionDefault {
-  "${modifier}+Return" = "exec ${pkgs.foot}/bin/foot";
+  "${modifier}+Return" = "exec ${cfg.config.terminal}";
   "${modifier}+Shift+q" = "kill";
-  "${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --";
+  "${modifier}+d" = "exec ${cfg.config.menu}";
 }
 
 
@@ -110478,7 +110414,7 @@ string

string

Default: -"\${pkgs.dmenu}/bin/dmenu_path | \${pkgs.dmenu}/bin/dmenu | \${pkgs.findutils}/bin/xargs swaymsg exec --"

+${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --

Example: "bemenu-run"

@@ -110738,7 +110674,7 @@ string

string

Default: -"\${pkgs.foot}/bin/foot"

+${pkgs.foot}/bin/foot

Example: "alacritty"

@@ -116269,13 +116205,6 @@ null or (submodule)

-

Example:

{
-  background = "#5f676a";
-  border = "#333333";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -116301,9 +116230,6 @@ null or string

-

Example: -"#000000"

-

Declared by:

@@ -116329,13 +116255,6 @@ null or (submodule)

-

Example:

{
-  background = "#900000";
-  border = "#2f343a";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -116442,13 +116361,6 @@ null or (submodule)

-

Example:

{
-  background = "#285577";
-  border = "#4c7899";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -116475,13 +116387,6 @@ null or (submodule)

-

Example:

{
-  background = "#222222";
-  border = "#333333";
-  text = "#888888";
-}
-
-

Declared by:

@@ -116507,9 +116412,6 @@ null or string

-

Example: -"#666666"

-

Declared by:

@@ -116535,9 +116437,6 @@ null or string

-

Example: -"#ffffff"

-

Declared by:

@@ -116564,13 +116463,6 @@ null or (submodule)

-

Example:

{
-  background = "#900000";
-  border = "#2f343a";
-  text = "#ffffff";
-}
-
-

Declared by:

@@ -116593,7 +116485,7 @@ null or (submodule)

string

Default: -"i3bar"

+i3bar

Example: "\${pkgs.i3}/bin/i3bar -t"

@@ -116679,9 +116571,6 @@ null or one of “hide”, “show”

-

Example: -"hide"

-

Declared by:

@@ -116733,9 +116622,6 @@ null or one of “dock”, “hide”, “invisible”

-

Example: -"dock"

-

Declared by:

@@ -116761,9 +116647,6 @@ null or one of “top”, “bottom”

-

Example: -"bottom"

-

Declared by:

@@ -116789,9 +116672,6 @@ null or string

-

Example: -"\${pkgs.i3status}/bin/i3status"

-

Declared by:

@@ -116817,9 +116697,6 @@ null or string

-

Example: -"primary"

-

Declared by:

@@ -116846,9 +116723,6 @@ null or signed integer

-

Example: -null

-

Declared by:

@@ -116874,9 +116748,6 @@ null or boolean

-

Example: -true

-

Declared by:

@@ -116902,9 +116773,6 @@ null or boolean

-

Example: -true

-

Declared by:

@@ -117834,7 +117702,7 @@ attribute set of (null or string)

string

Default: -"\${pkgs.dmenu}/bin/dmenu_run"

+${pkgs.dmenu}/bin/dmenu_run

Example: "bemenu-run"