diff --git a/modules/home/windowManagers/hyprland/default.nix b/modules/home/windowManagers/hyprland/default.nix
index aba89ff..96254fa 100644
--- a/modules/home/windowManagers/hyprland/default.nix
+++ b/modules/home/windowManagers/hyprland/default.nix
@@ -24,14 +24,6 @@ let
   emoji_picker = "${pkgs.bemoji}/bin/bemoji -t";
   terminal = "${pkgs.kitty}/bin/kitty";
 
-  layout_toggle_script = pkgs.writeShellScriptBin "layout-toggle" ''
-    current_layout="$(${pkgs.hyprland}/bin/hyprctl getoption general:layout -j | ${pkgs.jq}/bin/jq -r .str)"
-    case "$current_layout" in 
-        master) ${pkgs.hyprland}/bin/hyprctl -q keyword general:layout dwindle ;;
-        dwindle) ${pkgs.hyprland}/bin/hyprctl -q keyword general:layout master ;;
-    esac
-  '';
-
   generate_grim_command = target: ''
     exec mkdir -p ~/screenshots \
     && ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" \
@@ -155,11 +147,6 @@ in
           preserve_split = true;
         };
 
-        # Master layout
-        master = {
-          orientation = "center";
-        };
-
         # Window rules
         windowrule = [
           "suppress_event maximize, match:class .*"
@@ -221,7 +208,6 @@ in
           "$mod SHIFT, o, movetoworkspace, 9"
 
           # Layout
-          "$mod, g, exec, ${layout_toggle_script}/bin/layout-toggle"
           "$mod, v, togglesplit"
           "$mod, f, fullscreen"
           "$mod SHIFT, f, togglefloating"
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index 8e1c3e7..608bb89 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -13,6 +13,7 @@ let
     ;
 
   cfg = config.aa.nix;
+  selfHostedCacheHost = "https://cache.kilonull.com/";
 in
 {
   options.aa.nix = {
@@ -71,12 +72,13 @@ in
                 if cfg.useSelfhostedCache then
                   [
                     # TESTING
-                    "https://attic.kilonull.com/nixosConfigs"
+                    "https://minio.kilonull.com/nix-store"
+                    selfHostedCacheHost
                   ]
                 else
                   [ ];
               trusted-public-keys = mkIf cfg.useSelfhostedCache [
-                "nixosConfigs:mjWq+JcnAqwT20OZSsrh9od6LTNn8U3cYdaXhqhDqP0="
+                "gospelCache:9cbn8Wm54BbwpPS0TXw+15wrYZBpfOJt4Fzfbfcq/pc="
               ];
             };
 
diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix
index 41e05a9..e31b943 100644
--- a/systems/x86_64-linux/carbon/default.nix
+++ b/systems/x86_64-linux/carbon/default.nix
@@ -9,7 +9,7 @@
   aa = {
     nix = {
       enable = true;
-      useSelfhostedCache = true;
+      useSelfhostedCache = false;
       remoteBuilder.client.enable = false;
     };