From 48e2a1b75442773ed152ed5dab5c42b1c42e25ea Mon Sep 17 00:00:00 2001 From: Steph Date: Mon, 1 Jul 2024 23:54:27 +0200 Subject: [PATCH] yes --- flake.lock | 39 +++++++++++++++++++++++++++++++++++++++ flake.nix | 5 ++++- home.nix | 43 ++++++++++++++++++++++++++++++++----------- 3 files changed, 75 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 164e723..531a3f2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1719827611, + "narHash": "sha256-+NLFz+ZU7eE8QK9dsKyPXM8Us55jhFsaYNCZfALs344=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "e823b25cdc14da38ec0d00775a2ba781e7f9a75a", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -16,6 +39,21 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -55,6 +93,7 @@ }, "root": { "inputs": { + "firefox-addons": "firefox-addons", "firefox-gnome-theme": "firefox-gnome-theme", "home": "home", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 21dc3fe..a51834a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,10 @@ home.inputs.nixpkgs.follows = "nixpkgs"; firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; }; + firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home, firefox-gnome-theme }@inputs: { + outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons }@inputs: { nixosConfigurations.iota = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -23,6 +24,7 @@ {_module.args = {inherit inputs;};} ]; home-manager.users.steph = import ./home.nix; + home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = { inherit inputs ; }; }]; }; @@ -37,6 +39,7 @@ {_module.args = {inherit inputs;};} ]; home-manager.users.steph = import ./home.nix; + home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = { inherit inputs ; }; }]; }; diff --git a/home.nix b/home.nix index 073927a..750fa21 100644 --- a/home.nix +++ b/home.nix @@ -1,9 +1,6 @@ {config, lib, pkgs, inputs, ...}: { - home.file.".mozilla/firefox/default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme; programs.firefox.enable = true; - programs.firefox.package = pkgs.librewolf-wayland; - home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla" ; programs.firefox.profiles.default = { userChrome = '' @import "firefox-gnome-theme/userChrome.css"; @@ -18,7 +15,38 @@ "browser.uidensity" = 0; # Set UI density to normal "svg.context-properties.content.enabled" = true; # Enable SVG context-propertes "browser.theme.dark-private-windows" = false; # Disable private window dark theme + "extensions.autoDisableScopes" = 0; # Auto enable new extentions + "browser.toolbars.bookmarks.visibility" = "never"; + "gnomeTheme.hideSingleTab" = true; }; + extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ + ublock-origin + bitwarden + consent-o-matic + wayback-machine + h264ify + sponsorblock + fediact + tampermonkey + multi-account-containers + ]; + search = { + default = "DuckDuckGo"; + force = true; + }; + containers = { + "RYSST" = { + color = "blue"; + icon = "circle"; + id = 1; + }; + "Lekker van Peet" = { + color = "toolbar"; + icon = "circle"; + id = 2; + }; + }; + containersForce = true; }; @@ -137,17 +165,10 @@ $NEW_PROMPT_COMMAND" ]; # disabled-extensions = builtins.filter (x: ! builtins.elem x enabled-extensions) disabled-extensions; favorite-apps = [ - "librewolf.desktop" + "firefox.desktop" "chromium-browser.desktop" "org.gnome.Console.desktop" "org.gnome.Nautilus.desktop" - "org.gnome.Geary.desktop" - "org.gnome.Calendar.desktop" - "org.gnome.Todo.desktop" - "telegramdesktop.desktop" - "schildichat-desktop.desktop" - "im.dino.Dino.desktop" - "com.github.bleakgrey.tootle.desktop" ]; }; };