1 files changed, 50 insertions, 48 deletions
diff --git a/nixos.org b/nixos.org
index ffa412f..17ec280 100644
--- a/nixos.org
+++ b/nixos.org
@@ -13,46 +13,6 @@ stuff
       sources = import ./nix/sources.nix;
       nur = import sources.NUR { inherit pkgs; };
       nurModules = import sources.NUR { };
-      myFirefox = with pkgs; wrapFirefox firefox-esr-unwrapped {
-        nixExtensions = builtins.filter lib.isDerivation (builtins.attrValues nur.repos.crazazy.firefox-addons);
-
-        extraPolicies = {
-          CaptivePortal = false;
-          DisableFirefoxStudies = true;
-          DisablePocket = true;
-          DisableTelemetry = true;
-          DisableFirefoxAccounts = true;
-          DontCheckDefaultBrowser = true;
-          FirefoxHome = {
-            Pocket = false;
-            Snippets = false;
-          };
-          UserMessaging = {
-            ExtensionRecommendations = false;
-            SkipOnboarding = true;
-          };
-        };
-        extraPrefs = ''
-      // Show more ssl cert infos
-      lockPref("security.identityblock.show_extended_validation", true);
-      // Enable userchrome css
-      lockPref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-      // Enable dark dev tools
-      lockPref("devtools.theme","dark");
-      // Misc other settings
-      lockPref("extensions.autoDisableScopes", 0);
-      lockPref("browser.uidensity", 1);
-      lockPref("browser.search.openintab", true);
-      lockPref("extensions.update.enabled", false);
-      lockPref("identity.fxaccounts.enabled", false);
-      lockPref("signon.rememberSignons", false);
-      lockPref("signon.rememberSignons.visibilityToggle", false);
-      lockPref("media.eme.enabled", true);
-      lockPref("browser.eme.ui.enabled", true);
-      lockPref("xpinstall.signatures.required",false);
-      lockPref("browser.shell.checkDefaultBrowser", false );
-    '';
-      };
     in
     {
       imports = [
@@ -243,16 +203,58 @@ stuff
    #+end_src
 ** packages
 *** Core packages
-    These are the normal packages that I use for core maintenance
+    These are the normal packages that I use for core maintenance. I use a special hardened version of firefox that takes in some addons as well
     #+begin_src nix :noweb-ref nixos-config :tangle no
       {
-        environment.systemPackages = with pkgs; [
-          gitFull
-          curl
-          vim
-          myFirefox
-          (wine.override { wineBuild = "wineWow"; })
-        ];
+        environment.systemPackages = let
+          myFirefox = with pkgs; wrapFirefox firefox-esr-unwrapped {
+            nixExtensions = builtins.filter lib.isDerivation (builtins.attrValues nur.repos.crazazy.firefox-addons);
+
+            extraPolicies = {
+              CaptivePortal = false;
+              DisableFirefoxStudies = true;
+              DisablePocket = true;
+              DisableTelemetry = true;
+              DisableFirefoxAccounts = true;
+              DontCheckDefaultBrowser = true;
+              FirefoxHome = {
+                Pocket = false;
+                Snippets = false;
+              };
+              UserMessaging = {
+                ExtensionRecommendations = false;
+                SkipOnboarding = true;
+              };
+            };
+            extraPrefs = ''
+            // Show more ssl cert infos
+            lockPref("security.identityblock.show_extended_validation", true);
+            // Enable userchrome css
+            lockPref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
+            // Enable dark dev tools
+            lockPref("devtools.theme","dark");
+            // Misc other settings
+            lockPref("extensions.autoDisableScopes", 0);
+            lockPref("browser.uidensity", 1);
+            lockPref("browser.search.openintab", true);
+            lockPref("extensions.update.enabled", false);
+            lockPref("identity.fxaccounts.enabled", false);
+            lockPref("signon.rememberSignons", false);
+            lockPref("signon.rememberSignons.visibilityToggle", false);
+            lockPref("media.eme.enabled", true);
+            lockPref("browser.eme.ui.enabled", true);
+            lockPref("xpinstall.signatures.required",false);
+            lockPref("browser.shell.checkDefaultBrowser", false );
+          '';
+          };
+        in
+          with pkgs; [
+            gitFull
+            curl
+            vim
+            myFirefox
+            (wine.override { wineBuild = "wineWow"; })
+          ];
       }
     #+end_src
 *** Steam