diff --git a/apps/firefox/home.nix b/apps/firefox/home.nix index 1341de9..e697d84 100644 --- a/apps/firefox/home.nix +++ b/apps/firefox/home.nix @@ -8,20 +8,26 @@ inputs.textfox.homeManagerModules.default ./textfox.nix ]; + home.packages = with pkgs; [ + pywalfox-native + ]; programs.firefox = { enable = true; languagePacks = ["en-US"]; + nativeMessagingHosts = [pkgs.pywalfox-native]; profiles = { hakase = { search.force = true; isDefault = true; search.default = "ddg"; - extensions.force = true; + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + bitwarden + pywalfox + ]; - # Full declarative mode enabled. - # Note: Manual bookmarks added in the UI will be overwritten on next rebuild. bookmarks = { force = true; settings = [ @@ -106,20 +112,20 @@ WhatsNew = false; }; - ExtensionSettings = { - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; - installation_mode = "force_installed"; - }; - "tridactyl.vim@cmcaine.co.uk" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi"; - installation_mode = "force_installed"; - }; - }; + # ExtensionSettings = { + # "uBlock0@raymondhill.net" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + # installation_mode = "force_installed"; + # }; + # "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + # installation_mode = "force_installed"; + # }; + # "tridactyl.vim@cmcaine.co.uk" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi"; + # installation_mode = "force_installed"; + # }; + # }; }; }; } diff --git a/config.nix b/config.nix index b026b1d..f16550c 100644 --- a/config.nix +++ b/config.nix @@ -45,6 +45,10 @@ name = "YouTube"; url = "https://youtube.com"; } + { + name = "Nur"; + url = "https://nur.nix-community.org/repos"; + } ]; newtabpage = [ { diff --git a/flake.lock b/flake.lock index f3a9430..edccfc1 100644 --- a/flake.lock +++ b/flake.lock @@ -239,6 +239,27 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -839,6 +860,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -854,7 +891,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1757068644, "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", @@ -894,6 +931,25 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1766863198, + "narHash": "sha256-QnOQs3Jxq+44ts6yl6Yaf1Yz2P/YDMaMa6hEhNBe1Qc=", + "owner": "nix-community", + "repo": "NUR", + "rev": "33f3522b8da6e9773fd15ff1358a7e1ba3e212d5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_2": { "inputs": { "flake-parts": [ "stylix", @@ -949,6 +1005,7 @@ "hyprland": "hyprland", "nixovim": "nixovim", "nixpkgs": "nixpkgs_4", + "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", "textfox": "textfox", @@ -1021,12 +1078,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], - "nur": "nur", + "nur": "nur_2", "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -1126,7 +1183,7 @@ "textfox": { "inputs": { "firefox-addons": "firefox-addons", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1763730250, @@ -1228,7 +1285,7 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index 82359e9..dd0998c 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ elephant.url = "github:abenz1267/elephant"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; textfox.url = "github:adriankarlen/textfox"; + nur.url = "github:nix-community/NUR"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/system/home-manager.nix b/system/home-manager.nix index 3506638..15d82b0 100644 --- a/system/home-manager.nix +++ b/system/home-manager.nix @@ -1,8 +1,10 @@ { specialArgs, myConfig, + inputs, ... }: { + nixpkgs.overlays = [inputs.nur.overlays.default]; home-manager = { backupFileExtension = "backup"; useGlobalPkgs = true;