update firefox conf

8 files changed, 49 insertions, 49 deletions

diff --git a/modules/browsers/firefox/default.nix b/modules/browsers/firefox/default.nix
index 51f9000..61a5db0 100644
--- a/modules/browsers/firefox/default.nix
+++ b/modules/browsers/firefox/default.nix
@@ -4,8 +4,8 @@
   pkgs,
   ...
 }: let
-  extraPrefs = import ./extraPrefs.nix;
-  userChrome = import ./userChrome.nix;
+  extraPrefs = lib.fileContents ./mozilla.cfg;
+  userChrome = lib.fileContents ./userChrome.css;
   my-firefox = pkgs.firefox.override {
     extraPrefs = extraPrefs;
   };
@@ -22,7 +22,7 @@ in {
         package = my-firefox;
 
         # import configuration
-        policies = import ./policy.nix;
+        policies = import ./policies.nix;
 
         # create profile for me :3
         profiles.${config.user} = {
diff --git a/modules/browsers/firefox/policyExtensions.nix b/modules/browsers/firefox/extensions.nix
index f3dcd09..f3dcd09 100644
--- a/modules/browsers/firefox/policyExtensions.nix
+++ b/modules/browsers/firefox/extensions.nix
diff --git a/modules/browsers/firefox/extraPrefs.nix b/modules/browsers/firefox/extraPrefs.nix
deleted file mode 100644
index 74db984..0000000
--- a/modules/browsers/firefox/extraPrefs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# extra preferences that cannot be
-# set normally but have to instead
-# set in mosilla.cfg
-''  //
-
-  // Automatically click cookiebanners although uBlock Origin might block them
-  lockPref("cookiebanners.bannerClicking.enabled", true);
-  lockPref("cookiebanners.service.mode", 2);
-  lockPref("cookiebanners.service.mode.privateBrowsing", 2);
-
-  // DNT although PrivacyBadger from policy handles this
-  lockPref("privacy.donottrackheader.enabled", true);
-  lockPref("privacy.donottrackheader.value", 1);
-
-  // New sidebar
-  lockPref("sidebar.revamp", true);
-  lockPref("sidebar.verticalTabs", true);
-  lockPref("sidebar.visibility", "always-show");
-  lockPref("sidebar.main.tools", "history,bookmarks");
-
-  //''
diff --git a/modules/browsers/firefox/mozilla.cfg b/modules/browsers/firefox/mozilla.cfg
new file mode 100644
index 0000000..5e2334e
--- /dev/null
+++ b/modules/browsers/firefox/mozilla.cfg
@@ -0,0 +1,21 @@
+//
+// extra preferences that cannot be
+// set normally but have to instead
+// set in mozilla.cfg
+
+// Automatically click cookiebanners although uBlock Origin might block them
+lockPref("cookiebanners.bannerClicking.enabled", true);
+lockPref("cookiebanners.service.mode", 2);
+lockPref("cookiebanners.service.mode.privateBrowsing", 2);
+
+// DNT although PrivacyBadger from policy handles this
+lockPref("privacy.donottrackheader.enabled", true);
+lockPref("privacy.donottrackheader.value", 1);
+
+// New sidebar
+lockPref("sidebar.revamp", true);
+lockPref("sidebar.verticalTabs", true);
+lockPref("sidebar.visibility", "always-show");
+lockPref("sidebar.main.tools", "history,bookmarks");
+
+//
diff --git a/modules/browsers/firefox/policy.nix b/modules/browsers/firefox/policies.nix
index e222553..243cd9a 100644
--- a/modules/browsers/firefox/policy.nix
+++ b/modules/browsers/firefox/policies.nix
@@ -2,8 +2,8 @@
   # policies to be set in firefox
   # see: https://mozilla.github.io/policy-templates/
 
-  ExtensionSettings = import ./policyExtensions.nix;
-  Preferences = import ./policyPrefs.nix;
+  ExtensionSettings = import ./extensions.nix;
+  Preferences = import ./prefs.nix;
 
   EnableTrackingProtection = {
     Value = true;
diff --git a/modules/browsers/firefox/policyPrefs.nix b/modules/browsers/firefox/prefs.nix
index 73d2781..73d2781 100644
--- a/modules/browsers/firefox/policyPrefs.nix
+++ b/modules/browsers/firefox/prefs.nix
diff --git a/modules/browsers/firefox/userChrome.css b/modules/browsers/firefox/userChrome.css
new file mode 100644
index 0000000..e630632
--- /dev/null
+++ b/modules/browsers/firefox/userChrome.css
@@ -0,0 +1,23 @@
+
+/* sidebar hack to flip contents the way i want them (arrows on the left) */
+#nav-bar-customization-target {
+  flex-direction: row-reverse;
+}
+
+/* remove broken padding from sidebar hack */
+#unified-extensions-button {
+  padding-left: 0 !important;
+}
+
+/* remove padding beside search bar */
+toolbarspring {
+  display: none !important;
+}
+
+/* remove overflow menu and everything in it */
+#nav-bar-overflow-button,
+#firefox-view-button,
+#alltabs-button {
+  visibility: collapse;
+}
+
diff --git a/modules/browsers/firefox/userChrome.nix b/modules/browsers/firefox/userChrome.nix
deleted file mode 100644
index ab93747..0000000
--- a/modules/browsers/firefox/userChrome.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-''
-  /* sidebar hack to flip contents the way i want them (arrows on the left) */
-  #nav-bar-customization-target {
-    flex-direction: row-reverse;
-  }
-
-  /* remove broken padding from sidebar hack */
-  #unified-extensions-button {
-    padding-left: 0 !important;
-  }
-
-  /* remove padding beside search bar */
-  toolbarspring {
-    display: none !important;
-  }
-
-  /* remove overflow menu and everything in it */
-  #nav-bar-overflow-button,
-  #firefox-view-button,
-  #alltabs-button {
-    visibility: collapse;
-  }
-''