From dc95eb510f5254a2457f6a70ac4a9e2c4f02ae6c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 7 Mar 2025 18:43:11 -0500 Subject: [PATCH 1/6] wip: broken build chromium is enabled however --- home/browser.nix | 55 ++++++++++++++++++++++++++++++++++++++++- home/default.nix | 1 + home/packages/linux.nix | 1 + 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/home/browser.nix b/home/browser.nix index 68dc3dd..ef0b60d 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -1,5 +1,58 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: let + package = pkgs.ungoogled-chromium; + createChromiumExtensionFor = browserVersion: { + id, + sha256, + version, + }: { + inherit id; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; + name = "${id}.crx"; + inherit sha256; + }; + inherit version; + }; + createChromiumExtension = createChromiumExtensionFor (lib.versions.major package.version); + extensions = [ + (createChromiumExtension { + # ublock origin + id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; + sha256 = "sha256-u81DNkZw/LBVyjk5nmrrJEVjdc+GFCay+rQZGpDH3jA="; + version = "1.37.2"; + }) + (createChromiumExtension { + # dark reader + id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; + sha256 = "sha256-JcM2Ki3cTWdskFEFs2jk6LQUTFOojkBf+6HqO1GPK90="; + version = "4.9.34"; + }) + ]; +in { programs.firefox = { enable = pkgs.stdenv.isLinux; }; + + programs.chromium = { + enable = pkgs.stdenv.isLinux; + package = package; + enableWidevine = true; + inherit extensions; + + extraOpts = { + ExtensionSettings = builtins.listToAttrs (map + (extension: { + name = extension.id; + value = { + installation_mode = "force_installed"; + update_url = "https://clients2.google.com/service/update2/crx"; + }; + }) + extensions); + }; + }; } diff --git a/home/default.nix b/home/default.nix index 851d96f..a455b83 100644 --- a/home/default.nix +++ b/home/default.nix @@ -23,6 +23,7 @@ in { ./direnv.nix ./sway.nix ./terminal.nix + ./browser.nix ]; # Home Manager needs a bit of information about you and the diff --git a/home/packages/linux.nix b/home/packages/linux.nix index a643ade..e26def3 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -11,5 +11,6 @@ mcrcon xfce.thunar pavucontrol + # ungoogled-chromium ]); } From cf6aab28978f5cba4a67a014c78ae95a5651a48c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 8 Mar 2025 20:37:03 -0500 Subject: [PATCH 2/6] working build of chromium --- home/browser.nix | 74 ++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/home/browser.nix b/home/browser.nix index ef0b60d..90152de 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -2,57 +2,37 @@ pkgs, lib, ... -}: let - package = pkgs.ungoogled-chromium; - createChromiumExtensionFor = browserVersion: { - id, - sha256, - version, - }: { - inherit id; - crxPath = builtins.fetchurl { - url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; - name = "${id}.crx"; - inherit sha256; - }; - inherit version; - }; - createChromiumExtension = createChromiumExtensionFor (lib.versions.major package.version); - extensions = [ - (createChromiumExtension { - # ublock origin - id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - sha256 = "sha256-u81DNkZw/LBVyjk5nmrrJEVjdc+GFCay+rQZGpDH3jA="; - version = "1.37.2"; - }) - (createChromiumExtension { - # dark reader - id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; - sha256 = "sha256-JcM2Ki3cTWdskFEFs2jk6LQUTFOojkBf+6HqO1GPK90="; - version = "4.9.34"; - }) - ]; -in { +}: { programs.firefox = { - enable = pkgs.stdenv.isLinux; + # please see Mozilla's TOU and privacy policy please i implore you + enable = false; }; programs.chromium = { enable = pkgs.stdenv.isLinux; - package = package; - enableWidevine = true; - inherit extensions; - - extraOpts = { - ExtensionSettings = builtins.listToAttrs (map - (extension: { - name = extension.id; - value = { - installation_mode = "force_installed"; - update_url = "https://clients2.google.com/service/update2/crx"; - }; - }) - extensions); - }; + package = pkgs.ungoogled-chromium; + extensions = let + createChromiumExtensionFor = browserVersion: { + id, + sha256, + version, + }: { + inherit id; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; + name = "${id}.crx"; + inherit sha256; + }; + inherit version; + }; + createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version); + in [ + (createChromiumExtension { + # ublock origin + id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; + sha256 = "sha256:0ycnkna72n969crgxfy2lc1qbndjqrj46b9gr5l9b7pgfxi5q0ll"; + version = "1.62.0"; + }) + ]; }; } From 31970f4a712d8a3568b0adea51d6ef6e0ab5a8b4 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 8 Mar 2025 23:27:58 -0500 Subject: [PATCH 3/6] added environment variable, added extra brower flags --- home/browser.nix | 10 +++++++++- home/default.nix | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/home/browser.nix b/home/browser.nix index 90152de..649b903 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -10,7 +10,15 @@ programs.chromium = { enable = pkgs.stdenv.isLinux; - package = pkgs.ungoogled-chromium; + package = pkgs.ungoogled-chromium.override { + enableWideVine = true; + commandLineArgs = [ + "--enable-features=AcceleratedVideoEncoder,VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,UseMultiPlaneFormatForHardwareVideo" + "--ignore-gpu-blocklist" + "--force-dark-mode" + "--enable-zero-copy" + ]; + }; extensions = let createChromiumExtensionFor = browserVersion: { id, diff --git a/home/default.nix b/home/default.nix index a455b83..872f13f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -42,6 +42,7 @@ in { XDG_CACHE_HOME = "$HOME/.cache"; XDG_DATA_HOME = "$HOME/.local/share"; XDG_STATE_HOME = "$HOME/.local/state"; + NIXOS_OZONE_WL = "1"; }; pointerCursor = lib.mkIf pkgs.stdenv.isLinux { From 4d872e96c78a9e009fe476efc88b7cbc5145bda9 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 5 Apr 2025 17:15:37 -0400 Subject: [PATCH 4/6] adjusted browser command line flags --- flake.lock | 18 +++++++++--------- home/browser.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 39337ff..ea8ab04 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", + "lastModified": 1742869675, + "narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", + "rev": "bb81755a3674951724d79b8cba6bbff01409d44d", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { diff --git a/home/browser.nix b/home/browser.nix index 649b903..4f080ae 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -13,7 +13,7 @@ package = pkgs.ungoogled-chromium.override { enableWideVine = true; commandLineArgs = [ - "--enable-features=AcceleratedVideoEncoder,VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,UseMultiPlaneFormatForHardwareVideo" + "--enable-features=AcceleratedVideoEncoder,Vulkan,VulkanFromANGLE,DefaultANGLEVulkan" "--ignore-gpu-blocklist" "--force-dark-mode" "--enable-zero-copy" From 9c2efbc1a64a4b38eb5e2c5e1cf7758d7db2b475 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 10 Apr 2025 08:49:56 -0400 Subject: [PATCH 5/6] add bitwarden to chromium extensions --- home/browser.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/browser.nix b/home/browser.nix index 4f080ae..2cc9d46 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -39,7 +39,13 @@ # ublock origin id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; sha256 = "sha256:0ycnkna72n969crgxfy2lc1qbndjqrj46b9gr5l9b7pgfxi5q0ll"; - version = "1.62.0"; + version = "1.63.2"; + }) + (createChromiumExtension { + # bitwarden + id = "nngceckbapebfimnlniiiahkandclblb"; + sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi"; + version = "2025.3.1"; }) ]; }; From ee228038b308267820f96681f63cdf37d3e63587 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 16 Apr 2025 02:52:21 -0400 Subject: [PATCH 6/6] remove useless file --- flake.lock.orig | 104 ------------------------------------------------ 1 file changed, 104 deletions(-) delete mode 100644 flake.lock.orig diff --git a/flake.lock.orig b/flake.lock.orig deleted file mode 100644 index eaa4e4d..0000000 --- a/flake.lock.orig +++ /dev/null @@ -1,104 +0,0 @@ -{ - "nodes": { - "darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "nix-darwin-24.11", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "nix-flatpak": { - "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.4.1", - "repo": "nix-flatpak", - "type": "github" - } - }, - "nixpkgs": { - "locked": { -<<<<<<< HEAD -<<<<<<< HEAD - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", -======= - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", ->>>>>>> origin -======= - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", ->>>>>>> origin - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -}