diff --git a/configuration.nix b/configuration.nix
index 27ccb5d..2dd0c8f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,24 +2,13 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
   
-{ config, inputs, pkgs, dankMaterialShell, niri, ... }:
+{ config, inputs, pkgs, dankMaterialShell, ... }:
 {
   imports = [ 
     # Include the results of the hardware scan.
-    # niri.nixosModules.niri
     dankMaterialShell.nixosModules.greeter
     /etc/nixos/hardware-configuration.nix
   ];
-
-  services.xserver = {
-    enable = true;
-    modules = [ pkgs.xorg.xf86videofbdev ];
-    videoDrivers = [ 
-      "hyperv_fb" 
-      "qemu"
-    ];
-  };
-  #services.displayManager.sddm.enable = true;
   
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -54,9 +43,17 @@
   };
 
   # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
+  services.xserver = {
+    enable = true;
+    modules = [ pkgs.xorg.xf86videofbdev ];
+    videoDrivers = [ 
+      "hyperv_fb" 
+      "qemu"
+    ];
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -72,6 +69,7 @@
   services.getty.autologinUser = "bangae1";
 
   services.spice-vdagentd.enable = true;
+
   services.qemuGuest.enable = true;
 
   # Allow unfree packages
@@ -89,7 +87,6 @@
     xwayland-satellite
     xdg-desktop-portal-gnome
     xdg-desktop-portal-gtk
-    #niri.packages.${pkgs.system}.sessionPackage
     nerd-fonts.jetbrains-mono
     jetbrains-mono
     kime
@@ -118,9 +115,16 @@
   #   enable = true;
   #   enableSSHSupport = true;
   # };
-  #programs.niri.enable = true;
   programs.fish.enable = true;
   programs.firefox.enable = true;
+  programs.uwsm = {
+    enable = true;
+    waylandCompositors.niri = {
+      prettyName = "Niri";
+      comment = "Niri Scrolling Managed";
+      binPath = "/etc/profiles/per-user/bangae1/bin/niri-session";
+    };
+  };
   
   programs.nano.nanorc = ''
     set tabsize 2
diff --git a/flake.nix b/flake.nix
index 3c4534f..c1ead2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
 	      nixos = nixpkgs.lib.nixosSystem {
     	    specialArgs = { inherit system niri dankMaterialShell; };
     	    modules = [
-#           #./sys/desktop.nix
     	      ./configuration.nix
     	      home-manager.nixosModules.home-manager {
                 home-manager.extraSpecialArgs = { inherit niri dankMaterialShell; };
diff --git a/hm/conf/alacritty.nix b/hm/conf/alacritty.nix
new file mode 100644
index 0000000..cc75442
--- /dev/null
+++ b/hm/conf/alacritty.nix
@@ -0,0 +1,17 @@
+{...}:
+{
+  home.file."alacritty.alacritty.toml" = {
+    text = ''
+      [general]
+      import = ["dank-theme.toml"]
+
+      [window]
+      padding = { x = 10, y = 10 }
+
+      [font]
+      normal = { family = 'JetBrainsMono Nerd Font', style = 'Regular' }
+      size = 11
+      offset = { x = 1, y = 2}
+    '';
+  }
+}
diff --git a/hm/home.nix b/hm/home.nix
index 26ede9f..3e5c750 100644
--- a/hm/home.nix
+++ b/hm/home.nix
@@ -5,6 +5,7 @@
     niri.homeModules.niri 
     dankMaterialShell.homeModules.dankMaterialShell.default
     dankMaterialShell.homeModules.dankMaterialShell.niri
+    ./conf/alacritty.nix
   ];
 
   programs.niri = {
diff --git a/sys/desktop.nix b/sys/desktop.nix
deleted file mode 100644
index b0e12d7..0000000
--- a/sys/desktop.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, niri, ...}:
-{
-environment.pathsToLink = [ "/wayland-sessions" ];
-environment.etc."wayland-sessions/niri.desktop".text = ''
-  [Desktop Entry]
-  Name=niri
-  Exec=${pkgs.niri}/bin/niri-session
-  Type=Application
-  Keywords=wayland;niri;
-'';
-}