diff --git a/configurations/desktop/configuration.nix b/configurations/desktop/configuration.nix
index 533fc5f5..8b2a2c76 100644
--- a/configurations/desktop/configuration.nix
+++ b/configurations/desktop/configuration.nix
@@ -15,7 +15,6 @@
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.initrd.luks.devices."luks-9658340a-9d7d-4dbd-be1c-c8c7393ddfc3".device = "/dev/disk/by-uuid/9658340a-9d7d-4dbd-be1c-c8c7393ddfc3";
 
   networking.hostName = "cspark-nixos-desktop"; # Define your hostname.
 
@@ -137,6 +136,7 @@
     git
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     cifs-utils
+    exfatprogs
     neofetch
     appimage-run
     wl-clipboard
diff --git a/configurations/desktop/hardware-configuration.nix b/configurations/desktop/hardware-configuration.nix
index 5befae90..b918328a 100644
--- a/configurations/desktop/hardware-configuration.nix
+++ b/configurations/desktop/hardware-configuration.nix
@@ -19,6 +19,7 @@
     };
 
   boot.initrd.luks.devices."luks-542de15a-e6a5-4c6d-8c6a-62f916805da8".device = "/dev/disk/by-uuid/542de15a-e6a5-4c6d-8c6a-62f916805da8";
+  boot.initrd.luks.devices."luks-9658340a-9d7d-4dbd-be1c-c8c7393ddfc3".device = "/dev/disk/by-uuid/9658340a-9d7d-4dbd-be1c-c8c7393ddfc3";
 
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/386A-F58F";
diff --git a/configurations/desktop/home.nix b/configurations/desktop/home.nix
index 7015b0fc..3254b4e7 100644
--- a/configurations/desktop/home.nix
+++ b/configurations/desktop/home.nix
@@ -34,6 +34,7 @@
     #    Exec=konsole -e ncmpcpp
     #    Terminal=false
     #  '';
+    xdg.configFile."Pictures/Wallpapers/gruvbox_light_linux.png".source = "./resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png";
   };
 
   # Roblox Curl Service
