From dc8accfe8fea680cdf4b1022f99525af188ad75e Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sun, 14 Sep 2025 20:47:37 -0700 Subject: [PATCH] improve firefox, fix rofi --- flake.lock | 342 +++++++++++++++++++++++++------ home-manager/common.nix | 16 +- home-manager/modules/ezpcusr.nix | 1 - 3 files changed, 281 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 464e0f5..c4fbaa8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,82 +1,69 @@ { "nodes": { - "auto-base16-theme": { - "flake": false, - "locked": { - "lastModified": 1590513364, - "narHash": "sha256-jhfdB1eL25VRYh25qaSmT4jfEVztFld4CHwbM+xzKwg=", - "ref": "refs/heads/master", - "rev": "081ca564c13d71860a2d6fcb6b2ea8770ad7512d", - "revCount": 22, - "type": "git", - "url": "https://macoy.me/code/macoy/auto-base16-theme.git" + "base16": { + "inputs": { + "fromYaml": "fromYaml" }, - "original": { - "type": "git", - "url": "https://macoy.me/code/macoy/auto-base16-theme.git" - } - }, - "base16-kermit": { - "flake": false, "locked": { - "lastModified": 1736104096, - "narHash": "sha256-FMB39lwyuJQwFjumcDuZ8w2utK5o64EVHNlKZ5rJiFs=", - "owner": "orhun", - "repo": "base16-kermit", - "rev": "6bf9463c0ed326b272a0898d3d2b704c7eca0ba7", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { - "owner": "orhun", - "repo": "base16-kermit", + "owner": "SenchoPens", + "repo": "base16.nix", "type": "github" } }, - "base16-kitty": { + "base16-fish": { "flake": false, "locked": { - "lastModified": 1721117198, - "narHash": "sha256-+vEXvEsar7w7wPVRmKx+rJKUTD5DBgLR7jfl0k7VhnE=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "0898f2677f3a583cc6a89bde29b2b05ac2041e0b", + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", "type": "github" }, "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", + "owner": "tomyun", + "repo": "base16-fish", "type": "github" } }, - "base16-rofi": { + "base16-helix": { "flake": false, "locked": { - "lastModified": 1725756568, - "narHash": "sha256-TvydMwm3iwrtn136e3w7cTsopcAfG5BhBcn+jzfeBXw=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", - "repo": "base16-rofi", - "rev": "3a1ddc189c6cfd966c49b2c2d04cbaca7bb72a99", + "repo": "base16-helix", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { "owner": "tinted-theming", - "repo": "base16-rofi", + "repo": "base16-helix", "type": "github" } }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -112,14 +99,30 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "firenvim": { "flake": false, "locked": { - "lastModified": 1736450794, - "narHash": "sha256-Kg/kvLfvmzjO5064fCUuvIOxyiPR38bjDbUI/rAexSI=", + "lastModified": 1753177410, + "narHash": "sha256-TrY86Pd7vN3gEpKNq5FC/QPZR1uMfxz/vvuLuOmFSgU=", "owner": "glacambre", "repo": "firenvim", - "rev": "f8a5fa6f1ed42536490acf0840497c40331c184f", + "rev": "c927486daff6d1eb8a0d61fd9e264bc1bf5f2c36", "type": "github" }, "original": { @@ -128,6 +131,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -146,6 +170,39 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.2", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -153,11 +210,11 @@ ] }, "locked": { - "lastModified": 1739314552, - "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=", + "lastModified": 1754575993, + "narHash": "sha256-0ut8TM76DeMnexgwNyMx2c5flhp4IPtqQ79XR0hpmY0=", "owner": "nix-community", "repo": "home-manager", - "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd", + "rev": "d8a475e179888553b6863204a93295da6ee13eb4", "type": "github" }, "original": { @@ -168,11 +225,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -198,6 +255,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -208,11 +290,11 @@ ] }, "locked": { - "lastModified": 1736549395, - "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", + "lastModified": 1754501628, + "narHash": "sha256-FExJ54tVB5iu7Dh2tLcyCSWpaV+lmUzzWKZUkemwXvo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", + "rev": "cca090f8115c4172b9aef6c5299ae784bdd5e133", "type": "github" }, "original": { @@ -223,11 +305,6 @@ }, "root": { "inputs": { - "auto-base16-theme": "auto-base16-theme", - "base16-kermit": "base16-kermit", - "base16-kitty": "base16-kitty", - "base16-rofi": "base16-rofi", - "base16-vim": "base16-vim", "bemoji": "bemoji", "bwmenu": "bwmenu", "firenvim": "firenvim", @@ -238,18 +315,19 @@ "plasma-manager": "plasma-manager", "rycee": "rycee", "schemer2": "schemer2", - "tinted-foot": "tinted-foot", + "stylix": "stylix", + "tinted-foot": "tinted-foot_2", "tinted-vscode": "tinted-vscode" } }, "rycee": { "flake": false, "locked": { - "lastModified": 1739333009, - "narHash": "sha256-+2tQnK0buXSEJIU79khebMpoPO7r07Xz3muUrId1Hos=", + "lastModified": 1754512310, + "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3fac54aeef46a6223d3236e47465e75fe1bfddee", + "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2", "type": "gitlab" }, "original": { @@ -274,6 +352,40 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1754438321, + "narHash": "sha256-sRRV9FAZyCbq91IXc6gokBGNe0mF3DPbX/ceY8vUvw0=", + "owner": "danth", + "repo": "stylix", + "rev": "8410296a30e62e06305020cb74d3247cfa45d9cc", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -289,7 +401,39 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-foot_2": { "flake": false, "locked": { "lastModified": 1735732312, @@ -305,14 +449,62 @@ "type": "github" } }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "tinted-vscode": { "flake": false, "locked": { - "lastModified": 1737886549, - "narHash": "sha256-Cp2mzaFaurIOe3IRYu8IlVZiwomxXkowso89Hx13/bU=", + "lastModified": 1754251731, + "narHash": "sha256-d8CbFPLDLVrK+9mmWOK3y70Hd2nBZ0VgS6Ox87A9jRk=", "owner": "tinted-theming", "repo": "tinted-vscode", - "rev": "411d793e91725831e9fd575bfab26408b8ce6230", + "rev": "ff55f40e0638f167d7076f27f93c97e33c6ee92a", "type": "github" }, "original": { @@ -320,6 +512,22 @@ "repo": "tinted-vscode", "type": "github" } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } } }, "root": "root", diff --git a/home-manager/common.nix b/home-manager/common.nix index 6c7396a..46c62b3 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -85,27 +85,23 @@ inputs: all: { enable = true; }; - programs.firefox = { - package = lib.mkDefault (pkgs.librewolf.override { - nativeMessagingHosts = [pkgs.fx-cast-bridge]; - cfg = { - enableGnomeExtensions = true; - pipewireSupport = true; - }; - }); + programs.librewolf = { + nativeMessagingHosts = [pkgs.fx-cast-bridge]; profiles.default = { extensions = lib.optionals (pkgs ? nur.repos.rycee.firefox-addons) (with pkgs.nur.repos.rycee.firefox-addons; [ darkreader bitwarden violentmonkey - canvasblocker + # canvasblocker sponsorblock stylus vimium ]); settings = { + "extensions.autoDisableScopes" = 0; + "browser.startup.homepage" = "https://wizbos.club"; # Make the browser usable, if I wanted autism privacy, I would use TOR browser. @@ -135,7 +131,7 @@ inputs: all: { # # LibreWolf ruins the user agent making sites unusable without RFP, so use the user agent from RFP manually. This also seems sane for compatibility when using Firefox. # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"; # set the user agent to a _realistic_ user agent because cloudflare keeps sniffing my balls - "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133."; + "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:136.0) Gecko/20100101 Firefox/136."; }; }; }; diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 1cb7c17..45c40f3 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -592,7 +592,6 @@ in { programs.rofi = { enable = lib.mkDefault true; - package = pkgs.rofi-wayland; terminal = lib.mkDefault "${pkgs.foot}/bin/foot"; };