sp-modules: refactor options types

sp-modules/bitwarden/module.nix

@@ -8,11 +8,10 @@ in
   options.selfprivacy.modules.bitwarden = {
     enable = lib.mkOption {
       default = false;
-      type = with lib.types; nullOr bool;
+      type = lib.types.bool;
     };
     location = lib.mkOption {
-      default = "sda1";
-      type = with lib.types; nullOr str;
+      type = lib.types.str;
     };
   };
 

sp-modules/gitea/module.nix

@@ -10,11 +10,10 @@ in
   options.selfprivacy.modules.gitea = {
     enable = lib.mkOption {
       default = false;
-      type = with lib.types; nullOr bool;
+      type = lib.types.bool;
     };
     location = lib.mkOption {
-      default = "sda1";
-      type = with lib.types; nullOr str;
+      type = lib.types.str;
     };
   };
 

sp-modules/jitsi-meet/module.nix

@@ -6,7 +6,7 @@ in
   options.selfprivacy.modules.jitsi-meet = {
     enable = lib.mkOption {
       default = false;
-      type = with lib.types; nullOr bool;
+      type = lib.types.bool;
     };
   };
 

sp-modules/nextcloud/module.nix

@@ -2,12 +2,11 @@
 {
   options.selfprivacy.modules.nextcloud = with lib; {
     enable = mkOption {
-      type = types.nullOr types.bool;
+      type = types.bool;
       default = false;
     };
     location = mkOption {
-      type = types.nullOr types.str;
-      default = "sda1";
+      type = types.str;
     };
   };
 

sp-modules/ocserv/module.nix

@@ -8,7 +8,7 @@ in
   options.selfprivacy.modules.ocserv = {
     enable = lib.mkOption {
       default = false;
-      type = with lib; types.nullOr types.bool;
+      type = lib.types.bool;
     };
   };
 

sp-modules/pleroma/module.nix

@@ -7,11 +7,10 @@ in
   options.selfprivacy.modules.pleroma = {
     enable = lib.mkOption {
       default = false;
-      type = with lib; types.nullOr types.bool;
+      type = lib.types.bool;
     };
     location = lib.mkOption {
-      default = "sda1";
-      type = with lib; types.nullOr types.str;
+      type = lib.types.str;
     };
   };
   config = lib.mkIf config.selfprivacy.modules.pleroma.enable {

sp-modules/simple-nixos-mailserver/options.nix

@@ -3,11 +3,10 @@
   options.selfprivacy.modules.simple-nixos-mailserver = {
     enable = lib.mkOption {
       default = false;
-      type = with lib.types; nullOr bool;
+      type = lib.types.bool;
     };
     location = lib.mkOption {
-      default = "sda1";
-      type = with lib.types; nullOr str;
+      type = lib.types.str;
     };
   };
 }