diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix
index 3be99f19..4f43f530 100644
--- a/systems/rinnosuke.nix
+++ b/systems/rinnosuke.nix
@@ -16,9 +16,12 @@ _: let
     boot = {
       initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
       kernelModules = ["kvm-amd"];
-      loader.grub.devices = [
-        "/dev/disk/by-uuid/8B8C-6502"
-      ];
+      loader.grub = {
+        enable = true;
+        device = [
+          "/dev/disk/by-uuid/8B8C-6502"
+        ];
+      };
     };
 
     fileSystems = {
@@ -53,7 +56,6 @@ _: let
 
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
-    boot.loader.grub.enable = true;
     system.stateVersion = "25.05";
   };
 in {
diff --git a/tree.nix b/tree.nix
index f7203a62..003497c8 100644
--- a/tree.nix
+++ b/tree.nix
@@ -95,6 +95,7 @@
           nix-gaming.nixosModules.pipewireLowLatency
           nix-gaming.nixosModules.platformOptimizations
           clipboard-sync.nixosModules.default
+          niri.nixosModules.niri
           nixos-cli.nixosModules.nixos-cli
           stylix.nixosModules.stylix
           microvm.nixosModules.host