diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix index f03ab92..43a0c92 100644 --- a/home/modules/firefox.nix +++ b/home/modules/firefox.nix @@ -5,53 +5,25 @@ ... }: with lib; let - cfg = config.local.apps.firefox; + cfg = config.local.apps.browsers; in { - options.local.apps.firefox = { + options.local.apps.browsers = { enable = mkEnableOption "firefox settings"; - + workspace = mkOption { type = types.nullOr types.str; default = null; description = '' - 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 + Workspace in which Firefox should open. If not set, Firefox will not open at startup. ''; }; }; - config = mkIf cfg.enable (mkMerge [ - { - programs.firefox.enable = true; + config = mkIf cfg.enable { + 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}'"; - }; - } - - (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}"; - }) - ]); + xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) { + command = "${lib.getExe pkgs.i3-gaps} 'workspace ${cfg.workspace}; exec ${lib.getExe pkgs.firefox}'"; + }; + }; } diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index 3869944..bca09e9 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -120,6 +120,7 @@ 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 3834d9d..13167d9 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"; #make this an int later + workspace = 1; }; }; diff --git a/sys/platforms/vps/srv/net.nix b/sys/platforms/vps/srv/net.nix index 3d36c01..6a83997 100644 --- a/sys/platforms/vps/srv/net.nix +++ b/sys/platforms/vps/srv/net.nix @@ -52,7 +52,6 @@ in { }; }; }; - fail2ban = { enable = true; bantime = "10m";