diff --git a/modules/cross-platform/home-manager/neovim.nix b/modules/cross-platform/home-manager/neovim.nix
index d8f77c0..9ee3cd6 100644
--- a/modules/cross-platform/home-manager/neovim.nix
+++ b/modules/cross-platform/home-manager/neovim.nix
@@ -111,6 +111,7 @@ in {
 
           # Setup lsp's and languages
           languages = {
+            enableLSP = true;
             enableFormat = true;
             enableTreesitter = true;
             enableExtraDiagnostics = true;
diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix
index 5c4ba3d..c98e193 100644
--- a/modules/linux/home-manager/hyprland.nix
+++ b/modules/linux/home-manager/hyprland.nix
@@ -114,11 +114,9 @@ in {
     # Setup and enable mako
     services.mako = {
       enable = true;
-      settings = {
-        defaultTimeout = 5000;
-        layer = "overlay";
-        width = 200;
-      };
+      defaultTimeout = 5000;
+      layer = "overlay";
+      width = 200;
     };
 
     # Enable hyprpaper
diff --git a/modules/servers/thor/conduit.nix b/modules/servers/thor/conduit.nix
deleted file mode 100644
index 466f457..0000000
--- a/modules/servers/thor/conduit.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{config, ...}: {
-  services.matrix-conduit = {
-    enable = true;
-    settings = {
-      global = {
-        server_name = "cronyakatsuki.xyz";
-        database_backend = "rocksdb";
-        allow_registration = true;
-        allow_check_for_updates = true;
-      };
-    };
-  };
-
-  systemd.services.conduit.serviceConfig = {
-    EnvironmentFile = ["${config.age.secrets.conduit.path}"];
-  };
-
-  services.traefik.dynamicConfigOptions.http = {
-    services.conduit.loadBalancer.servers = [
-      {
-        url = "http://localhost:6167";
-      }
-    ];
-
-    routers.conduit = {
-      rule = "Host(`matrix.cronyakatsuki.xyz`)";
-      tls = {
-        certResolver = "porkbun";
-      };
-      service = "conduit";
-      entrypoints = "websecure";
-    };
-  };
-}
diff --git a/modules/servers/thor/default.nix b/modules/servers/thor/default.nix
index 6b8e21c..55a635f 100644
--- a/modules/servers/thor/default.nix
+++ b/modules/servers/thor/default.nix
@@ -4,6 +4,5 @@
     ./forgejo.nix
     ./secrets.nix
     ./plausible.nix
-    ./conduit.nix
   ];
 }
diff --git a/modules/servers/thor/secrets.nix b/modules/servers/thor/secrets.nix
index fe7bbed..9db06d3 100644
--- a/modules/servers/thor/secrets.nix
+++ b/modules/servers/thor/secrets.nix
@@ -7,9 +7,6 @@
       plausible = {
         file = ../../../secrets/plausible.age;
       };
-      conduit = {
-        file = ../../../secrets/conduit.age;
-      };
     };
   };
 }
diff --git a/secrets/conduit.age b/secrets/conduit.age
deleted file mode 100644
index 806868a..0000000
Binary files a/secrets/conduit.age and /dev/null differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index b0a85c9..55eff04 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -22,5 +22,4 @@ in {
   "navidrome.age".publicKeys = systems ++ users;
   "forgejo-db.age".publicKeys = systems ++ users;
   "plausible.age".publicKeys = systems ++ users;
-  "conduit.age".publicKeys = systems ++ users;
 }