diff --git a/home/config-files/waybar-mocha.css b/home/config-files/waybar-mocha.css
index f6a10d7..3fbd093 100644
--- a/home/config-files/waybar-mocha.css
+++ b/home/config-files/waybar-mocha.css
@@ -81,7 +81,11 @@ window#waybar {
 #battery.bat2,
 #battery.bat3,
 #cpu,
+#disk,
+#disk.HDD1,
+#disk.HDD2,
 #memory,
+#keyboard-state,
 #temperature,
 #network,
 #pulseaudio,
diff --git a/home/modules/wm.nix b/home/modules/wm.nix
index a968b99..4306b4f 100644
--- a/home/modules/wm.nix
+++ b/home/modules/wm.nix
@@ -26,16 +26,54 @@
           layer = "top";
           position = "top";
           height = 30;
-          # modules-left = ["wlr/workspaces"];
-          #modules-center = [ "hyprland/window" ];
-          modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
+          modules-left = ["hyprland/workspaces" "keyboard-state"];
+          modules-center = ["cpu" "memory" "disk" "disk#HDD1" "disk#HDD2" "network" ];
+          modules-right = ["tray" "battery" "battery#bat2" "battery#bat3" "clock"];
           "tray" = {"icon-size" = 21;};
           "network" = {
+	    "interval" = 3;
             "format-wifi" = "NET: {essid} ({signalStrength}%) ";
-            "format-ethernet" = "{ifname} ";
+            "format-ethernet" = "NET: {ipaddr}/{cidr}  {bandwidthUpBits}  {bandwidthDownBits} ";
             "format-disconnected" = "";
             "max-length" = 50;
           };
+          "keyboard-state" = {
+            "numlock" = true;
+            "capslock" = true;
+            "format" = {
+              "numlock" = "N {icon}";
+              "capslock" = "C {icon}";
+            };
+            "format-icons" = {
+              "locked" = "";
+              "unlocked" = "";
+            };
+          };
+
+          "cpu" = {
+            "interval" = 1;
+            "format" = "{}% ";
+            "max-length" = 10;
+          };
+          "disk" = {
+            "interval" = 10;
+            "format" = "󰋊 {percentage_free}% {path}";
+            "path" = "/";
+          };
+          "disk#HDD1" = {
+            "interval" = 10;
+            "format" = "󰋊 {percentage_free}% {path}";
+            "path" = "/mnt/HDD1/";
+          };
+          "disk#HDD2" = {
+            "interval" = 10;
+            "format" = "󰋊 {percentage_free}% {path}";
+            "path" = "/mnt/HDD2/";
+          };
+          "memory" = {
+            "interval" = 2;
+            "format" = "{used:0.1f}G/{total:0.1f}G ";
+          };
           "battery" = {
             "bat" = "BAT0";
             "interval" = 10;
diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix
index c2a54b0..3d431c5 100644
--- a/hosts/x86_64-linux/asmodeus/default.nix
+++ b/hosts/x86_64-linux/asmodeus/default.nix
@@ -146,7 +146,6 @@
 
   services.blueman.enable = true;
 
-
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
diff --git a/hosts/x86_64-linux/beleth/conduit.nix b/hosts/x86_64-linux/beleth/conduit.nix
index 05a4fab..7bf43eb 100644
--- a/hosts/x86_64-linux/beleth/conduit.nix
+++ b/hosts/x86_64-linux/beleth/conduit.nix
@@ -13,8 +13,14 @@
         allow_encryption = true;
         allow_registration = false;
         max_request_size = 20000000;
+        address = "::1";
         port = 6167;
         database_backend = "sqlite";
+        turn_uris = [
+          "turn:staticauth.openrelay.metered.ca:80?transport=udp"
+          "turn:staticauth.openrelay.metered.ca:80?transport=tcp"
+        ];
+        turn_secret = "openrelayprojectsecret";
       };
       extraEnvironment = {
         CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix
index 80c9327..ee9a9c7 100644
--- a/hosts/x86_64-linux/beleth/default.nix
+++ b/hosts/x86_64-linux/beleth/default.nix
@@ -15,7 +15,7 @@ with lib; {
     ./fail2ban.nix
     ./lanrarari.nix
     # ./hydra.nix
-    # ./conduit.nix
+    ./conduit.nix
     ./uptime.nix
     ./networking.nix
     ./git.nix
@@ -45,11 +45,11 @@ with lib; {
                file_server
         '';
       };
-      "matrix.heroin.trade" = {
-        extraConfig = ''
-          reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
-        '';
-      };
+      # "matrix.heroin.trade" = {
+      #   extraConfig = ''
+      #     reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
+      #   '';
+      # };
       "hydra.heroin.trade" = {
         extraConfig = ''
           reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
@@ -130,10 +130,10 @@ with lib; {
         '';
       };
       "marie.software" = {
-	extraConfig = ''
-	  root * /var/www/marie-website/
-	  file_server
-	'';
+        extraConfig = ''
+          root * /var/www/marie-website/
+          file_server
+        '';
       };
       "servers" = {
         extraConfig = ''
diff --git a/justfile b/justfile
index 32b92b1..0c2577d 100644
--- a/justfile
+++ b/justfile
@@ -30,7 +30,7 @@ beleth:
 website:
   #!/usr/bin/env bash
   set -euxo pipefail
-  ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && sh build_website.sh";
+  ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && cd /var/www/website/ && git pull && cd && sh build_website.sh";
   exit
 
 update: