diff --git a/flake.lock b/flake.lock
index 54f31ed..0cb09a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,6 +1,51 @@
 {
   "nodes": {
+    "cosmic-comp": {
+      "inputs": {
+        "crane": "crane",
+        "nix-filter": "nix-filter",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "parts": "parts",
+        "rust": "rust"
+      },
+      "locked": {
+        "lastModified": 1700158862,
+        "narHash": "sha256-mtBzW2UoW0FXLuVuinSUFVOW/1wKo/7nlxq7ZIzpBr0=",
+        "owner": "pop-os",
+        "repo": "cosmic-comp",
+        "rev": "92c16bd4adabbd00123284176a2e4cc52b5131c7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pop-os",
+        "repo": "cosmic-comp",
+        "type": "github"
+      }
+    },
     "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "cosmic-comp",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1699548976,
+        "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "6849911446e18e520970cc6b7a691e64ee90d649",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "crane_2": {
       "inputs": {
         "nixpkgs": [
           "niri",
@@ -39,6 +84,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -61,13 +124,13 @@
     },
     "niri": {
       "inputs": {
-        "crane": "crane",
-        "nix-filter": "nix-filter",
+        "crane": "crane_2",
+        "nix-filter": "nix-filter_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "parts": "parts",
-        "rust": "rust"
+        "parts": "parts_2",
+        "rust": "rust_2"
       },
       "locked": {
         "lastModified": 1700406443,
@@ -84,6 +147,21 @@
       }
     },
     "nix-filter": {
+      "locked": {
+        "lastModified": 1687178632,
+        "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
+    "nix-filter_2": {
       "locked": {
         "lastModified": 1694857738,
         "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
@@ -131,6 +209,27 @@
       }
     },
     "parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "cosmic-comp",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "niri",
@@ -153,6 +252,7 @@
     },
     "root": {
       "inputs": {
+        "cosmic-comp": "cosmic-comp",
         "home-manager": "home-manager",
         "niri": "niri",
         "nixos-hardware": "nixos-hardware",
@@ -162,6 +262,28 @@
     "rust": {
       "inputs": {
         "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "cosmic-comp",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688438033,
+        "narHash": "sha256-wOmpZis06pVKTR+5meGwhrW10/buf98lnA26uQLaqek=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "c3e43223dece545cfe06ddd92fd782adc73d56c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "niri",
           "nixpkgs"
@@ -195,6 +317,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f77cab2..4fe1fe8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,14 @@
       url = "github:twoneis/niri";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    cosmic-comp = {
+      url = "github:pop-os/cosmic-comp";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, nixos-hardware, ... }:
+  outputs = { nixpkgs, home-manager, nixos-hardware, niri, ... }:
   let
     x86 = "x86_64-linux";
     common = ./modules/system;
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index 22e3250..ace9e06 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,3 +1,5 @@
 { niri, ... }: {
-  services.xserver.displayManager.sessionPackages = [ niri.niri ];
+  services.xserver.displayManager.sessionPackages = [
+    niri
+  ];
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 3a9a1bf..e807e17 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -2,8 +2,9 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, niri, ... }: {
+{ pkgs, ... }: {
   imports = [
+    ../niri
     ../gnome
   ];