diff --git a/common/firefox.nix b/common/firefox.nix index 25bf8f8..912b4f1 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -6,7 +6,7 @@ in { ++ lib.optionals config.services.desktopManager.plasma6.enable [ pkgs.plasma-browser-integration ]; programs.firefox = { - # package = grimm-shared-inputs.ff_nightly.packages.${pkgs.system}.firefox-nightly-bin; + package = pkgs.firefox-beta; enable = true; nativeMessagingHosts.packages = [] ++ lib.optionals (cfg.tooling.enable && cfg.tooling.pass) [ pkgs.passff-host ]; @@ -42,6 +42,8 @@ in { OverrideFirstRunPage = ""; OverridePostUpdatePage = ""; DontCheckDefaultBrowser = true; + Preferences = lib.mkMerge ([] + ++ lib.optionals cfg.sway.enable [ {"browser.tabs.inTitlebar" = 0; } ]); }; }; }; diff --git a/flake.lock b/flake.lock index e37717a..d495b84 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1711485134, - "narHash": "sha256-lNT4pNAaQtS0n8Bj81ZFlqEADnGEuvckr6GjJMaFxyo=", + "lastModified": 1711620834, + "narHash": "sha256-ACc91o5k7rlNbX6wQmV6tiOF4pQr/nV2ulQ3JHoYH/E=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a99e06b889dcb9634dcf70382c9f1fd5b07c9e52", + "rev": "bec5e460d3fcfccac029088c395f4f629c800957", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1711172967, - "narHash": "sha256-HBkYzSfFM0oMnRSjquI1CJ7a4jtIv9eRbAeJZDE8H3M=", + "lastModified": 1711506264, + "narHash": "sha256-GaQJvPyEkZu3YMdV9m1UENoeE10fkV6PcnLUtzPmuOY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "101cb34f9a1b94b91717af3581f35386f20d4601", + "rev": "051668b62b76270dc8ad3b011c6adbfe8ee8bde2", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711432844, - "narHash": "sha256-Vf9X0QXfgKpKSIinaCm79+hqkiu3aXUhcUdMJn335Gw=", + "lastModified": 1711497966, + "narHash": "sha256-riUI0kKAPlx0IueXm6cn2jjAnorwumLSN2kFbVvDwT8=", "owner": "martinvonz", "repo": "jj", - "rev": "0481e67dfdb88f265174f27c359a545d144977ee", + "rev": "423a2a54463471e525a04959c9e79e3f4a206f4a", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1711445737, - "narHash": "sha256-wdsdXc8WCIX5EmnUpIiH7LoQZrzOYco0LxVffkUX6/4=", + "lastModified": 1711518378, + "narHash": "sha256-+wOdvNOEtkb5sGeJBXK5CpUPx+NWeVwVH6y4NdVH2os=", "owner": "YaLTeR", "repo": "niri", - "rev": "f5c97faf4aefc8366c3be7475dde5412a42dbc8f", + "rev": "e276c906bf4bea27dc8173815ff373d04c20caaf", "type": "github" }, "original": { @@ -430,11 +430,11 @@ ] }, "locked": { - "lastModified": 1711242788, - "narHash": "sha256-6m6hw6uoIIvoAMR5RLhw7kGfNu3Govof9vnPAzveUgI=", + "lastModified": 1711501815, + "narHash": "sha256-mHtxlnqdIZAPAAXT0em6O5n9yW/6ri937i0NWAvEErU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "04028200841ec3b4ce163de4d136296d03123001", + "rev": "63ded1ffc0846c259f9cd0f62aa2ea9f7f804f56", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711333969, - "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1711472513, - "narHash": "sha256-M85pqfYnYeVPTZXKtjg/ks5LUl3u2onG9Nfn8Xs+BSA=", + "lastModified": 1711631350, + "narHash": "sha256-/wag4Ee10Ss5op4U2oSFM8Rmdr//XwUHlkKC/YfZQrg=", "ref": "refs/heads/main", - "rev": "144be992b1068f721b182aef82298eab29c5b3eb", - "revCount": 28, + "rev": "582ed32c9e9187d153c1e8e8087db7230d506c20", + "revCount": 29, "type": "git", "url": "https://git.grimmauld.de/Grimmauld/swaymux" }, diff --git a/sway/sway-conf.nix b/sway/sway-conf.nix index eee5e5b..7660fca 100644 --- a/sway/sway-conf.nix +++ b/sway/sway-conf.nix @@ -23,7 +23,7 @@ in { up = "k"; right = "l"; term = "alacritty"; - menu = "dmenu_path | wmenu | xargs swaymsg exec --"; + menu = "dmenu_path | dmenu | xargs swaymsg exec --"; primecol = "#8800FF"; accentcol = "#5700a0";