diff --git a/common/configuration.nix b/common/configuration.nix
index 5b0245a..994ef30 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -63,7 +63,8 @@
   systemd.services.libvirtd.wantedBy = lib.mkForce [ ];
   systemd.services.libvirt-guests.wantedBy = lib.mkForce [ ];
 
-  programs.hyprland.enable = true;
+  programs.niri.enable = true;
+  programs.niri.package = pkgs.niri;
 
   users.users.ahurac = {
     isNormalUser = true;
diff --git a/common/home.nix b/common/home.nix
index a1609ba..0dc149a 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -54,6 +54,7 @@
   xdg.portal = {
     enable = true;
     config.common.default = [ "gnome" "gtk" ];
+    extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
   };
 
   services.ssh-agent.enable = true;
@@ -288,8 +289,6 @@
   };
 
   programs.niri = {
-    enable = true;
-    package = pkgs.niri;
     settings = {
       input = {
         keyboard = {
diff --git a/flake.nix b/flake.nix
index 55ad63b..1d08f1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
     nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        niri.nixosModules.niri
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
@@ -39,7 +40,6 @@
           home-manager.users.ahurac.imports = [
             flatpaks.homeManagerModules.nix-flatpak
             anyrun.homeManagerModules.default
-            niri.homeModules.niri
             ./ahrc-laptop/home.nix
           ];
         }