nix: ignore .*.nix modules

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

modules/firefox/userChrome.css

@@ -1,34 +0,0 @@
-/***
-https://github.com/rafaelmardojai/firefox-gnome-theme
-***/
-
-:root {
-  --gnome-accent: #d33682;
-  --gnome-window-background: #002b36;
-  --gnome-window-color: #93a1a1;
-  --gnome-view-background: #073642;
-  --gnome-sidebar-background: #002b36;
-  --gnome-secondary-sidebar-background: #002b36;
-  --gnome-menu-background: #073642;
-  --gnome-headerbar-background: #002b36;
-  --gnome-toolbar-icon-fill: #93a1a1;
-  --gnome-tabbar-tab-hover-background: #073642;
-  --gnome-tabbar-tab-active-background: #073642;
-  --gnome-tabbar-tab-active-hover-background: #073642;
-}
-
-:root:-moz-window-inactive {
-  --gnome-inactive-entry-color: #586e75;
-  --gnome-tabbar-tab-hover-background: #073642;
-  --gnome-tabbar-tab-active-background: #073642;
-}
-
-/* Center bookmarks */
-#PlacesToolbarItems {
-  justify-content: center;
-}
-
-/* Disable bookmark folder icons */
-.bookmark-item[container] > .toolbarbutton-icon {
-  display: none;
-}

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 ''
+    userChrome = ''
-      @import "${inputs.firefox-gnome-theme}/userContent.css";
+      ${
+        if theme
+        then "@import ${inputs.firefox-gnome-theme}/userChrome.css"
+        else ""
+      }
+
+      ${builtins.readFile ./userChrome.css}
     '';
 
-    userChrome = mkIf theme ''
+    userContent = ''
-      @import "${inputs.firefox-gnome-theme}/userChrome.css";
+      ${
-      ${builtins.readFile ./userChrome.css}
+        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/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

options/default.nix

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