diff --git a/flake.lock b/flake.lock index fa09fcf..baa720d 100644 --- a/flake.lock +++ b/flake.lock @@ -271,6 +271,27 @@ "type": "github" } }, + "flake-parts_4": { + "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-utils": { "inputs": { "systems": "systems_4" @@ -912,6 +933,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1743014863, @@ -1009,6 +1046,22 @@ } }, "nixpkgs_8": { + "locked": { + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1777918403, "narHash": "sha256-7QiZv0LcW1yIOLo2LNuCQjWon1Z1r99FwK24hbtBOF4=", @@ -1024,19 +1077,22 @@ "type": "github" } }, - "nixpkgs_9": { + "nur": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_8" + }, "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "lastModified": 1778156530, + "narHash": "sha256-4VhPk2NQKyYptNw1x/HG23sFmR4iYTOTZhGhzzYDQOs=", + "owner": "nix-community", + "repo": "nur", + "rev": "1b24f43e7f25d9c297a2ed45c654a72fc68d3d29", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nur", "type": "github" } }, @@ -1079,6 +1135,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable", + "nur": "nur", "sops-nix": "sops-nix", "tnvim": "tnvim", "tpanel": "tpanel", @@ -1173,7 +1230,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1777944972, @@ -1292,7 +1349,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1775636079, diff --git a/flake.nix b/flake.nix index 23b05fd..8e60bb2 100644 --- a/flake.nix +++ b/flake.nix @@ -56,5 +56,6 @@ hyprland.url = "github:hyprwm/Hyprland"; awww.url = "git+https://codeberg.org/LGFae/awww"; nixcord.url = "github:kaylorben/nixcord"; + nur.url = "github:nix-community/nur"; }; } diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix index 5df97a2..ed48899 100644 --- a/modules/flake/overlays.nix +++ b/modules/flake/overlays.nix @@ -20,6 +20,8 @@ config.allowUnfree = true; }; }; + + nur = inputs.nur.overlays.default; }; perSystem = diff --git a/modules/hm/desktop/firefox.nix b/modules/hm/desktop/firefox.nix new file mode 100644 index 0000000..56f3ade --- /dev/null +++ b/modules/hm/desktop/firefox.nix @@ -0,0 +1,75 @@ +{ + flake.modules.homeManager.desktop = + { + pkgs, + userName, + ... + }: + { + programs.firefox = { + enable = true; + + package = pkgs.firefox.override { + extraPolicies = { + CaptivePortal = false; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableTelemetry = true; + DisableFirefoxAccounts = false; + NoDefaultBookmarks = true; + OfferToSaveLogins = false; + OfferToSaveLoginsDefault = false; + PasswordManagerEnabled = false; + FirefoxHome = { + Search = true; + Pocket = false; + Snippets = false; + TopSites = false; + Highlights = false; + }; + UserMessaging = { + ExtensionRecommendations = false; + SkipOnboarding = true; + }; + }; + }; + + profiles = { + ${userName} = { + id = 0; + name = "tux"; + search = { + force = true; + default = "google"; + }; + settings = { + "general.smoothScroll" = true; + "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; + "layout.css.prefers-color-scheme.content-override" = 0; + "browser.compactmode.show" = true; + "browser.tabs.firefox-view" = false; + "browser.bookmarks.addedImportButton" = false; + "extensions.pocket.enabled" = false; + "browser.fullscreen.autohide" = false; + }; + extraConfig = '' + user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); + user_pref("full-screen-api.ignore-widgets", true); + user_pref("media.ffmpeg.vaapi.enabled", true); + user_pref("media.rdd-vpx.enabled", true); + ''; + + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + facebook-container + metamask + darkreader + bitwarden + wappalyzer + clearurls + ]; + }; + }; + }; + }; +} diff --git a/modules/hosts/sirius/config.nix b/modules/hosts/sirius/config.nix index e0205e8..76d7fcf 100644 --- a/modules/hosts/sirius/config.nix +++ b/modules/hosts/sirius/config.nix @@ -90,9 +90,6 @@ services.xserver.videoDrivers = [ "nvidia" ]; environment.systemPackages = with pkgs; [ nvtopPackages.full ]; - # --- Programs --- - programs.firefox.enable = true; - # !!! DO NOT CHANGE THIS !!! # This should match the version used at initial install. system.stateVersion = "26.05";