diff --git a/suites/default.nix b/suites/default.nix
index ea3e76c..540caeb 100644
--- a/suites/default.nix
+++ b/suites/default.nix
@@ -2,9 +2,9 @@
 {
   system = with profiles; rec {
     base = [ users.mae users.root ];
-    workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents ];
-    desktop = workstation ++ [ amd school three_dee ];
-    lap = workstation ++ [ laptop bluetooth print networkmanager ];
+    workstation = [ users.root sway develop game profiles.workstation ssh flatpak torrents ];
+    desktop = workstation ++ [ users.mae-desk amd school three_dee ];
+    lap = workstation ++ [ users.mae-lap laptop bluetooth print networkmanager ];
   };
   user = with userProfiles; rec {
     base = [ direnv git ];
diff --git a/users/mae-desk/default.nix b/users/mae-desk/default.nix
new file mode 100644
index 0000000..a94d811
--- /dev/null
+++ b/users/mae-desk/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home-manager.users.mae = {
+    imports = [ ../mae/home-manager-base.nix ../profiles/sway/desktop.nix ];
+  };
+  users = (import ../mae/user.nix { inherit pkgs; });
+}
diff --git a/users/mae-lap/default.nix b/users/mae-lap/default.nix
new file mode 100644
index 0000000..c3b87c0
--- /dev/null
+++ b/users/mae-lap/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home-manager.users.mae = {
+    imports = [ ../mae/home-manager-base.nix ../profiles/sway/laptop.nix ];
+  };
+  users = (import ../mae/user.nix { inherit pkgs; });
+}
diff --git a/users/mae/default.nix b/users/mae/default.nix
deleted file mode 100644
index bc6d88e..0000000
--- a/users/mae/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  home-manager.users.mae = {
-    imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/sway ];
-    home.packages = with pkgs; [
-      arc-theme
-    ];
-
-    home.sessionVariables = {
-      XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
-      NIX_BUILD_SHELL = "zsh";
-    };
-    gtk.theme.name = "arc-dark";
-  };
-  users.users.mae = {
-    uid = 1000;
-
-    isNormalUser = true;
-    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
-    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" ];
-  };
-}
diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix
new file mode 100644
index 0000000..1b61f57
--- /dev/null
+++ b/users/mae/home-manager-base.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ];
+  home.packages = with pkgs; [
+    arc-theme
+  ];
+
+  home.sessionVariables = {
+    XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
+    NIX_BUILD_SHELL = "zsh";
+  };
+  gtk.theme.name = "arc-dark";
+}
diff --git a/users/mae/user.nix b/users/mae/user.nix
new file mode 100644
index 0000000..8c1957a
--- /dev/null
+++ b/users/mae/user.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  users.mae = {
+    uid = 1000;
+
+    isNormalUser = true;
+    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
+    shell = pkgs.zsh;
+    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" ];
+  };
+}
diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/desktop.nix
similarity index 95%
rename from users/profiles/sway/default.nix
rename to users/profiles/sway/desktop.nix
index eb8f149..f5f4fd8 100644
--- a/users/profiles/sway/default.nix
+++ b/users/profiles/sway/desktop.nix
@@ -27,7 +27,6 @@
     enable = true;
     bars.bar_0 = {
       blocks = [
-        #{ block = "backlight"; }
         { block = "hueshift"; }
         {
           block = "disk_space";
@@ -50,7 +49,6 @@
           interval = 1;
         }
         { block = "sound"; }
-        #{ block = "battery"; }
         {
           block = "time";
           interval = 60;
diff --git a/users/profiles/sway/laptop.nix b/users/profiles/sway/laptop.nix
new file mode 100644
index 0000000..c282693
--- /dev/null
+++ b/users/profiles/sway/laptop.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, ... }:
+let
+  desk = (import ./desktop.nix { inherit pkgs; });
+  desk_blocks = desk.programs.i3status-rust.bars.bar_0.blocks;
+  lap_blocks = [{ block = "backlight"; } { block = "battery"; }] ++ desk_blocks;
+  lap = lib.recursiveUpdate desk { programs.i3status-rust.bars.bar_0.blocks = lap_blocks; };
+in
+lap