colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: remove deprecated types.string uses

Browse Source
This commit is contained in:
Colin 2023-05-31 04:27:27 +00:00
parent 287817056f
commit ca38bb4aec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/modules/gui/sxmo.nix
View File

@ -90,7 +90,7 @@ in
}; };
sane.gui.sxmo.terminal = mkOption { sane.gui.sxmo.terminal = mkOption {
# type = types.nullOr (types.enum [ "foot" "st" "vte" ]); # type = types.nullOr (types.enum [ "foot" "st" "vte" ]);
type = types.nullOr types.string; type = types.nullOr types.str;
default = "foot"; default = "foot";
description = '' description = ''
name of terminal to use for sxmo_terminal.sh. name of terminal to use for sxmo_terminal.sh.
@ -99,7 +99,7 @@ in
}; };
sane.gui.sxmo.keyboard = mkOption { sane.gui.sxmo.keyboard = mkOption {
# type = types.nullOr (types.enum ["wvkbd"]) # type = types.nullOr (types.enum ["wvkbd"])
type = types.nullOr types.string; type = types.nullOr types.str;
default = "wvkbd"; default = "wvkbd";
description = '' description = ''
name of on-screen-keyboard to use for sxmo_keyboard.sh. name of on-screen-keyboard to use for sxmo_keyboard.sh.
@ -108,7 +108,7 @@ in
''; '';
}; };
sane.gui.sxmo.settings = mkOption { sane.gui.sxmo.settings = mkOption {
type = types.attrsOf types.string; type = types.attrsOf types.str;
default = {}; default = {};
description = '' description = ''
environment variables used to configure sxmo. environment variables used to configure sxmo.

2
hosts/modules/nixcache.nix
View File

@ -26,7 +26,7 @@ in
type = types.bool; type = types.bool;
}; };
sane.nixcache.substituters = mkOption { sane.nixcache.substituters = mkOption {
type = types.listOf types.string; type = types.listOf types.str;
default = default =
# TODO: make these blacklisted entries injectable # TODO: make these blacklisted entries injectable
(lib.optional (hostName != "servo") "https://nixcache.uninsane.org") (lib.optional (hostName != "servo") "https://nixcache.uninsane.org")