diff --git a/flake.nix b/flake.nix
index 798ff2c..9a593fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,12 +36,11 @@
     }:
     let
       system = "x86_64-linux";
-      compositor = "niri";
     in
     {
       nixosConfigurations = {
         copland = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs system compositor; };
+          specialArgs = { inherit inputs system; };
 
           modules = [
             { nixpkgs.hostPlatform = system; }
@@ -58,7 +57,7 @@
               home-manager = {
                 useGlobalPkgs = true;
                 useUserPackages = true;
-                extraSpecialArgs = { inherit inputs system compositor; };
+                extraSpecialArgs = { inherit inputs system; };
                 users.elars = import ./home;
               };
             }
diff --git a/home/default.nix b/home/default.nix
index 0f5fc14..ca51d65 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,12 +2,14 @@
   pkgs,
   inputs,
   system,
-  compositor,
   ...
 }:
 
 {
-  imports = [ (if compositor == "niri" then ./niri.nix else ./hyprland.nix) ];
+  imports = [
+    ./hyprland.nix
+    ./niri.nix
+  ];
 
   home.username = "elars";
   home.homeDirectory = "/home/elars";
diff --git a/nixos/desktop/window-managers/default.nix b/nixos/desktop/window-managers/default.nix
index 9e77f02..6c60fca 100644
--- a/nixos/desktop/window-managers/default.nix
+++ b/nixos/desktop/window-managers/default.nix
@@ -3,5 +3,6 @@
 {
   imports = [
     ./hyprland.nix
+    ./niri.nix
   ];
 }
diff --git a/nixos/desktop/window-managers/niri.nix b/nixos/desktop/window-managers/niri.nix
index ae3ae60..aed3ef6 100644
--- a/nixos/desktop/window-managers/niri.nix
+++ b/nixos/desktop/window-managers/niri.nix
@@ -4,13 +4,8 @@
   programs.niri.enable = true;
 
   xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gnome
-      xdg-desktop-portal-gtk
-    ];
-    config.niri = lib.mkForce {
+    extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
+    config.niri = {
       default = [
         "gnome"
         "gtk"
@@ -18,26 +13,4 @@
       "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
     };
   };
-
-  services = {
-    dbus.enable = true;
-    pipewire = {
-      enable = true;
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
-    gnome = {
-      gnome-keyring.enable = true;
-      gnome-settings-daemon.enable = lib.mkDefault false;
-    };
-  };
-
-  security.polkit.enable = true;
-  environment.systemPackages = with pkgs; [
-    glib
-    dconf
-    dconf-editor
-    xdg-utils
-    xdg-user-dirs
-  ];
 }