diff --git a/configuration.nix b/configuration.nix
index 01b4b02..ceea16d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,9 +12,13 @@
     ];
 
   # Enable Flakes and the new command-line tool
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  # nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.efi.efiSysMountPoint = "/boot/efi";
+	boot.loader.grub.efiSupport = true;
+	boot.loader.grub.device = "nodev";
+  boot.loader.grub.extraEntriesBeforeNixOS = true;
   boot.loader.grub.extraEntries = ''
     menuentry "Void" {
       search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
@@ -56,12 +60,14 @@
   environment = {
     systemPackages = with pkgs; [
       vim
-			neovim.packages."${pkgs.system}".neovim
+			# neovim.packages."${pkgs.system}".neovim
+			neovim
       git
       wget
       tmux
       river
       kitty
+			firefox
     ];
     defaultPackages = with pkgs; [
       perl
@@ -79,8 +85,8 @@
 
   environment.variables.EDITOR = "nvim";
 
-  programs.firefox.package = pkgs.latest.firefox-wayland;
-  programs.firefox.enable = true;
+  # programs.firefox.package = pkgs.latest.firefox-wayland;
+  # programs.firefox.enable = true;
 
   xdg.portal = {
     enable = true;
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 8fc3bdf..dc4ac17 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,9 +8,10 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt"
+	"rtsx_pci_sdmmc" "nvme"];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-intel" "nvme" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =