diff --git a/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-home-nix.conf b/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-home-nix.conf
index 18c64b7..17c2ad6 100644
--- a/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-home-nix.conf
+++ b/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-home-nix.conf
@@ -2,7 +2,8 @@
 ### MONITORS ###
 ################
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=Virtual-1,1920x1080,0x0,1
+monitor=HDMI-A-1,1920x1080@60,0x0,1
+monitor=HDMI-A-2,1920x1080@60,1920x0,1
 
 workspace = 1, monitor:HDMI-A-1
 workspace = 2, monitor:HDMI-A-1
diff --git a/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-work-nix.conf b/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-work-nix.conf
index d106ee1..f3c09e5 100644
--- a/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-work-nix.conf
+++ b/modules/optionnals/desktop/config/etc/xdg/hypr/hyprland-work-nix.conf
@@ -2,14 +2,16 @@
 ### MONITORS ###
 ################
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=eDP-1,1920x1200,0x0,1
+monitor=DP-4,1920x1080@60,0x0,1
+monitor=DP-5,3840x2160@60,1920x0,1.5
+monitor=eDP-1,1920x1200@60,5760x0,1
 
-workspace = 1, monitor:eDP-1
-workspace = 2, monitor:eDP-1
-workspace = 3, monitor:eDP-1
-workspace = 4, monitor:eDP-1
-workspace = 5, monitor:eDP-1
-workspace = 6, monitor:eDP-1
+workspace = 1, monitor:DP-4
+workspace = 2, monitor:DP-4
+workspace = 3, monitor:DP-4
+workspace = 4, monitor:DP-5
+workspace = 5, monitor:DP-5
+workspace = 6, monitor:DP-5
 workspace = 7, monitor:eDP-1
 workspace = 8, monitor:eDP-1
 workspace = 9, monitor:eDP-1
diff --git a/modules/optionnals/desktop/config/etc/xdg/waybar/config.jsonc b/modules/optionnals/desktop/config/etc/xdg/waybar/config-home-nix.jsonc
similarity index 100%
rename from modules/optionnals/desktop/config/etc/xdg/waybar/config.jsonc
rename to modules/optionnals/desktop/config/etc/xdg/waybar/config-home-nix.jsonc
diff --git a/modules/optionnals/desktop/config/etc/xdg/waybar/config-work-nix.jsonc b/modules/optionnals/desktop/config/etc/xdg/waybar/config-work-nix.jsonc
new file mode 100644
index 0000000..69de034
--- /dev/null
+++ b/modules/optionnals/desktop/config/etc/xdg/waybar/config-work-nix.jsonc
@@ -0,0 +1,102 @@
+{
+  "position": "top",
+  "reload_style_on_change": true,
+  "modules-left": [
+    "custom/logo",
+    "cpu",
+    "memory",
+    "disk",
+    "network",
+    "pulseaudio",
+  ],
+  "modules-center": [
+    "hyprland/workspaces"
+  ],
+  "modules-right": [
+    "custom/maj",
+    "clock",
+    "tray"
+  ],
+  "custom/logo": {
+    "format": "{icon}",
+    "format-icons": {
+      "default": "  "
+    }
+  },
+  "cpu": {
+    "format": "  {usage}% ",
+    "tooltip": true
+  },
+  "memory": {
+    "format": "  {percentage}% ",
+    "tooltip": true,
+    "tooltip-format": "asd: {used:0.2f} G / {total:0.2f} G"
+  },
+  "disk": {
+    "interval": 300,
+    "format": "  {percentage_used}% ",
+    "path": "/"
+  },
+  "network": {
+    "format-wifi": "<span size='12000'> 󰤨 </span>{essid} ",
+    "format-ethernet": "  {ipaddr} ",
+    "tooltip-format": " 󰅧 {bandwidthUpBytes}  󰅢 {bandwidthDownBytes}",
+    "format-linked": " 󱘖 {ifname} (No IP) ",
+    "format-disconnected": "  Disconnected ",
+    "format-alt": " 󰤨 {signalStrength}% ",
+    "interval": 1
+  },
+  "pulseaudio": {
+    "format": "{icon}{volume}% ",
+    "format-muted": " 󰖁 0% ",
+    "format-icons": {
+      "headphone": "  ",
+      "hands-free": "  ",
+      "headset": "  ",
+      "phone": "  ",
+      "portable": "  ",
+      "car": "  ",
+      "default": [
+        "  ",
+        "  ",
+        "  "
+      ]
+    },
+    "on-click-right": "pavucontrol -t 3",
+    "on-click": "pactl -- set-sink-mute 0 toggle",
+    "tooltip": false,
+    "tooltip-format": "{volume}%",
+    "scroll-step": 5.0,
+  },
+  "hyprland/workspaces": {
+    "disable-scroll": false,
+    "all-outputs": false,
+    "on-click": "activate",
+    "persistent-workspaces": {
+      "DP-4": [1, 2, 3],
+      "DP-5": [4, 5, 6],
+      "eDP-1": [7, 8, 9],
+    },
+    "format": "{name}",
+    "format-icons": {
+      "default": "",
+    },
+  },
+  "custom/maj": {
+    "exec": "/etc/xdg/scripts/update.sh",
+    "interval": 300,
+    "return-type": "json",
+    "format": "{icon}{text}",
+    "format-icons": {
+      "default": "  "
+    }
+  },
+  "clock": {
+    "format": "  {:%a %d %H:%M} ",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+  },
+  "tray": {
+    "icon-size": 18,
+    "spacing": 6
+  }
+}
diff --git a/modules/optionnals/desktop/wayland.nix b/modules/optionnals/desktop/wayland.nix
index ca37f4d..27d9913 100644
--- a/modules/optionnals/desktop/wayland.nix
+++ b/modules/optionnals/desktop/wayland.nix
@@ -32,7 +32,9 @@
           $rofi = ${pkgs.rofi}/bin/rofi -show drun -show-icons -config /etc/xdg/rofi/config.rasi
         '';
       };
-      "xdg/waybar".source = ./config/etc/xdg/waybar;
+      "xdg/waybar/colors.css".source = ./config/etc/xdg/waybar/colors.css;
+      "xdg/waybar/config.jsonc".source = ./config/etc/xdg/waybar/config-${hostname}.jsonc;
+      "xdg/waybar/style.css".source = ./config/etc/xdg/waybar/style.css;
       "xdg/scripts/update.sh".source = ./config/etc/xdg/scripts/update.sh;
     };
   };
diff --git a/modules/optionnals/hosts/work-nix.nix b/modules/optionnals/hosts/work-nix.nix
index db7cd5c..e40a88d 100644
--- a/modules/optionnals/hosts/work-nix.nix
+++ b/modules/optionnals/hosts/work-nix.nix
@@ -1,4 +1,5 @@
 {
+  pkgs,
   ...
 }:
 {
@@ -25,4 +26,7 @@
     ### Import Graphics modules
     ../desktop/amd.nix
   ];
+
+  networking.wireless.iwd.enable = true;
+
 }