diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix
index 43a0c92..f03ab92 100644
--- a/home/modules/firefox.nix
+++ b/home/modules/firefox.nix
@@ -5,25 +5,53 @@
   ...
 }:
 with lib; let
-  cfg = config.local.apps.browsers;
+  cfg = config.local.apps.firefox;
 in {
-  options.local.apps.browsers = {
+  options.local.apps.firefox = {
     enable = mkEnableOption "firefox settings";
-    
+
     workspace = mkOption {
       type = types.nullOr types.str;
       default = null;
       description = ''
-        Workspace in which Firefox should open. If not set, Firefox will not open at startup.
+        i3 Workspace in which Firefox should open. If not set, Firefox will not open at startup
+      '';
+    };
+
+    makeDefaultBrowser = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Take a guess
       '';
     };
   };
 
-  config = mkIf cfg.enable {
-    programs.firefox.enable = true;
+  config = mkIf cfg.enable (mkMerge [
+    {
+      programs.firefox.enable = true;
 
-    xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) {
-      command = "${lib.getExe pkgs.i3-gaps} 'workspace ${cfg.workspace}; exec ${lib.getExe pkgs.firefox}'";
-    };
-  };
+      xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) {
+        command = "${lib.getExe pkgs.i3-gaps} 'workspace ${cfg.workspace}; exec ${lib.getExe pkgs.firefox}'";
+      };
+    }
+
+    (mkIf cfg.makeDefaultBrowser {
+      xdg = {
+        mimeApps = {
+          enable = true;
+          defaultApplications = {
+            "text/html" = ["firefox"];
+            "text/uri-list" = ["firefox"];
+            "x-scheme-handler/http" = ["firefox"];
+            "x-scheme-handler/https" = ["firefox"];
+            "x-scheme-handler/about" = ["firefox"];
+            "x-scheme-handler/unknown" = ["firefox"];
+          };
+        };
+      };
+
+      home.sessionVariables.DEFAULT_BROWSER = mkIf cfg.makeDefaultBrowser "${lib.getExe pkgs.firefox}";
+    })
+  ]);
 }
diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix
index bca09e9..3869944 100644
--- a/home/modules/gui/default.nix
+++ b/home/modules/gui/default.nix
@@ -120,7 +120,6 @@ in {
           enable = true;
           defaultApplications = {
             "application/pdf" = with pkgs; ["qpdfview"];
-            "text/uri-list" = with pkgs; ["firefox"];
             "x-scheme-handler/file" = with pkgs; ["kitty"];
           };
         };
diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix
index 13167d9..3834d9d 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -43,7 +43,7 @@
       defaultDesktopPack.enable = true;
       firefox = {
         enable = true;
-        workspace = 1;
+        workspace = "1"; #make this an int later
       };
     };
 
diff --git a/sys/platforms/vps/srv/net.nix b/sys/platforms/vps/srv/net.nix
index 6a83997..3d36c01 100644
--- a/sys/platforms/vps/srv/net.nix
+++ b/sys/platforms/vps/srv/net.nix
@@ -52,6 +52,7 @@ in {
         };
       };
     };
+
     fail2ban = {
       enable = true;
       bantime = "10m";