diff --git a/configurations/laptop-elitebook/configuration.nix b/configurations/laptop-elitebook/configuration.nix
new file mode 100644
index 00000000..714c8bb8
--- /dev/null
+++ b/configurations/laptop-elitebook/configuration.nix
@@ -0,0 +1,106 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, lib, inputs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ./../../modules/nixos/cspark-desktop-plasma/module.nix
+      ./../../modules/nixos/cspark-desktop-gnome/module.nix
+      ./../../modules/nixos/cspark-desktop-sway/module.nix
+      ./../../modules/nixos/cspark-desktop-niri/module.nix
+      ./../../modules/nixos/cspark-desktop-exwm/module.nix
+      inputs.home-manager.nixosModules.default
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "cspark-nixos-elitebook"; # Define your hostname.
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Setting up my desktop computer to be able to build files for my laptop
+  # Make remote builder desktop a known host
+  programs.ssh = {
+    knownHosts = {
+      cspark-desktop-nixremotebuilder = {
+        extraHostNames = [ "cspark-nixos-desktop" "192.168.1.110" ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/A49FhfRM7cI4MykQAtKdcOXgEya2dV9nCHnO2rqHt";
+      };
+    };
+    extraConfig = ''
+    Host cspark-desktop-nixremotebuilder
+        Hostname 192.168.1.110
+        IdentitiesOnly yes
+        IdentityFile /root/.ssh/cspark-desktop-nixremotebuilder
+        # The weakly privileged user on the remote builder – if not set, 'root' is used – which will hopefully fail
+        User nixremotebuilder
+    '';
+  };
+  nix.buildMachines = [ {
+	 hostName = "cspark-desktop-nixremotebuilder";
+	 sshUser = "nixremotebuilder";
+	 system = "x86_64-linux";
+         protocol = "ssh-ng";
+	 # if the builder supports building for multiple architectures,
+	 # replace the previous line by, e.g.
+	 # systems = ["x86_64-linux" "aarch64-linux"];
+	 maxJobs = 1;
+	 speedFactor = 2;
+	 supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+	 mandatoryFeatures = [ ];
+  }] ;
+  nix.distributedBuilds = true;
+  # optional, useful when the builder has a faster internet connection than yours
+  nix.extraOptions = ''
+    builders-use-substitutes = true
+  '';
+
+  # Custom desktop environments
+  # cspark-desktop-plasma.enable = true;
+  # cspark-desktop-gnome.enable = true;
+  # cspark-desktop-sway.enable = true;
+  cspark-desktop-niri.enable = true;
+  # cspark-desktop-exwm.enable = true;
+
+  # Home Manager Configuration
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    users = {
+      "cspark" = import ./home.nix;
+    };
+  };
+
+  # Steam Game Platform
+  #programs.steam = {
+  #  enable = true;
+  #  # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+  #  # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  #  gamescopeSession.enable = true;
+  #};
+
+  # AMD graphics driver setup
+  services.xserver = {
+    videoDrivers = [ "amdgpu" ];
+  };
+
+  # Waydroid Android Emulation
+  virtualisation.waydroid.enable = true;
+
+  # Docker for development
+  virtualisation.docker.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    nvtopPackages.amd
+  ];
+
+}
diff --git a/configurations/laptop/hardware-configuration.nix b/configurations/laptop-elitebook/hardware-configuration.nix
similarity index 100%
rename from configurations/laptop/hardware-configuration.nix
rename to configurations/laptop-elitebook/hardware-configuration.nix
diff --git a/configurations/laptop-elitebook/home.nix b/configurations/laptop-elitebook/home.nix
new file mode 100644
index 00000000..d4a36623
--- /dev/null
+++ b/configurations/laptop-elitebook/home.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, ... }:
+
+{
+  imports = 
+    [
+      # Global Config, always to be included
+      ./../../global-home.nix
+      ./../../modules/nixos/cspark-desktop-plasma/home.nix
+      ./../../modules/nixos/cspark-desktop-gnome/home.nix
+      ./../../modules/nixos/cspark-desktop-sway/home.nix
+      ./../../modules/nixos/cspark-desktop-niri/home.nix
+      ./../../modules/nixos/cspark-desktop-exwm/home.nix
+    ];
+
+  # KDE Connect
+  # services.kdeconnect.enable = true; 
+  services.kdeconnect.indicator = true; 
+
+  # Custom Desktop Configurations
+  # cspark-desktop-plasma-config-1.enable = true;
+  # cspark-desktop-gnome-config-1.enable = true;
+  # cspark-desktop-sway-config-1.enable = true;
+  cspark-desktop-niri-config-1.enable = true;
+  # cspark-desktop-exwm-config-1.enable = true;
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+    #  ".local/share/applications/ncmpcpp.desktop".text = ''
+    #    [Desktop Entry]
+    #    Name=NCMPCPP
+    #    Comment=Run ncurses music player CPP
+    #    Categories=Other;
+    #    Icon=konsole
+    #    Type=Application
+    #    Exec=konsole -e ncmpcpp
+    #    Terminal=false
+    #  '';
+  };
+
+  programs.bash.shellAliases = {
+    nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#laptop-elitebook";
+    nixos-rebuild-system-flake-boot = "sudo nixos-rebuild boot --flake /etc/nixos#laptop-elitebook";
+
+    home-manager-rebuild-system-flake-switch = "nix run home-manager -- switch --flake /etc/nixos#laptop-elitebook";
+  };
+
+  home.sessionVariables = {
+    # EDITOR = "emacsclient -c";
+    EDITOR = "nvim";
+  };
+
+}
diff --git a/configurations/laptop/resources/home-manager/.config/foot/foot.ini b/configurations/laptop-elitebook/resources/home-manager/.config/foot/foot.ini
similarity index 100%
rename from configurations/laptop/resources/home-manager/.config/foot/foot.ini
rename to configurations/laptop-elitebook/resources/home-manager/.config/foot/foot.ini
diff --git a/configurations/laptop/resources/home-manager/.config/mako/config b/configurations/laptop-elitebook/resources/home-manager/.config/mako/config
similarity index 100%
rename from configurations/laptop/resources/home-manager/.config/mako/config
rename to configurations/laptop-elitebook/resources/home-manager/.config/mako/config
diff --git a/configurations/laptop/resources/home-manager/.config/networkmanager-dmenu/config.ini b/configurations/laptop-elitebook/resources/home-manager/.config/networkmanager-dmenu/config.ini
similarity index 100%
rename from configurations/laptop/resources/home-manager/.config/networkmanager-dmenu/config.ini
rename to configurations/laptop-elitebook/resources/home-manager/.config/networkmanager-dmenu/config.ini
diff --git a/configurations/laptop/resources/home-manager/.config/sway/config b/configurations/laptop-elitebook/resources/home-manager/.config/sway/config
similarity index 100%
rename from configurations/laptop/resources/home-manager/.config/sway/config
rename to configurations/laptop-elitebook/resources/home-manager/.config/sway/config
diff --git a/configurations/laptop/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub b/configurations/laptop-elitebook/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub
similarity index 100%
rename from configurations/laptop/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub
rename to configurations/laptop-elitebook/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub
diff --git a/configurations/laptop/configuration.nix b/configurations/laptop-thinkpad/configuration.nix
similarity index 100%
rename from configurations/laptop/configuration.nix
rename to configurations/laptop-thinkpad/configuration.nix
diff --git a/configurations/laptop-thinkpad/hardware-configuration.nix b/configurations/laptop-thinkpad/hardware-configuration.nix
new file mode 100644
index 00000000..d38a3cdd
--- /dev/null
+++ b/configurations/laptop-thinkpad/hardware-configuration.nix
@@ -0,0 +1,43 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/502edf37-4301-4517-87dd-4b030310f869";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-a014fc29-65ec-4cbc-9ef2-d601c5157425".device = "/dev/disk/by-uuid/a014fc29-65ec-4cbc-9ef2-d601c5157425";
+  boot.initrd.luks.devices."luks-5917f8ad-73ed-4839-ba81-be53a90685a1".device = "/dev/disk/by-uuid/5917f8ad-73ed-4839-ba81-be53a90685a1";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/F323-67BC";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/aa1c6777-0afa-4fdf-84e8-5fead5e987d4"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/configurations/laptop/home.nix b/configurations/laptop-thinkpad/home.nix
similarity index 93%
rename from configurations/laptop/home.nix
rename to configurations/laptop-thinkpad/home.nix
index 7a1e47b1..1885a008 100644
--- a/configurations/laptop/home.nix
+++ b/configurations/laptop-thinkpad/home.nix
@@ -49,10 +49,10 @@
   };
 
   programs.bash.shellAliases = {
-    nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#laptop";
-    nixos-rebuild-system-flake-boot = "sudo nixos-rebuild boot --flake /etc/nixos#laptop";
+    nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#laptop-thinkpad";
+    nixos-rebuild-system-flake-boot = "sudo nixos-rebuild boot --flake /etc/nixos#laptop-thinkpad";
 
-    home-manager-rebuild-system-flake-switch = "nix run home-manager -- switch --flake /etc/nixos#laptop";
+    home-manager-rebuild-system-flake-switch = "nix run home-manager -- switch --flake /etc/nixos#laptop-thinkpad";
   };
 
   home.sessionVariables = {
diff --git a/configurations/laptop-thinkpad/resources/home-manager/.config/foot/foot.ini b/configurations/laptop-thinkpad/resources/home-manager/.config/foot/foot.ini
new file mode 100644
index 00000000..6d453088
--- /dev/null
+++ b/configurations/laptop-thinkpad/resources/home-manager/.config/foot/foot.ini
@@ -0,0 +1,23 @@
+# -*- conf -*-
+font=HackNerdFontMono-Regular:size=13
+
+# Gruvbox - Light
+[colors]
+background=fbf1c7
+foreground=3c3836
+regular0=fbf1c7
+regular1=cc241d
+regular2=98971a
+regular3=d79921
+regular4=458588
+regular5=b16286
+regular6=689d6a
+regular7=7c6f64
+bright0=928374
+bright1=9d0006
+bright2=79740e
+bright3=b57614
+bright4=076678
+bright5=8f3f71
+bright6=427b58
+bright7=3c3836
\ No newline at end of file
diff --git a/configurations/laptop-thinkpad/resources/home-manager/.config/mako/config b/configurations/laptop-thinkpad/resources/home-manager/.config/mako/config
new file mode 100644
index 00000000..64eb6fcf
--- /dev/null
+++ b/configurations/laptop-thinkpad/resources/home-manager/.config/mako/config
@@ -0,0 +1,24 @@
+sort=-time
+layer=overlay
+background-color=#f9f5d7
+text-color=#3c3836
+width=300
+height=110
+border-size=3
+border-color=#b16286
+border-radius=0
+icons=0
+max-icon-size=64
+default-timeout=5000
+ignore-timeout=1
+font=Hack Nerd Font Mono 12
+
+[urgency=low]
+border-color=#b16286
+
+[urgency=normal]
+border-color=#b16286
+
+[urgency=high]
+border-color=#b16286
+default-timeout=0
\ No newline at end of file
diff --git a/configurations/laptop-thinkpad/resources/home-manager/.config/networkmanager-dmenu/config.ini b/configurations/laptop-thinkpad/resources/home-manager/.config/networkmanager-dmenu/config.ini
new file mode 100644
index 00000000..70107298
--- /dev/null
+++ b/configurations/laptop-thinkpad/resources/home-manager/.config/networkmanager-dmenu/config.ini
@@ -0,0 +1,49 @@
+[dmenu]
+compact = True
+dmenu_command = wmenu -N f9f5d7 -n 3c3836 -S 8f3f71 -s fbf1c7 -f "Hack Nerd Font Mono 14"
+# # Note that dmenu_command can contain arguments as well like:
+# # `dmenu_command = rofi -dmenu -i -theme nmdm`
+# # `dmenu_command = rofi -dmenu -width 30 -i`
+# # `dmenu_command = dmenu -i -l 25 -b -nb #909090 -nf #303030`
+# # `dmenu_command = fuzzel --dmenu`
+# # `dmenu_command = wofi --dmenu`
+# active_chars = ==
+# highlight = <True or False> # (Default: False) use highlighting instead of active_chars (only applicable to Rofi / Wofi)
+# highlight_fg = <Color> # (Default: None) foreground color of active connection (only applicable to Wofi)
+# highlight_bg = <Color> # (Default: None) background color of active connection (only applicable to Wofi)
+# highlight_bold = <True or False> # (Default: True) make active connection bold (only applicable to Wofi)
+# compact = <True or False> # (Default: False). Remove extra spacing from display
+# pinentry = <Pinentry command>  # (Default: None) e.g. `pinentry-gtk`
+# wifi_chars = <string of 4 unicode characters representing 1-4 bars strength>
+# wifi_chars = ▂▄▆█
+# wifi_icons = <characters representing signal strength as an icon>
+# wifi_icons = 󰤯󰤟󰤢󰤥󰤨
+# format = <Python style format string for the access point entries>
+# format = {name}  {sec}  {bars}
+# # Available variables are:
+# #  * {name} - Access point name
+# #  * {sec} - Security type
+# #  * {signal} - Signal strength on a scale of 0-100
+# #  * {bars} - Bar-based display of signal strength (see wifi_chars)
+# #  * {icon} - Icon-based display of signal strength (see wifi_icons)
+# #  * {max_len_name} and {max_len_sec} are the maximum lengths of {name} / {sec}
+# #    respectively and may be useful for formatting.
+# list_saved = <True or False> # (Default: False) list saved connections
+
+[dmenu_passphrase]
+# # Uses the -password flag for Rofi, -x for bemenu. For dmenu, sets -nb and
+# # -nf to the same color or uses -P if the dmenu password patch is applied
+# # https://tools.suckless.org/dmenu/patches/password/
+# obscure = True
+# obscure_color = #222222
+
+[pinentry]
+# description = <Pinentry description> (Default: Get network password)
+# prompt = <Pinentry prompt> (Default: Password:)
+
+[editor]
+# terminal = <name of terminal program>
+# gui_if_available = <True or False> (Default: True)
+
+[nmdm]
+# rescan_delay = <seconds>  # (seconds to wait after a wifi rescan before redisplaying the results)
\ No newline at end of file
diff --git a/configurations/laptop-thinkpad/resources/home-manager/.config/sway/config b/configurations/laptop-thinkpad/resources/home-manager/.config/sway/config
new file mode 100755
index 00000000..bc602278
--- /dev/null
+++ b/configurations/laptop-thinkpad/resources/home-manager/.config/sway/config
@@ -0,0 +1,270 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod1
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term foot
+# Your preferred application launcher
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+set $menu dmenu_path | wmenu -N f9f5d7 -n 3c3836 -S 8f3f71 -s fbf1c7 -f "Hack Nerd Font Mono 14" | xargs swaymsg exec --
+
+include /etc/sway/config-vars.d/*
+
+### Output configuration
+#
+# Wallpaper (Default wallpaper are available in /usr/share/backgrounds/sway/)
+output * bg ~/Pictures/Wallpapers/gruvbox_light_linux.png fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+
+input "1:1:AT_Translated_Set_2_keyboard" {
+      xkb_layout "gb"
+}
+input "6058:20564:ThinkPad_Extra_Buttons" {
+      xkb_layout "gb"
+}
+
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+# Font Configuration
+font pango:Hack Nerd Font Mono 12
+
+# Border Configuration
+default_border pixel 3
+default_floating_border normal 3
+client.focused #b16286 #b16286 #f9f5d7
+client.focused_inactive #f9f5d7 #f9f5d7 #3c3836
+client.unfocused #f9f5d7 #f9f5d7 #3c3836
+
+# Gaps Configuration
+gaps inner 5
+gaps outer 5
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+w kill
+
+    # Start your launcher
+    bindsym $mod+d exec $menu
+
+    # Start password manager
+    bindsym Control+Mod1+p exec passmenu
+
+    # Lock screen
+    bindsym Mod4+l exec swaylock -c 000000
+
+    # Brightness Controls
+    bindsym XF86MonBrightnessUp exec sudo light -A 10
+    bindsym XF86MonBrightnessDown exec sudo light -U 10
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+r reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8 Chat
+    bindsym $mod+9 workspace number 9 Games
+    bindsym $mod+0 workspace number 10 Audio
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8 Chat
+    bindsym $mod+Shift+9 move container to workspace number 9 Games
+    bindsym $mod+Shift+0 move container to workspace number 10 Audio
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+
+    # A bit of window rules in regards to Chat/Games/Audio workspaces
+    assign [class="discord"] number 8 Chat
+    assign [class="org.telegram.desktop"] number 8 Chat
+    assign [title="Telegram"] number 8 Chat
+    assign [class="steam"] number 9 Games
+    assign [title="steam"] number 9 Games
+    assign [class="ardour"] number 10 Audio
+    # qpwgraph
+    assign [title="A PipeWire Graph Qt GUI Interface"] number 10 Audio
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+t layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+    position top
+
+    # When the status_command prints a new line to stdout, swaybar updates.
+    # The default just shows the current date and time.
+    status_command while echo "`date +'%Y-%m-%d %I:%M:%S %p'` \| Battery: %`cat /sys/class/power_supply/BAT0/capacity` \(`cat /sys/class/power_supply/BAT0/status`\)"; do sleep 1; done
+
+    colors {
+        statusline #3c3836
+        background #f9f5d7
+        focused_workspace #b16286 #8f3f71 #fbf1c7
+        active_workspace #b16286 #8f3f71 #fbf1c7
+        inactive_workspace #ebdbb2 #d5c4a1 #3c3836
+    }
+}
+
+include /etc/sway/config.d/*
+
+# Autostart
+
+# London Longitude/Latitude
+exec wlsunset -l 51.5 -L -0.1
+
+exec qpwgraph
\ No newline at end of file
diff --git a/configurations/laptop-thinkpad/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub b/configurations/laptop-thinkpad/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub
new file mode 100644
index 00000000..c86f21f4
--- /dev/null
+++ b/configurations/laptop-thinkpad/resources/nixos/.ssh/cspark-desktop-nixremotebuilder.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+mt7zo89rAZqLpBFoONKPXsqA3+B3V2qccS2gjs8Bc root@cspark-nixos-laptop
diff --git a/flake.nix b/flake.nix
index 75cefcd8..64303f52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,11 +95,18 @@
           ./configurations/desktop/configuration.nix
         ];
       };
-      laptop = nixpkgs.lib.nixosSystem {
+      laptop-thinkpad = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
         modules = [
 	        ./global.nix
-          ./configurations/laptop/configuration.nix
+          ./configurations/laptop-thinkpad/configuration.nix
+        ];
+      };
+      laptop-elitebook = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs;};
+        modules = [
+	        ./global.nix
+          ./configurations/laptop-elitebook/configuration.nix
         ];
       };
     };