diff --git a/flake.lock b/flake.lock index 4749de0d..825420f5 100644 --- a/flake.lock +++ b/flake.lock @@ -25,29 +25,6 @@ "type": "github" } }, - "arkenfox": { - "inputs": { - "flake-compat": [], - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit": [] - }, - "locked": { - "lastModified": 1736011875, - "narHash": "sha256-uwf8WWlz/xDO4Pn3m5IJoB/1CfJzInRepx9kP6T1oS0=", - "owner": "isabelroses", - "repo": "arkenfox-nixos", - "rev": "c7f63bd3bb35d8dc0a2fd4e6d9b84fb03c3fb439", - "type": "github" - }, - "original": { - "owner": "isabelroses", - "ref": "chore-remove-fu", - "repo": "arkenfox-nixos", - "type": "github" - } - }, "beapkgs": { "inputs": { "nixpkgs": [ @@ -530,7 +507,6 @@ "root": { "inputs": { "agenix": "agenix", - "arkenfox": "arkenfox", "beapkgs": "beapkgs", "catppuccin": "catppuccin", "cosmic": "cosmic", diff --git a/flake.nix b/flake.nix index eca033c9..26bf7477 100755 --- a/flake.nix +++ b/flake.nix @@ -112,20 +112,6 @@ }; }; - # firefox user.js - arkenfox = { - type = "github"; - owner = "isabelroses"; - repo = "arkenfox-nixos"; - ref = "chore-remove-fu"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-compat.follows = ""; - pre-commit.follows = ""; - }; - }; - ### Additional packages # a plain simple way to host a mail server simple-nixos-mailserver = { diff --git a/home/isabel/packages/gui/browsers/firefox/default.nix b/home/isabel/packages/gui/browsers/firefox/default.nix index 7e805a1b..9ac5800f 100644 --- a/home/isabel/packages/gui/browsers/firefox/default.nix +++ b/home/isabel/packages/gui/browsers/firefox/default.nix @@ -1,18 +1,15 @@ { lib, - inputs, config, ... }: let inherit (lib.modules) mkIf; - inherit (lib.attrsets) genAttrs recursiveUpdate; cfg = config.garden.programs.firefox; in { imports = [ - inputs.arkenfox.hmModules.arkenfox ./extensions.nix ]; @@ -21,62 +18,8 @@ in enable = true; inherit (cfg) package; - arkenfox = { - enable = true; - version = "128.0"; - }; - - profiles.arkenfox = { + profiles.default = { isDefault = true; - - # modified from getchoo since I'm too lazy to read the wiki right now - # https://github.com/getchoo/flake/blob/b237ea94b95a7f75998a646fde903105807b24da/users/seth/programs/firefox/arkenfox.nix - arkenfox = - let - enableSections = - sections: - genAttrs sections (_: { - enable = true; - }); - in - recursiveUpdate - { - enable = true; - - # fix hulu - "1200"."1201"."security.ssl.require_safe_negotiation".value = false; - - "2600"."2651"."browser.download.useDownloadDir" = { - enable = true; - value = true; - }; - - "5000" = { - "5003"."signon.rememberSignons".enable = true; - # enable search autocomplete - "5021"."keyword.enabled".value = true; - }; - } - (enableSections [ - "0100" - "0200" - "0300" - "0400" - "0600" - "0700" - "0800" - "0900" - "1000" - "1200" - "1600" - "1700" - "2000" - "2400" - "2600" - "2700" - "2800" - "4500" - ]); }; }; }; diff --git a/home/isabel/packages/gui/browsers/firefox/extensions.nix b/home/isabel/packages/gui/browsers/firefox/extensions.nix index 482df15f..4a3833f7 100644 --- a/home/isabel/packages/gui/browsers/firefox/extensions.nix +++ b/home/isabel/packages/gui/browsers/firefox/extensions.nix @@ -99,7 +99,7 @@ let }; in { - programs.firefox.profiles.arkenfox = { + programs.firefox.profiles.default = { extensions = builtins.attrValues extensions; }; } diff --git a/home/robin/packages/gui/browsers/firefox/default.nix b/home/robin/packages/gui/browsers/firefox/default.nix index 7e805a1b..9ac5800f 100644 --- a/home/robin/packages/gui/browsers/firefox/default.nix +++ b/home/robin/packages/gui/browsers/firefox/default.nix @@ -1,18 +1,15 @@ { lib, - inputs, config, ... }: let inherit (lib.modules) mkIf; - inherit (lib.attrsets) genAttrs recursiveUpdate; cfg = config.garden.programs.firefox; in { imports = [ - inputs.arkenfox.hmModules.arkenfox ./extensions.nix ]; @@ -21,62 +18,8 @@ in enable = true; inherit (cfg) package; - arkenfox = { - enable = true; - version = "128.0"; - }; - - profiles.arkenfox = { + profiles.default = { isDefault = true; - - # modified from getchoo since I'm too lazy to read the wiki right now - # https://github.com/getchoo/flake/blob/b237ea94b95a7f75998a646fde903105807b24da/users/seth/programs/firefox/arkenfox.nix - arkenfox = - let - enableSections = - sections: - genAttrs sections (_: { - enable = true; - }); - in - recursiveUpdate - { - enable = true; - - # fix hulu - "1200"."1201"."security.ssl.require_safe_negotiation".value = false; - - "2600"."2651"."browser.download.useDownloadDir" = { - enable = true; - value = true; - }; - - "5000" = { - "5003"."signon.rememberSignons".enable = true; - # enable search autocomplete - "5021"."keyword.enabled".value = true; - }; - } - (enableSections [ - "0100" - "0200" - "0300" - "0400" - "0600" - "0700" - "0800" - "0900" - "1000" - "1200" - "1600" - "1700" - "2000" - "2400" - "2600" - "2700" - "2800" - "4500" - ]); }; }; }; diff --git a/home/robin/packages/gui/browsers/firefox/extensions.nix b/home/robin/packages/gui/browsers/firefox/extensions.nix index 482df15f..4a3833f7 100644 --- a/home/robin/packages/gui/browsers/firefox/extensions.nix +++ b/home/robin/packages/gui/browsers/firefox/extensions.nix @@ -99,7 +99,7 @@ let }; in { - programs.firefox.profiles.arkenfox = { + programs.firefox.profiles.default = { extensions = builtins.attrValues extensions; }; }