Compare commits

..

No commits in common. "6b2163c050a3ea243929d11d7aa6a2ac3cb739e7" and "d7ea1577618966b5f7c85d38802145b495fc1fa8" have entirely different histories.

4 changed files with 12 additions and 40 deletions

View file

@ -5,53 +5,25 @@
... ...
}: }:
with lib; let with lib; let
cfg = config.local.apps.firefox; cfg = config.local.apps.browsers;
in { in {
options.local.apps.firefox = { options.local.apps.browsers = {
enable = mkEnableOption "firefox settings"; enable = mkEnableOption "firefox settings";
workspace = mkOption { workspace = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
description = '' description = ''
i3 Workspace in which Firefox should open. If not set, Firefox will not open at startup 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 (mkMerge [ config = mkIf cfg.enable {
{
programs.firefox.enable = true; programs.firefox.enable = true;
xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) { xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) {
command = "${lib.getExe pkgs.i3-gaps} 'workspace ${cfg.workspace}; exec ${lib.getExe pkgs.firefox}'"; 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}";
})
]);
} }

View file

@ -120,6 +120,7 @@ in {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"application/pdf" = with pkgs; ["qpdfview"]; "application/pdf" = with pkgs; ["qpdfview"];
"text/uri-list" = with pkgs; ["firefox"];
"x-scheme-handler/file" = with pkgs; ["kitty"]; "x-scheme-handler/file" = with pkgs; ["kitty"];
}; };
}; };

View file

@ -43,7 +43,7 @@
defaultDesktopPack.enable = true; defaultDesktopPack.enable = true;
firefox = { firefox = {
enable = true; enable = true;
workspace = "1"; #make this an int later workspace = 1;
}; };
}; };

View file

@ -52,7 +52,6 @@ in {
}; };
}; };
}; };
fail2ban = { fail2ban = {
enable = true; enable = true;
bantime = "10m"; bantime = "10m";