diff --git a/configurations/desktop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png b/configurations/desktop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png
new file mode 100644
index 00000000..908c172b
Binary files /dev/null and b/configurations/desktop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png differ
diff --git a/configurations/laptop/configuration.nix b/configurations/laptop/configuration.nix
new file mode 100644
index 00000000..8927193d
--- /dev/null
+++ b/configurations/laptop/configuration.nix
@@ -0,0 +1,127 @@
+# 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
+      inputs.home-manager.nixosModules.default
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "cspark-nixos-laptop"; # Define your hostname.
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  services.xserver = {
+    # Enable the X11 windowing system.
+    enable = true;
+
+    # Remove/disable xterm, we are using Konsole.
+    desktopManager.xterm.enable = false;
+    excludePackages = with pkgs; [ xterm ];
+
+    # Enable touchpad support (enabled default in most desktopManager).
+    # libinput.enable = true;
+  };
+  # Enable the Sway Tiling Compositor and add extra system packages.
+  programs.sway = {
+    enable = true;
+    extraPackages = with pkgs; [
+      swaylock # Locking
+      swayidle # Idle Detection (For locking)
+      foot # Terminal Emulator
+      dmenu # Application Launcher
+      wmenu # Application Launcher - Wayland
+      wdisplays # Manage wayland displays
+      wlsunset # Day/night gamma adjustment/filter for wayland
+      sway-contrib.grimshot # Screenshot tool for wayland
+
+      lxqt.pcmanfm-qt # File Manager
+      lxqt.lxqt-archiver # Archiver
+      qt6Packages.qt6ct # Manage QT6 Themes
+      libsForQt5.qt5ct # Manage QT5 Themes
+      lxappearance # Manage GTK Themes
+    ];
+  };
+  # XDG Portal Integration (For file chooser/screensharing etc)
+  xdg.portal.enable = true;
+  xdg.portal.wlr.enable = true;
+  xdg.portal.extraPortals = with pkgs; [ kdePackages.xdg-desktop-portal-kde ];
+  # Whether to enable Qt configuration, including theming.
+  qt.enable = true
+
+  # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different
+  programs.dconf.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.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;
+  };
+
+  # Waydroid Android Emulation
+  virtualisation.waydroid.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    git
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    cifs-utils
+    exfatprogs
+    neofetch
+    appimage-run
+    wl-clipboard
+    python3
+    usbutils
+    nvtop-intel
+  ];
+
+  # Set konsole to be default terminal
+  environment.sessionVariables = {
+    TERM = "foot";
+  };
+  environment.variables = {
+    TERM = "foot";
+  };
+
+}
diff --git a/configurations/laptop/hardware-configuration.nix b/configurations/laptop/hardware-configuration.nix
new file mode 100644
index 00000000..b918328a
--- /dev/null
+++ b/configurations/laptop/hardware-configuration.nix
@@ -0,0 +1,42 @@
+# 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" "ahci" "usb_storage" "uas" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" "vendor-reset" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f25f2830-a778-4ecd-ad9b-93331ec13ff0";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-542de15a-e6a5-4c6d-8c6a-62f916805da8".device = "/dev/disk/by-uuid/542de15a-e6a5-4c6d-8c6a-62f916805da8";
+  boot.initrd.luks.devices."luks-9658340a-9d7d-4dbd-be1c-c8c7393ddfc3".device = "/dev/disk/by-uuid/9658340a-9d7d-4dbd-be1c-c8c7393ddfc3";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/386A-F58F";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/6a8760a6-b720-455d-8ff6-af76365374bf"; }
+    ];
+
+  # 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.enp7s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix
new file mode 100644
index 00000000..b16ba670
--- /dev/null
+++ b/configurations/laptop/home.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, ... }:
+
+{
+  imports = 
+    [
+      # Global Config, always to be included
+      ./../../global-home.nix
+    ];
+
+  # KDE Connect
+  services.kdeconnect.enable = true; 
+  services.kdeconnect.indicator = 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
+    #  '';
+    xdg.configFile."sway/config".source = "./resources/home-manager/.config/sway/config";
+    xdg.configFile."Pictures/Wallpapers/gruvbox_light_linux.png".source = "./resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png";
+  };
+
+  home.sessionVariables = {
+    TERM = "foot";
+  };
+
+  programs.bash.shellAliases = {
+    sudo = "sudo ";
+    doas = "doas ";
+    edit = "$EDITOR";
+    nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#laptop";
+  };
+
+}
diff --git a/configurations/laptop/resources/home-manager/.config/sway/config b/configurations/laptop/resources/home-manager/.config/sway/config
new file mode 100755
index 00000000..87a2e493
--- /dev/null
+++ b/configurations/laptop/resources/home-manager/.config/sway/config
@@ -0,0 +1,222 @@
+# 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 | xargs swaymsg exec --
+
+include /etc/sway/config-vars.d/*
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.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
+#
+# 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.
+
+### 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
+
+    # Lock screen
+    bindsym Mod4+l exec swaylock -c 000000
+
+    # 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
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # 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
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# 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 #ffffff
+        background #323232
+        inactive_workspace #32323200 #32323200 #5c5c5c
+    }
+}
+
+include /etc/sway/config.d/*
diff --git a/configurations/laptop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png b/configurations/laptop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png
new file mode 100644
index 00000000..908c172b
Binary files /dev/null and b/configurations/laptop/resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png differ
diff --git a/flake.nix b/flake.nix
index 85104beb..ec4e2b73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,13 @@
           ./configurations/desktop/configuration.nix
         ];
       };
+      laptop = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs;};
+        modules = [
+	        ./global.nix
+          ./configurations/laptop/configuration.nix
+        ];
+      };
     };
   };
 }