diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 22:48:27 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-31 18:19:00 +0200 |
| commit | 478e7184f88db1364cc75107036f7c4decc0cc41 (patch) | |
| tree | 5ff3d3a18e3aef9af4333c392a94751333754270 /nixos/modules/programs | |
| parent | 69d58ee24506e2b3b5aff347ae3b0791110340ec (diff) | |
| download | nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.gz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.bz2 nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.lz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.xz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.zst nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.zip | |
nixos/modules: Remove all usages of types.string
And replace them with a more appropriate type Also fix up some minor module problems along the way
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/thefuck.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/xss-lock.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/yabar.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/programs/zsh/zsh-syntax-highlighting.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix index 21ed6603c1bd..b909916158d3 100644 --- a/nixos/modules/programs/thefuck.nix +++ b/nixos/modules/programs/thefuck.nix @@ -17,7 +17,7 @@ in alias = mkOption { default = "fuck"; - type = types.string; + type = types.str; description = '' `thefuck` needs an alias to be configured. diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index 070463311db5..a7ad9b89db4d 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -12,7 +12,7 @@ in lockerCommand = mkOption { default = "${pkgs.i3lock}/bin/i3lock"; example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy''; - type = types.string; + type = types.separatedString " "; description = "Locker to be used with xsslock"; }; diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix index db085211366e..5de9331ac520 100644 --- a/nixos/modules/programs/yabar.nix +++ b/nixos/modules/programs/yabar.nix @@ -76,7 +76,7 @@ in font = mkOption { default = "sans bold 9"; example = "Droid Sans, FontAwesome Bold 9"; - type = types.string; + type = types.str; description = '' The font that will be used to draw the status bar. @@ -95,7 +95,7 @@ in extra = mkOption { default = {}; - type = types.attrsOf types.string; + type = types.attrsOf types.str; description = '' An attribute set which contains further attributes of a bar. @@ -107,7 +107,7 @@ in type = types.attrsOf(types.submodule { options.exec = mkOption { example = "YABAR_DATE"; - type = types.string; + type = types.str; description = '' The type of the indicator to be executed. ''; @@ -125,7 +125,7 @@ in options.extra = mkOption { default = {}; - type = types.attrsOf (types.either types.string types.int); + type = types.attrsOf (types.either types.str types.int); description = '' An attribute set which contains further attributes of a indicator. diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 89087a229eb7..7184e5d9b9a8 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -33,7 +33,7 @@ in patterns = mkOption { default = {}; - type = types.attrsOf types.string; + type = types.attrsOf types.str; example = literalExample '' { @@ -50,7 +50,7 @@ in }; styles = mkOption { default = {}; - type = types.attrsOf types.string; + type = types.attrsOf types.str; example = literalExample '' { |