diff --git a/users/caperren/caperren.nix b/users/caperren/caperren.nix
index 7d3da2a..9b615da 100644
--- a/users/caperren/caperren.nix
+++ b/users/caperren/caperren.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 let
-  kanshiConfigPath = ./. + "/dotfiles/kanshi/${config.networking.hostName}/config";
+  kanshiConfigPath = ./. + "/dotfiles/kanshi/${config.networking.hostName}";
+  waybarConfigPath = ./. + "/dotfiles/waybar/${config.networking.hostName}";
 in
 {
   users.users.caperren = {
@@ -31,7 +32,8 @@ in
       userEmail = "caperren@gmail.com";
     };
 
-    home.file.".config/kanshi/config".source = kanshiConfigPath;
+    home.file.".config/kanshi/config".source = kanshiConfigPath + "/config";
+    home.file.".config/waybar/config".source = waybarConfigPath + "/config";
     home.file.".config/wlogout/layout".source = ./dotfiles/wlogout/layout;
   };
 }
diff --git a/users/caperren/dotfiles/waybar/cap-nr200p/config b/users/caperren/dotfiles/waybar/cap-nr200p/config
new file mode 100644
index 0000000..5388a83
--- /dev/null
+++ b/users/caperren/dotfiles/waybar/cap-nr200p/config
@@ -0,0 +1,122 @@
+{
+  "layer": "top",
+  "position": "top",
+  "modules-left": [
+    "custom/logo",
+    "clock",
+    "disk",
+    "memory",
+    "cpu",
+    "hyprland/window"
+  ],
+  "modules-center": [
+    "hyprland/workspaces"
+  ],
+  "modules-right": [
+    "tray",
+    "idle_inhibitor",
+    "pulseaudio",
+    "custom/exit"
+  ],
+  "reload_style_on_change": true,
+  "custom/logo": {
+    "format": "<span font='20'></span>",
+    "tooltip": false
+  },
+  "hyprland/workspaces": {
+    "all-outputs": false,
+    "format": "{icon}",
+    "format-icons": {
+      "1": "1",
+      "2": "2",
+      "3": "3",
+      "4": "4",
+      "5": "5",
+      "6": "6",
+      "7": "7",
+      "8": "8",
+      "9": "9"
+    }
+  },
+  "idle_inhibitor": {
+    "format": "<span font='16'>{icon}</span>",
+    "format-icons": {
+      "activated": "󰈈",
+      "deactivated": "󰈉"
+    }
+  },
+  "clock": {
+    "format": "{:%I:%M:%S %p | %a | %F}",
+    "interval": 1,
+    "tooltip-format": "\n<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "calendar-weeks-pos": "right",
+    "today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
+    "format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
+    "format-calendar-weeks": "<span color='#aeaeae'><b>W{:%V}</b></span>",
+    "format-calendar-weekdays": "<span color='#aeaeae'><b>{}</b></span>"
+  },
+  "disk": {
+    "interval": 30,
+    "format": "  {percentage_used}%",
+    "path": "/"
+  },
+  "cpu": {
+    "interval": 1,
+    "format": " {usage}%",
+    "min-length": 6,
+    "max-length": 6,
+    "format-icons": [
+      "▁",
+      "▂",
+      "▃",
+      "▄",
+      "▅",
+      "▆",
+      "▇",
+      "█"
+    ]
+  },
+  "memory": {
+    "format": " {percentage}%"
+  },
+  "hyprland/window": {
+    "format": "( {class} )",
+    "rewrite": {
+      "(.*) - Mozilla Firefox": "🌎 $1",
+      "(.*) - zsh": "> [$1]"
+    }
+  },
+  "pulseaudio": {
+    "format": "{volume:02}% {icon}",
+    "format-bluetooth": "󰂰",
+    "format-muted": "00% {icon}",
+    "format-icons": {
+      "headphones": "",
+      "bluetooth": "󰥰",
+      "handsfree": "",
+      "headset": "󱡬",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": [
+        "🕨",
+        "🕩",
+        "🕪"
+      ]
+    },
+    "justify": "center",
+    "on-click": "amixer sset Master toggle",
+    "on-click-right": "pavucontrol",
+    "tooltip-format": "{icon} {volume:02}%"
+  },
+  "tray": {
+    "icon-size": 14,
+    "spacing": 10
+  },
+  "custom/exit": {
+    "format": "",
+    "on-click": "wlogout -b 2",
+    "tooltip": false
+  }
+}
+
diff --git a/users/caperren/dotfiles/waybar/cap-slim7/config b/users/caperren/dotfiles/waybar/cap-slim7/config
new file mode 100644
index 0000000..dedaf9c
--- /dev/null
+++ b/users/caperren/dotfiles/waybar/cap-slim7/config
@@ -0,0 +1,149 @@
+{
+  "layer": "top",
+  "position": "top",
+  "modules-left": [
+    "custom/logo",
+    "clock",
+    "disk",
+    "memory",
+    "cpu",
+    "hyprland/window"
+  ],
+  "modules-center": [
+    "hyprland/workspaces"
+  ],
+  "modules-right": [
+    "tray",
+    "idle_inhibitor",
+    "pulseaudio",
+    "battery",
+    "backlight",
+    "custom/exit"
+  ],
+  "reload_style_on_change": true,
+  "custom/logo": {
+    "format": "<span font='20'></span>",
+    "tooltip": false
+  },
+  "hyprland/workspaces": {
+    "all-outputs": false,
+    "format": "{icon}",
+    "format-icons": {
+      "1": "1",
+      "2": "2",
+      "3": "3",
+      "4": "4",
+      "5": "5",
+      "6": "6",
+      "7": "7",
+      "8": "8",
+      "9": "9"
+    }
+  },
+  "backlight": {
+    "device": "intel_backlight",
+    "format": "{percent}% {icon}",
+    "format-icons": [
+      "",
+      ""
+    ]
+  },
+  "battery": {
+    "bat": "BAT0",
+    "interval": 60,
+    "states": {
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "{capacity}% {icon}",
+    "format-icons": [
+      "",
+      "",
+      "",
+      "",
+      ""
+    ],
+    "max-length": 25
+  },
+  "idle_inhibitor": {
+    "format": "<span font='16'>{icon}</span>",
+    "format-icons": {
+      "activated": "󰈈",
+      "deactivated": "󰈉"
+    }
+  },
+  "clock": {
+    "format": "{:%I:%M:%S %p | %a | %F}",
+    "interval": 1,
+    "tooltip-format": "\n<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "calendar-weeks-pos": "right",
+    "today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
+    "format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
+    "format-calendar-weeks": "<span color='#aeaeae'><b>W{:%V}</b></span>",
+    "format-calendar-weekdays": "<span color='#aeaeae'><b>{}</b></span>"
+  },
+  "disk": {
+    "interval": 30,
+    "format": "  {percentage_used}%",
+    "path": "/"
+  },
+  "cpu": {
+    "interval": 1,
+    "format": " {usage}%",
+    "min-length": 6,
+    "max-length": 6,
+    "format-icons": [
+      "▁",
+      "▂",
+      "▃",
+      "▄",
+      "▅",
+      "▆",
+      "▇",
+      "█"
+    ]
+  },
+  "memory": {
+    "format": " {percentage}%"
+  },
+  "hyprland/window": {
+    "format": "( {class} )",
+    "rewrite": {
+      "(.*) - Mozilla Firefox": "🌎 $1",
+      "(.*) - zsh": "> [$1]"
+    }
+  },
+  "pulseaudio": {
+    "format": "{volume:02}% {icon}",
+    "format-bluetooth": "󰂰",
+    "format-muted": "00% {icon}",
+    "format-icons": {
+      "headphones": "",
+      "bluetooth": "󰥰",
+      "handsfree": "",
+      "headset": "󱡬",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": [
+        "🕨",
+        "🕩",
+        "🕪"
+      ]
+    },
+    "justify": "center",
+    "on-click": "amixer sset Master toggle",
+    "on-click-right": "pavucontrol",
+    "tooltip-format": "{icon} {volume:02}%"
+  },
+  "tray": {
+    "icon-size": 14,
+    "spacing": 10
+  },
+  "custom/exit": {
+    "format": "",
+    "on-click": "wlogout -b 2",
+    "tooltip": false
+  }
+}
+
diff --git a/users/crestline/crestline.nix b/users/crestline/crestline.nix
index bcbeb38..2389627 100644
--- a/users/crestline/crestline.nix
+++ b/users/crestline/crestline.nix
@@ -9,14 +9,17 @@
       "input"
       "dialout"
     ];
-    packages = with pkgs; [ ];
-
   };
 
   services.displayManager.autoLogin = {
     enable = true;
     user = "crestline";
   };
-
   services.xserver.displayManager.gdm.autoLogin.delay = 60;
+
+  home-manager.users.crestline = {
+    home.username = "crestline";
+    home.homeDirectory = "/home/crestline";
+    home.stateVersion = "25.05";
+  };
 }