diff --git a/flake.nix b/flake.nix
index 713704c..e6c8092 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,5 +38,24 @@
         # inputs.home-manager.nixosModules.default
       ];
     };
+    nixosConfigurations.xps = nixpkgs.lib.nixosSystem {
+    	system = "x86_64-linux";
+	specialArgs = {inherit inputs;};
+	modules = [
+		./hosts/xps/configuration.nix
+		stylix.nixosModules.stylix
+		home-manager.nixosModules.home-manager
+		{
+			home-manager.useGlobalPkgs = true;
+			home-manager.useUserPackages = true;
+			home-manager.users.rohand = {... }: {
+				imports = [
+					nixvim.homeManagerModules.nixvim
+					./hosts/xps/home.nix
+				];
+			};
+		}
+	];
+    };
   };
 }
diff --git a/hosts/surface/configuration.nix b/hosts/surface/configuration.nix
index addb83a..b890f97 100644
--- a/hosts/surface/configuration.nix
+++ b/hosts/surface/configuration.nix
@@ -76,7 +76,11 @@
      git
      firefox	
      pulsemixer
+     brightnessctl
   ];
+  environment.sessionVariables = {
+	NIXOS_OZONE_WL = "1";
+  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -133,7 +137,7 @@ nix.settings.experimental-features = ["nix-command" "flakes"];
 		sansSerif = config.stylix.fonts.serif;
 		sizes = {
 			applications = 10;
-			terminal = 10;
+			terminal = 11;
 		};
 
 	};
diff --git a/hosts/surface/hardware-configuration.nix b/hosts/surface/hardware-configuration.nix
index 6549d8e..372762f 100644
--- a/hosts/surface/hardware-configuration.nix
+++ b/hosts/surface/hardware-configuration.nix
@@ -8,20 +8,19 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2ab1148a-2b6a-4586-b9de-79e99af37f69";
+    { device = "/dev/disk/by-uuid/0f5bd08c-cfaf-422c-b875-64e42029bee4";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F256-0876";
+    { device = "/dev/disk/by-uuid/1424-2266";
       fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];
@@ -31,9 +30,9 @@
   # 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.enp0s20f0u4u2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp108s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/surface/home.nix b/hosts/surface/home.nix
index 67b35c4..054764a 100644
--- a/hosts/surface/home.nix
+++ b/hosts/surface/home.nix
@@ -33,11 +33,12 @@
 	nix-tree
 	sway-contrib.grimshot
 	runelite
-	(discord.override {
-		withOpenASAR = true;
-		withVencord = true;
-	})
+#	(discord.override {
+#		withOpenASAR = true;
+#		withVencord = true;
+#	})
 	obsidian
+	vesktop
   ];
 
 
