diff --git a/common/default.nix b/common/default.nix
index fcbbc87..3d5bd4f 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -4,6 +4,7 @@
     ./desktop.nix
     ./hardening.nix
     ./laptop.nix
+    ./niri.nix
     ./nix.nix
     ./plymouth.nix
     ./podman.nix
diff --git a/common/niri.nix b/common/niri.nix
new file mode 100644
index 0000000..c7b2857
--- /dev/null
+++ b/common/niri.nix
@@ -0,0 +1,24 @@
+{
+  user,
+  lib,
+  pkgs,
+  inputs',
+  ...
+}:
+{
+  programs.niri = {
+    enable = true;
+  };
+
+  services.greetd = {
+    enable = true;
+    vt = 2;
+    settings = rec {
+      initial_session = {
+        command = "${lib.getExe pkgs.greetd.tuigreet} --remember --time --cmd ${lib.getExe' pkgs.niri "niri-session"}";
+      };
+      default_session = initial_session;
+    };
+  };
+
+}
diff --git a/flake.lock b/flake.lock
index 67a082d..a1dc2e9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -172,11 +172,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745993004,
-        "narHash": "sha256-Tz/mPxMwAMghdi3nYnppkl6j3H3LdcdbuvmJyQj11JU=",
+        "lastModified": 1746087677,
+        "narHash": "sha256-hf82DXWEEs7SEZqrx/Wp+PePiDm/3IBLzpFEaO8ClC4=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "5cde8950cf2fa3ef8edf9b0af0e0a020a5318565",
+        "rev": "9142bf8e3b7588c316fe090149b124827f177fab",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1745965750,
-        "narHash": "sha256-GtRcW1p7hzFu7AK1JXJGY6bG/5Y7vb+1VX8uFGKdefM=",
+        "lastModified": 1746057449,
+        "narHash": "sha256-x2Tz8199eyjKymzSmzOZWGofylG7xOX7CnpYyV54inw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "0ab0cdb2dabc551f836851aa85d06e927c42d92a",
+        "rev": "4bc7bac8842582cc1239373994327d5537155ec0",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745900683,
-        "narHash": "sha256-ZGi2gjgPtmPmplCVz7dNufqkBr00g6EeAloX3GrFQls=",
+        "lastModified": 1745998881,
+        "narHash": "sha256-vonyYAKJSlsX4n9GCsS0pHxR6yCrfqBIuGvANlkwG6U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ffa0bb043c25cfc79ff3bc20ba2e44c3724499b1",
+        "rev": "423d2df5b04b4ee7688c3d71396e872afa236a89",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1745921652,
-        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
+        "lastModified": 1746055187,
+        "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
+        "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1746029695,
-        "narHash": "sha256-ucaEphdH+3ANIprXcYiGoXfHGQol3c5G5f99R7RBU58=",
+        "lastModified": 1746061036,
+        "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "70b191e2e0b1b5fe8586ad939dfa01f3047865f7",
+        "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e",
         "type": "github"
       },
       "original": {
diff --git a/home/common/niri.nix b/home/common/niri.nix
index 5d3810a..2bce97f 100644
--- a/home/common/niri.nix
+++ b/home/common/niri.nix
@@ -24,22 +24,22 @@
 
   systemd.user = {
     services = {
-      swaybg = {
-        wantedBy = [ "niri.service" ];
-        wants = [ "graphical-session.target" ];
-        after = [ "graphical-session.target" ];
-        serviceConfig = {
-          ExecStart =
-            let
-              img = pkgs.fetchurl {
-                url = "https://s3.nyaw.xyz/misskey//92772482-aef9-44e8-b1e2-1d49753a72fc.jpg";
-                hash = "sha256-Y9TJ/xQQhqWq3t2wn1gS4NPGpuz1m7nu1ATcWWPKPW8=";
-              };
-            in
-            "${lib.getExe pkgs.swaybg} -i ${img} -m fill";
-          Restart = "on-failure";
-        };
-      };
+      # swaybg = {
+      #   wantedBy = [ "niri.service" ];
+      #   wants = [ "graphical-session.target" ];
+      #   after = [ "graphical-session.target" ];
+      #   serviceConfig = {
+      #     ExecStart =
+      #       let
+      #         img = pkgs.fetchurl {
+      #           url = "https://s3.nyaw.xyz/misskey//92772482-aef9-44e8-b1e2-1d49753a72fc.jpg";
+      #           hash = "sha256-Y9TJ/xQQhqWq3t2wn1gS4NPGpuz1m7nu1ATcWWPKPW8=";
+      #         };
+      #       in
+      #       "${lib.getExe pkgs.swaybg} -i ${img} -m fill";
+      #     Restart = "on-failure";
+      #   };
+      # };
       waybar = {
         wantedBy = [ "niri.service" ];
         wants = [ "graphical-session.target" ];