diff --git a/base/hassie/configuration.nix b/base/hassie/configuration.nix
index 096de17..f7fe73e 100644
--- a/base/hassie/configuration.nix
+++ b/base/hassie/configuration.nix
@@ -2,7 +2,7 @@
 # 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, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 {
   imports =
@@ -39,7 +39,12 @@
   };
   
   boot.supportedFilesystems = ["exfat" "ntfs" "xfs"];
-  boot.loader.systemd-boot.enable = true;
+  boot.loader.limine.enable = true;
+  boot.loader.limine.style.wallpapers = [];
+  boot.loader.limine.additionalFiles = {
+    "efi/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
+    "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
+  };
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.systemd.enable = true;
   boot.loader.efi.efiSysMountPoint = "/boot/";
@@ -152,6 +157,8 @@
     jack.enable = true;
   };
 
+  hardware.alsa.enablePersistence = true;
+
   # Define a user account. Don't forget to set a password with ‘passwd’.  
   users.users.alyx = {
     isNormalUser = true;
@@ -174,6 +181,7 @@
     keepassxc
     pulseaudio
     winetricks
+    inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-stable
     p7zip
     cabextract
     unzip
diff --git a/base/hassie/default.nix b/base/hassie/default.nix
index 54a1411..e8ba5f1 100644
--- a/base/hassie/default.nix
+++ b/base/hassie/default.nix
@@ -5,5 +5,6 @@
     ../ssh.nix
     ../substituters.nix
     ../fonts.nix
+    ../greetd.nix
   ];
 }
diff --git a/flake.nix b/flake.nix
index f9a464d..45a391f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -130,6 +130,7 @@
     };
     nixosConfigurations."hassie" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
       modules = [
         ./base/hassie
         home-manager.nixosModules.home-manager {