From ca38bb4aecd595d32cd525c96da995e7df7171a7 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 31 May 2023 04:27:27 +0000
Subject: [PATCH] refactor: remove deprecated `types.string` uses

---
 hosts/modules/gui/sxmo.nix | 6 +++---
 hosts/modules/nixcache.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/modules/gui/sxmo.nix b/hosts/modules/gui/sxmo.nix
index b03fe31b..92ca0389 100644
--- a/hosts/modules/gui/sxmo.nix
+++ b/hosts/modules/gui/sxmo.nix
@@ -90,7 +90,7 @@ in
     };
     sane.gui.sxmo.terminal = mkOption {
       # type = types.nullOr (types.enum [ "foot" "st" "vte" ]);
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = "foot";
       description = ''
         name of terminal to use for sxmo_terminal.sh.
@@ -99,7 +99,7 @@ in
     };
     sane.gui.sxmo.keyboard = mkOption {
       # type = types.nullOr (types.enum ["wvkbd"])
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = "wvkbd";
       description = ''
         name of on-screen-keyboard to use for sxmo_keyboard.sh.
@@ -108,7 +108,7 @@ in
       '';
     };
     sane.gui.sxmo.settings = mkOption {
-      type = types.attrsOf types.string;
+      type = types.attrsOf types.str;
       default = {};
       description = ''
         environment variables used to configure sxmo.
diff --git a/hosts/modules/nixcache.nix b/hosts/modules/nixcache.nix
index 80122538..3080728d 100644
--- a/hosts/modules/nixcache.nix
+++ b/hosts/modules/nixcache.nix
@@ -26,7 +26,7 @@ in
       type = types.bool;
     };
     sane.nixcache.substituters = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default =
         # TODO: make these blacklisted entries injectable
         (lib.optional (hostName != "servo") "https://nixcache.uninsane.org")