firefox: add common css styles

Signed-off-by: Myned <dev@bjork.tech>

options/custom/desktops/niri/input.nix

@@ -39,6 +39,7 @@ in {
           mouse = {
             accel-profile = "adaptive";
             accel-speed = -0.7;
+            scroll-factor = 1.25;
           };
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputtouchpadaccel-profile

options/custom/desktops/niri/rules.nix

@@ -70,7 +70,13 @@ in {
                 {app-id = "^chromium-browser$";}
                 {app-id = "^firefox.*$";}
                 {app-id = "^google-chrome$";}
+                {app-id = "^librewolf$";}
                 {app-id = "^vivaldi.*$";}
+                {app-id = "^zen$";}
+              ];
+
+              excludes = [
+                {title = "^Picture.in.[Pp]icture$";}
               ];
 
               default-column-width.proportion =
@@ -78,6 +84,7 @@ in {
                 then 0.4
                 else 0.8;
 
+              min-width = builtins.floor (config.custom.width * 0.3);
               open-on-workspace = "2";
             }
 
@@ -183,6 +190,7 @@ in {
             {
               # Terminals
               matches = [
+                {app-id = "^com\.mitchellh\.ghostty$";}
                 {app-id = "^foot$";}
                 {app-id = "^kitty$";}
                 {app-id = "^org\.wezfurlong\.wezterm$";}
@@ -215,7 +223,7 @@ in {
             ### Overrides
             # TODO: Remove when switching 1Password to Wayland
             (let
-              height = builtins.floor (config.custom.height / config.custom.scale * 0.4); # 40%
+              height = builtins.floor (config.custom.height * 0.4); # 40%
             in {
               matches = [
                 {

options/custom/menus/walker/search.sh

@@ -170,7 +170,7 @@ case "$1" in
     url="https://nixpk.gs/pr-tracker.html?pr="
     query="${1:4}"
     ;;
-  'nri '*)
+  'nii '*)
     label="Niri Issues"
     icon="com.github.zren.bugzilla"
     url="https://github.com/YaLTeR/niri/issues?q=is%3Aissue+is%3Aopen+"

options/custom/programs/chromium.nix

@@ -234,7 +234,7 @@ in {
 
           {
             name = "Niri Issues";
-            shortcut = "nri";
+            shortcut = "nii";
             url = "https://github.com/YaLTeR/niri/issues?q=is%3Aissue+is%3Aopen+{searchTerms}";
           }
 

options/custom/programs/firefox/.common.nix

@@ -54,27 +54,31 @@ with lib; {
 
     # BUG: Tab groups not yet supported
     # https://github.com/rafaelmardojai/firefox-gnome-theme/issues/901
-    # Import CSS theme with solarized overrides
     # https://github.com/rafaelmardojai/firefox-gnome-theme
     # https://github.com/rafaelmardojai/firefox-gnome-theme/blob/master/theme/colors/dark.css
-    userContent = mkIf theme ''
-      @import "${inputs.firefox-gnome-theme}/userContent.css";
+    userChrome = ''
+      ${
+        if theme
+        then "@import ${inputs.firefox-gnome-theme}/userChrome.css"
+        else ""
+      }
+
+      ${builtins.readFile ./userChrome.css}
     '';
 
-    userChrome = mkIf theme ''
-      @import "${inputs.firefox-gnome-theme}/userChrome.css";
-      ${builtins.readFile ./userChrome.css}
+    userContent = ''
+      ${
+        if theme
+        then "@import ${inputs.firefox-gnome-theme}/userContent.css"
+        else ""
+      }
+
+      ${builtins.readFile ./userContent.css}
     '';
 
     containersForce = true;
 
     containers = {
-      Master = {
-        color = "pink";
-        icon = "circle";
-        id = 0;
-      };
-
       Edu = {
         color = "orange";
         icon = "fruit";
@@ -198,7 +202,8 @@ with lib; {
         "full-screen-api.warning.timeout" = 0;
         "general.autoScroll" = false;
         "general.smoothScroll" = true;
-        "gfx.webrender.software" = config.custom.programs.looking-glass.igpu; # Reduce load on iGPU
+        "general.smoothScroll.msdPhysics.enabled" = true;
+        "gfx.webrender.software" = false;
         "identity.fxaccounts.enabled" = true;
         "layers.acceleration.force-enabled" = true;
         "layout.css.always_underline_links" = false;
@@ -221,7 +226,7 @@ with lib; {
         "media.videocontrols.picture-in-picture.video-toggle.enabled" = true;
         "media.videocontrols.picture-in-picture.video-toggle.has-used" = true;
         "media.videocontrols.picture-in-picture.video-toggle.min-video-secs" = 0; # No minimum duration
-        "media.videocontrols.picture-in-picture.video-toggle.position" = "top";
+        "media.videocontrols.picture-in-picture.video-toggle.position" = "right";
         "messaging-system.askForFeedback" = false;
         "messaging-system.rsexperimentloader.enabled" = false;
         "middlemouse.paste" = false;
@@ -230,7 +235,7 @@ with lib; {
         "network.dns.disablePrefetchFromHTTPS" = true;
         "network.http.referer.XOriginPolicy" = 0; # Relaxed
         "network.predictor.enabled" = false;
-        "pref.privacy.disable_button.view_passwords" = true;
+        "pref.privacy.disable_button.view_passwords" = false;
         "privacy.fingerprintingProtection" = false;
         "privacy.globalprivacycontrol.enabled" = true;
         "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
@@ -265,20 +270,6 @@ with lib; {
         "gnomeTheme.bookmarksToolbarUnderTabs" = true;
       };
 
-    bookmarks = [
-      {
-        name = "Nix User Repository";
-        keyword = "nur";
-        url = "https://nur.nix-community.org/";
-      }
-
-      {
-        name = "Nix Ryantm";
-        keyword = "nry";
-        url = "https://ryantm.github.io/nixpkgs/";
-      }
-    ];
-
     # https://searchfox.org/mozilla-central/rev/669329e284f8e8e2bb28090617192ca9b4ef3380/toolkit/components/search/SearchEngine.jsm#1138-1177
     search = {
       force = true;
@@ -468,7 +459,7 @@ with lib; {
         };
 
         "Niri Issues" = {
-          definedAliases = ["nri"];
+          definedAliases = ["nii"];
           iconUpdateURL = "https://github.com/favicon.ico";
           urls = [{template = "https://github.com/YaLTeR/niri/issues?q=is%3Aissue+is%3Aopen+{searchTerms}";}];
         };

options/custom/programs/firefox/firefox.nix

@@ -17,7 +17,7 @@ in {
       {
         # https://www.mozilla.org/en-US/firefox/developer
         programs.firefox = mkMerge [
-          (import "${inputs.self}/modules/firefox/default.nix" {inherit config inputs lib pkgs;})
+          (import ./.common.nix {inherit config inputs lib pkgs;})
 
           {
             enable = true;

options/custom/programs/firefox/librewolf.nix

@@ -18,7 +18,7 @@ in {
         # https://librewolf.net/
         # https://codeberg.org/librewolf
         programs.librewolf = mkMerge [
-          (import "${inputs.self}/modules/firefox/default.nix" {inherit config inputs lib pkgs;})
+          (import ./.common.nix {inherit config inputs lib pkgs;})
 
           {
             enable = true;

options/custom/programs/firefox/userContent.css

@@ -0,0 +1,9 @@
+/***
+https://github.com/rafaelmardojai/firefox-gnome-theme
+***/
+
+@-moz-document url("about:newtab"), url("about:home"), url("about:blank") {
+  body {
+    background-color: #073642 !important;
+  }
+}

options/custom/programs/firefox/zen-browser.nix

@@ -18,7 +18,7 @@ in {
         # https://zen-browser.app/
         # https://github.com/youwen5/zen-browser-flake
         programs.zen-browser = mkMerge [
-          (import "${inputs.self}/modules/firefox/default.nix" {
+          (import ./.common.nix {
             inherit config inputs lib pkgs;
 
             # TODO: Revisit Zen themes
@@ -28,24 +28,30 @@ in {
           {
             enable = true;
 
-            profiles.default.settings = {
-              "zen.pinned-tab-manager.close-shortcut-behavior" = "reset-unload-switch";
-              "zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url" = true;
-              "zen.tab-unloader.timeout-minutes" = 60;
-              "zen.theme.accent-color" = "#d33682";
-              "zen.theme.color-prefs.colorful" = false;
-              "zen.theme.color-prefs.use-workspace-colors" = true;
-              "zen.theme.pill-button" = true;
-              "zen.urlbar.replace-newtab" = false;
-              "zen.view.compact.hide-toolbar" = true;
-              "zen.view.sidebar-expanded" = false;
-              "zen.view.use-single-toolbar" = false;
-              "zen.welcome-screen.seen" = true;
-              "zen.workspaces.container-specific-essentials-enabled" = true;
-              "zen.workspaces.force-container-workspace" = true;
-              "zen.workspaces.hide-deactivated-workspaces" = true;
-              "zen.workspaces.individual-pinned-tabs" = false;
-              "zen.workspaces.show-icon-strip" = false;
+            profiles.default = {
+              settings = {
+                "zen.pinned-tab-manager.close-shortcut-behavior" = "reset-unload-switch";
+                "zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url" = true;
+                "zen.splitView.change-on-hover" = true;
+                "zen.tab-unloader.timeout-minutes" = 60;
+                "zen.theme.accent-color" = "#d33682";
+                "zen.theme.color-prefs.colorful" = false;
+                "zen.theme.color-prefs.use-workspace-colors" = true;
+                "zen.theme.pill-button" = true;
+                "zen.urlbar.replace-newtab" = false;
+                "zen.view.compact.hide-toolbar" = true;
+                "zen.view.show-newtab-button-top" = false;
+                "zen.view.sidebar-expanded" = false;
+                "zen.view.use-single-toolbar" = false;
+                "zen.welcome-screen.enabled" = false;
+                "zen.welcome-screen.seen" = true;
+                "zen.workspaces.container-specific-essentials-enabled" = true;
+                "zen.workspaces.force-container-workspace" = true;
+                "zen.workspaces.hide-deactivated-workspaces" = true;
+                "zen.workspaces.individual-pinned-tabs" = false;
+                "zen.workspaces.show-icon-strip" = true;
+                "zen.workspaces.show-workspace-indicator" = false;
+              };
             };
           }
         ];

options/default.nix

@@ -1,5 +1,5 @@
 {lib, ...}:
 with lib; {
-  # Import all *.nix options from custom directory
-  imports = filter (f: strings.hasSuffix ".nix" f) (filesystem.listFilesRecursive ./custom);
+  # Import all *.nix options from custom directory, excluding .*.nix
+  imports = filter (f: hasSuffix ".nix" f && !hasPrefix "." (builtins.baseNameOf f)) (filesystem.listFilesRecursive ./custom);
 }