diff --git a/guix/base.scm b/guix/base.scm
index 26d277b..0e843da 100644
--- a/guix/base.scm
+++ b/guix/base.scm
@@ -148,11 +148,14 @@ YOUR-USER-NAME  ALL=(ALL) NOPASSWD:/run/current-system/profile/bin/chvt,/run/cur
                      (guix-service-type config => (guix-configuration
                                                    (inherit config)
                                                    (substitute-urls
-                                                    (append (list "https://substitutes.nonguix.org")
+                                                    (append (list "https://substitutes.nonguix.org" "http://172.16.1.7:8080")
                                                             %default-substitute-urls))
                                                    (authorized-keys
-                                                    (append (list (plain-file "nonguix.pub" "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))"))
-                                                            %default-authorized-guix-keys))))
+                                                    (append (list
+                                                             (plain-file "nonguix.pub" "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")
+                                                             (plain-file "kaladin.pub"  "(public-key (ecc (curve Ed25519) (q #7C5E5BEDFC0650E10AE70762F481021C0633C57376DFC7B1C3C4BE0115FD4264#)))"))
+                                                            %default-authorized-guix-keys))
+                                                   (discover? #t)))
                      ;; greetd-service-type provides "greetd" PAM service
                      (delete login-service-type)
                      (delete console-font-service-type)
diff --git a/guix/channels.scm b/guix/channels.scm
index 42aac5f..2032891 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -26,11 +26,13 @@
        (name 'rosenthal)
        (url "https://codeberg.org/hako/rosenthal.git")
        (branch "trunk")
+       (commit
+        "5cf74520915e50c92b4b327bfacbd25a5b0d1369")
        (introduction
         (make-channel-introduction
          "7677db76330121a901604dfbad19077893865f35"
-         (openpgp-fingerprint
-          "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
+            (openpgp-fingerprint
+             "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
       (channel
        (name 'rde)
        (url "https://git.sr.ht/~abcdw/rde")
diff --git a/guix/home.nix b/guix/home.nix
index 1cbd510..61a65e9 100644
--- a/guix/home.nix
+++ b/guix/home.nix
@@ -6,33 +6,33 @@
   home.stateVersion = "23.05";
   programs.home-manager.enable = true;
   home.packages = with pkgs; [
-    # eww-wayland
+    eww-wayland
     swww
     starship
     # The guix version of dolphin isn't built for wayland and can't find the icon theme
     dolphin
     ark
     pmbootstrap
-    element-desktop
+    element-desktop-wayland
   ];
 
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox-wayland.override {
-      cfg = {
-        enableTridactylNative = true;
-        enablePlasmaBrowserIntegration = true;
-      };
-    };
-    profiles.chris = {
-      name = "default";
-      path = "chris.default";
-      isDefault = true;
-    };
-  };
+  # programs.firefox = {
+  #   enable = true;
+  #   package = pkgs.firefox-wayland.override {
+  #     cfg = {
+  #       enableTridactylNative = true;
+  #       enablePlasmaBrowserIntegration = true;
+  #     };
+  #   };
+  #   profiles.chris = {
+  #     name = "default";
+  #     path = "chris.default";
+  #     isDefault = true;
+  #   };
+  # };
 
 
-  home.file.".mozilla/native-messaging-hosts".source = "/home/chris/.nix-profile/lib/mozilla/native-messaging-hosts";
+  # home.file.".mozilla/native-messaging-hosts".source = "/home/chris/.nix-profile/lib/mozilla/native-messaging-hosts";
 
   accounts.email = {
     maildirBasePath = "mail";
diff --git a/guix/kaladin.scm b/guix/kaladin.scm
index 2f3a15d..3115993 100644
--- a/guix/kaladin.scm
+++ b/guix/kaladin.scm
@@ -43,4 +43,13 @@
                        (device (uuid
                                 "9b5a1a62-0de6-4e07-a541-634736980d10"
                                 'btrfs))
-                       (type "btrfs")) %base-file-systems)))
+                       (type "btrfs")
+                       (options "noatime,ssd,space_cache,clear_cache,compress=zstd"))
+                      (file-system
+                       (mount-point "/home/chris/storage")
+                       (device (uuid
+                                "4c7d4273-7b72-4aa8-8e1c-e281543d06cb"
+                                'btrfs))
+                       (type "btrfs")
+                       (options "space_cache,clear_cache,compress=zstd"))
+                      %base-file-systems)))
diff --git a/guix/syl.scm b/guix/syl.scm
index 603eb49..c60aa07 100644
--- a/guix/syl.scm
+++ b/guix/syl.scm
@@ -34,4 +34,6 @@
                          (device (uuid
                                   "db28ba7c-a15d-4c81-8373-99f2f171cac5"
                                   'btrfs))
-                         (type "btrfs")) %base-file-systems)))
+                         (type "btrfs")
+                         (options "ssd,space_cache,clear_cache,compress=zstd"))
+                       %base-file-systems)))