i3: replace use of types.string by types.str

(cherry picked from commit 59a4ac71f9)
This commit is contained in:
Robert Helgesson 2019-01-15 19:46:00 +01:00
parent 4bed99c71c
commit 6c30decf8d
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89

View file

@ -8,7 +8,7 @@ let
commonOptions = { commonOptions = {
fonts = mkOption { fonts = mkOption {
type = types.listOf types.string; type = types.listOf types.str;
default = ["monospace 8"]; default = ["monospace 8"];
description = '' description = ''
Font list used for window titles. Only FreeType fonts are supported. Font list used for window titles. Only FreeType fonts are supported.
@ -21,7 +21,7 @@ let
startupModule = types.submodule { startupModule = types.submodule {
options = { options = {
command = mkOption { command = mkOption {
type = types.string; type = types.str;
description = "Command that will be executed on startup."; description = "Command that will be executed on startup.";
}; };
@ -41,7 +41,7 @@ let
}; };
workspace = mkOption { workspace = mkOption {
type = types.nullOr types.string; type = types.nullOr types.str;
default = null; default = null;
description = '' description = ''
Launch application on a particular workspace. DEPRECATED: Launch application on a particular workspace. DEPRECATED:
@ -55,17 +55,17 @@ let
barColorSetModule = types.submodule { barColorSetModule = types.submodule {
options = { options = {
border = mkOption { border = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
background = mkOption { background = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
text = mkOption { text = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
}; };
@ -74,27 +74,27 @@ let
colorSetModule = types.submodule { colorSetModule = types.submodule {
options = { options = {
border = mkOption { border = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
childBorder = mkOption { childBorder = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
background = mkOption { background = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
text = mkOption { text = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
indicator = mkOption { indicator = mkOption {
type = types.string; type = types.str;
visible = false; visible = false;
}; };
}; };
@ -111,7 +111,7 @@ let
}; };
id = mkOption { id = mkOption {
type = types.nullOr types.string; type = types.nullOr types.str;
default = null; default = null;
description = '' description = ''
Specifies the bar ID for the configured bar instance. Specifies the bar ID for the configured bar instance.
@ -151,7 +151,7 @@ let
}; };
command = mkOption { command = mkOption {
type = types.string; type = types.str;
default = "${cfg.package}/bin/i3bar"; default = "${cfg.package}/bin/i3bar";
defaultText = "i3bar"; defaultText = "i3bar";
description = "Command that will be used to start a bar."; description = "Command that will be used to start a bar.";
@ -159,7 +159,7 @@ let
}; };
statusCommand = mkOption { statusCommand = mkOption {
type = types.string; type = types.str;
default = "${pkgs.i3status}/bin/i3status"; default = "${pkgs.i3status}/bin/i3status";
description = "Command that will be used to get status lines."; description = "Command that will be used to get status lines.";
}; };
@ -168,19 +168,19 @@ let
type = types.submodule { type = types.submodule {
options = { options = {
background = mkOption { background = mkOption {
type = types.string; type = types.str;
default = "#000000"; default = "#000000";
description = "Background color of the bar."; description = "Background color of the bar.";
}; };
statusline = mkOption { statusline = mkOption {
type = types.string; type = types.str;
default = "#ffffff"; default = "#ffffff";
description = "Text color to be used for the statusline."; description = "Text color to be used for the statusline.";
}; };
separator = mkOption { separator = mkOption {
type = types.string; type = types.str;
default = "#666666"; default = "#666666";
description = "Text color to be used for the separator."; description = "Text color to be used for the separator.";
}; };
@ -238,7 +238,7 @@ let
}; };
trayOutput = mkOption { trayOutput = mkOption {
type = types.string; type = types.str;
default = "primary"; default = "primary";
description = "Where to output tray."; description = "Where to output tray.";
}; };
@ -248,7 +248,7 @@ let
windowCommandModule = types.submodule { windowCommandModule = types.submodule {
options = { options = {
command = mkOption { command = mkOption {
type = types.string; type = types.str;
description = "i3wm command to execute."; description = "i3wm command to execute.";
example = "border pixel 1"; example = "border pixel 1";
}; };
@ -505,7 +505,7 @@ let
type = types.submodule { type = types.submodule {
options = { options = {
background = mkOption { background = mkOption {
type = types.string; type = types.str;
default = "#ffffff"; default = "#ffffff";
description = '' description = ''
Background color of the window. Only applications which do not cover Background color of the window. Only applications which do not cover