diff --git a/home/programs/browsers/firefox.nix b/home/programs/browsers/firefox.nix
index 0d557f0..c7bb59f 100644
--- a/home/programs/browsers/firefox.nix
+++ b/home/programs/browsers/firefox.nix
@@ -135,49 +135,24 @@ in {
                   "type" = "application/x-suggestions+json";
                 }
               ];
-              iconUpdateURL = "https://search.nezia.dev/favicon.ico";
+            };
+            "MyNixOS" = {
+              urls = [{template = "https://mynixos.com/search?q={searchTerms}";}];
+              iconUpdateURL = "https://mynixos.com/favicon.ico";
               updateInterval = 24 * 60 * 60 * 1000;
-              definedAliases = ["@s"];
-            };
-            "Nix Packages" = {
-              urls = [
-                {
-                  template = "https://search.nixos.org/packages";
-                  params = [
-                    {
-                      name = "type";
-                      value = "packages";
-                    }
-                    {
-                      name = "query";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-              definedAliases = ["@np"];
-            };
-            "NixOS Wiki" = {
-              urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
-              iconUpdateURL = "https://wiki.nixos.org/favicon.ico";
-              updateInterval = 24 * 60 * 60 * 1000;
-              definedAliases = ["@nw"];
-            };
-            "NixOS Options" = {
-              urls = [{template = "https://search.nixos.org/options?channel=unstable&type=packages&query={searchTerms}";}];
-              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-              definedAliases = ["@no"];
+              definedAliases = ["@nx"];
             };
             "Noogle" = {
               urls = [{template = "https://noogle.dev/q?term={searchTerms}";}];
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["@ng"];
             };
-            "Home Manager" = {
-              urls = [{template = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";}];
-              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-              definedAliases = ["@hm"];
+            "GitHub Nix" = {
+              # https://github.com/search?q=language%3Anix+NOT+is%3Afork+programs.neovim&type=code
+              urls = [{template = "https://github.com/search?q=language:nix NOT is:fork {searchTerms}&type=code";}];
+              iconUpdateURL = "https://github.com/favicon.ico";
+              updateInterval = 24 * 60 * 60 * 1000;
+              definedAliases = ["@ghn"];
             };
             "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
           };
diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix
index da0c285..7d97a90 100644
--- a/hosts/vamos/default.nix
+++ b/hosts/vamos/default.nix
@@ -1,43 +1,40 @@
-{
-  self,
-  specialArgs,
-  ...
-}: let
-  mod = "${self}/system";
+{specialArgs, ...}: let
+  system = ../../system;
+  home = ../../home;
 in {
   imports = [
     ./hardware-configuration.nix
     ./modules
 
-    "${mod}"
-    "${mod}/core/lanzaboote.nix"
+    "${system}"
+    "${system}/core/lanzaboote.nix"
 
-    "${mod}/hardware/fprintd.nix"
-    "${mod}/services/power.nix"
-    "${mod}/services/brightness.nix"
+    "${system}/hardware/fprintd.nix"
+    "${system}/services/power.nix"
+    "${system}/services/brightness.nix"
 
-    "${mod}/services/logind.nix"
-    "${mod}/services/greetd.nix"
-    "${mod}/services/kanata.nix"
+    "${system}/services/logind.nix"
+    "${system}/services/greetd.nix"
+    "${system}/services/kanata.nix"
 
-    "${mod}/programs/niri"
-    "${mod}/services/gnome.nix"
-    "${mod}/services/mail.nix"
+    "${system}/programs/niri"
+    "${system}/services/gnome.nix"
+    "${system}/services/mail.nix"
   ];
 
   home-manager = {
     users.nezia.imports = [
-      "${self}/home"
-      "${self}/home/services/udiskie.nix"
+      "${home}"
+      "${home}/services/udiskie.nix"
 
-      "${self}/home/programs/niri"
-      "${self}/home/programs/ags"
-      "${self}/home/programs/fuzzel.nix"
-      "${self}/home/programs/swaybg.nix"
-      "${self}/home/programs/swaylock.nix"
-      "${self}/home/programs/swayidle.nix"
+      "${home}/programs/niri"
+      "${home}/programs/ags"
+      "${home}/programs/fuzzel.nix"
+      "${home}/programs/swaybg.nix"
+      "${home}/programs/swaylock.nix"
+      "${home}/programs/swayidle.nix"
 
-      "${self}/home/terminal/emulators/foot.nix"
+      "${home}/terminal/emulators/foot.nix"
     ];
     extraSpecialArgs = specialArgs;
   };