@@ -48,7 +49,7 @@
 	enableSyntaxHighlighting = true;
 	loginExtra = "sway";
 	shellAliases = {
-		"update" = "sudo nixos-rebuild switch --flake /home/rohand/nixos-surface-config#surface";
+		"update" = "sudo nixos-rebuild switch --flake /home/rohand/nixos-surface-config#xps";
 	};
 	oh-my-zsh = {
 		enable = true;
diff --git a/hosts/xps/configuration.nix b/hosts/xps/configuration.nix
new file mode 100644
index 0000000..b890f97
--- /dev/null
+++ b/hosts/xps/configuration.nix
@@ -0,0 +1,150 @@
+# 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, stylix, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+  security.polkit.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/New_York";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
+  
+  services.syncthing = {
+	enable = true;
+	user = "rohand";
+	dataDir = "/home/rohand/Documents";
+	configDir = "/home/rohand/Documents/.config/syncthing";
+};
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.rohand = {
+    isNormalUser = true;
+    description = "Rohan Deshpande";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [];
+    shell = pkgs.zsh;
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+     wget
+     git
+     firefox	
+     pulsemixer
+     brightnessctl
+  ];
+  environment.sessionVariables = {
+	NIXOS_OZONE_WL = "1";
+  };
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+programs.zsh.enable = true;
+programs.neovim.defaultEditor = true;
+hardware.pulseaudio = {
+	enable = true;
+	support32Bit = true;
+};
+hardware.opengl.enable = true;
+
+nix.settings.experimental-features = ["nix-command" "flakes"];
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+  fonts.packages = with pkgs; [
+  	font-awesome
+	nerdfonts
+	overpass
+  ];
+  stylix = {
+  	enable = true;
+	image = /home/rohand/gruvbox-wallpapers/wallpapers/irl/cactus.png;
+	base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
+	fonts = {
+		monospace = {
+			package = pkgs.nerdfonts;
+			name = "FantasqueSansM Nerd Font";
+		};
+		serif = {
+			package = pkgs.nerdfonts;
+			name = "Overpass Nerd Font";
+		};
+		sansSerif = config.stylix.fonts.serif;
+		sizes = {
+			applications = 10;
+			terminal = 11;
+		};
+
+	};
+	opacity = {
+		terminal = 1.0;
+		applications = 1.0;
+	};
+
+  };
+}
diff --git a/hosts/xps/hardware-configuration.nix b/hosts/xps/hardware-configuration.nix
new file mode 100644
index 0000000..372762f
--- /dev/null
+++ b/hosts/xps/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# 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" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/0f5bd08c-cfaf-422c-b875-64e42029bee4";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1424-2266";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # 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.wlp108s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/xps/home.nix b/hosts/xps/home.nix
new file mode 100644
index 0000000..19a51dc
--- /dev/null
+++ b/hosts/xps/home.nix
@@ -0,0 +1,126 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+	./../../homeManagerModules/nixvim.nix
+	./../../homeManagerModules/gui/alacritty.nix
+	./../../homeManagerModules/gui/zathura.nix
+	./../../homeManagerModules/gui/qutebrowser.nix
+	./../../homeManagerModules/htop.nix
+	./../../homeManagerModules/lf.nix
+	./../../homeManagerModules/pandoc.nix
+	./../../homeManagerModules/texlive.nix
+	./../../homeManagerModules/bat.nix
+  ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "rohand";
+  home.homeDirectory = "/home/rohand";
+
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  home.stateVersion = "24.05";
+  home.packages = with pkgs; [
+  	autotiling
+	i3status
+	fastfetch
+	nix-tree
+	sway-contrib.grimshot
+	runelite
+#	(discord.override {
+#		withOpenASAR = true;
+#		withVencord = true;
+#	})
+	obsidian
+	vesktop
+  ];
+
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+  programs.zsh = {
+  	enable = true;
+	enableSyntaxHighlighting = true;
+	loginExtra = "sway";
+	shellAliases = {
+		"update" = "sudo nixos-rebuild switch --flake /home/rohand/nixos-surface-config#surface";
+	};
+	oh-my-zsh = {
+		enable = true;
+		plugins = ["git" "vi-mode"];
+		theme = "minimal";
+	};
+  };
+  #programs.alacritty = {
+  #	enable = true;
+  #};
+  programs.bemenu = {
+  	enable = true;
+  };
+  programs.ranger = {
+  	enable = true;
+  };
+  wayland.windowManager.sway = {
+  	enable = true;
+	config = rec {
+		modifier = "Mod4";
+		menu = "bemenu-run";
+		gaps = {
+			inner = 10;
+			outer = 4;
+			smartGaps = false;
+		};
+		terminal = "alacritty";
+		window.titlebar = false;
+		startup = [
+			{command = "autotiling";}
+		];
+		keybindings = 
+			let
+				modifier = config.wayland.windowManager.sway.config.modifier;
+				searchConfig = pkgs.writeShellApplication {
+					name = "searchConfig";
+					text = ''
+						find /home/rohand/nixos-surface-config \( ! -regex './\..*' \) -type f \
+							| bemenu -p "Edit which config file?" \
+							| xargs alacritty -e nvim \
+					 '';
+				};
+			in lib.mkOptionDefault {
+				"${modifier}+n" = "exec ${lib.getExe searchConfig}" ;
+				"${modifier}+Shift+r" = "exec alacritty -e lf";
+				"${modifier}+q" = "kill";
+				"${modifier}+Shift+n" = "exec alacritty -e nvim -c VimwikiIndex";
+				"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save area";
+
+			};
+		bars = [
+			({
+				mode = "dock";
+				hiddenState = "hide";
+				position = "top";
+				workspaceButtons = true;
+				workspaceNumbers = false;
+				statusCommand = "i3status";
+				trayOutput = "primary";
+			} // config.lib.stylix.sway.bar)
+		];
+	};
+  };
+
+  home.sessionVariables = {
+  	OPENER = "rifle";
+	EDITOR = "nvim";
+	_JAVA_AWT_WM_NONREPARENTING = 1;
+#	MANPAGER = "sh -c 'col -bx | bat -l man -p'";
+	MANPAGER = "nvim +Man!";
+	# MANROFFOPT = "-c";
+  };
+}
+