reenable ipv6; reconfigure browser

4 files changed, 18 insertions, 14 deletions

diff --git a/machines.nix b/machines.nix
index 1419a60..7e5e301 100644
--- a/machines.nix
+++ b/machines.nix
@@ -30,6 +30,9 @@
 
       # apps
       ./modules/nixos/steam.nix
+
+      # substitutors
+      ./substitutors.nix
     ];
   };
   "109-199-104-83" = {
diff --git a/modules/nixos/openvpn-client.nix b/modules/nixos/openvpn-client.nix
index 1ba8571..c68130f 100644
--- a/modules/nixos/openvpn-client.nix
+++ b/modules/nixos/openvpn-client.nix
@@ -1,8 +1,11 @@
-{lib, ...}: {
+{
   services.openvpn.servers = {
     "173.249.5.230" = {config = ''config /etc/openvpn-confs/173.249.5.230.ovpn'';};
   };
-  networking.enableIPv6 = lib.mkForce false;
   environment.persistence."/persist".directories = ["/etc/openvpn-confs"];
-  boot.kernelParams = ["ipv6.disable=1"];
+
+  # turns out disabling ipv6 is a bad idea; I'm just going to enable v6 on the remote xD
+  #  networking.enableIPv6 = lib.mkForce false;
+  # workaround; NetworkManager reenables ipv6 without the following
+  #  boot.kernelParams = ["ipv6.disable=1"];
 }
diff --git a/substitutors.nix b/substitutors.nix
new file mode 100644
index 0000000..079d8af
--- /dev/null
+++ b/substitutors.nix
@@ -0,0 +1,8 @@
+{
+  # spectrum
+  nix.settings.substituters = ["https://cache.dataaturservice.se/spectrum/"];
+  nix.settings.trusted-public-keys = [
+    "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    "spectrum-os.org-2:foQk3r7t2VpRx92CaXb5ROyy/NBdRJQG2uX2XJMYZfU="
+  ];
+}
diff --git a/users/andromeda/home.nix b/users/andromeda/home.nix
index 1506db4..e921844 100644
--- a/users/andromeda/home.nix
+++ b/users/andromeda/home.nix
@@ -101,7 +101,7 @@ in {
           pkgs.nur.repos.rycee.firefox-addons.tridactyl
         ];
         search = {
-          default = "repos";
+          default = "ddghtml";
           privateDefault = "ddghtml";
           order = [
             "wiki"
@@ -159,16 +159,6 @@ in {
                 }
               ];
             };
-
-            "repos" = {
-              template = "https://html.duckduckgo.com/html/";
-              params = [
-                {
-                  name = "q";
-                  value = "{searchTerms}+(site:*.gitlab.org OR site:github.com OR site:git.mtgmonkey.net OR site:sr.ht)";
-                }
-              ];
-            };
           };
         };
         settings = {