diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix
index 2b0138d..7fe74fe 100644
--- a/config/hosts/imxyy-nix/home.nix
+++ b/config/hosts/imxyy-nix/home.nix
@@ -43,7 +43,10 @@
         PATH = "/home/${username}/bin:$PATH";
       };
       profileExtra = ''
-        if [ `tty` = "/dev/tty6" ]; then
+        if [ `tty` = "/dev/tty1" -a $XDG_RUNTIME_DIR ]; then
+          echo 'Starting Niri...'
+          exec uwsm start niri-uwsm.desktop
+        elif [ `tty` = "/dev/tty6" ]; then
           clear
         fi
       '';
@@ -91,7 +94,10 @@
     autologin = {
       enable = true;
       user = username;
-      ttys = [ 6 ];
+      ttys = [
+        1
+        6
+      ];
     };
 
     gpg.enable = true;
@@ -162,10 +168,7 @@
         ".android"
         "Android"
 
-        {
-          directory = ".ssh";
-          mode = "0700";
-        }
+        ".ssh"
 
         "bin"
         "workspace"
diff --git a/flake.lock b/flake.lock
index d1f0f81..8d82c4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -594,22 +594,6 @@
         "type": "github"
       }
     },
-    "infuse": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738726976,
-        "narHash": "sha256-N+u3vnK3zyXLUuDj/vr62r9tM7uarhKVCaLHWxjo/YY=",
-        "ref": "refs/heads/trunk",
-        "rev": "c8fb7397039215e1444c835e36a0da7dc3c743f8",
-        "revCount": 48,
-        "type": "git",
-        "url": "https://codeberg.org/amjoseph/infuse.nix"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/amjoseph/infuse.nix"
-      }
-    },
     "libgit2": {
       "flake": false,
       "locked": {
@@ -1012,7 +996,6 @@
         "go-musicfox": "go-musicfox",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "infuse": "infuse",
         "niri": "niri",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index c9813c6..553bd9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -145,6 +145,7 @@
                 inputs.sops-nix.homeManagerModules.sops
                 inputs.impermanence.nixosModules.home-manager.impermanence
                 inputs.stylix.homeManagerModules.stylix
+                inputs.niri.homeModules.niri
                 # workaround for annoying stylix
                 (
                   { lib, ... }:
@@ -177,7 +178,6 @@
             ./config/hosts/${hostname}
             inputs.sops-nix.nixosModules.sops
             inputs.impermanence.nixosModules.impermanence
-            inputs.niri.nixosModules.niri
             inputs.home-manager.nixosModules.default
             home
             pkgsConf
diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix
index ee79729..40fba70 100644
--- a/modules/desktop/wm/niri/config.nix
+++ b/modules/desktop/wm/niri/config.nix
@@ -85,7 +85,6 @@
     };
 
     spawn-at-startup = map (c: { command = c; }) [
-      [ "waybar" ]
       [ "${lib.getExe pkgs.xwayland-satellite-unstable}" ]
       [ "${lib.getExe' pkgs.swaynotificationcenter "swaync"}" ]
       [
@@ -93,6 +92,11 @@
         "-i"
         (toString ./wallpaper.png)
       ]
+      [
+        "${lib.getExe pkgs.wl-clip-persist}"
+        "--clipboard"
+        "regular"
+      ]
       [
         "wl-paste"
         "--type"
diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix
index f93292e..6c3e8f5 100644
--- a/modules/desktop/wm/niri/default.nix
+++ b/modules/desktop/wm/niri/default.nix
@@ -40,21 +40,27 @@ in
         xdg-desktop-portal-gnome
       ];
     };
-    services.displayManager.ly = {
+    programs.uwsm = {
       enable = true;
-      settings = {
-        animation = "matrix";
-        tty = 12;
+      waylandCompositors = {
+        niri = {
+          prettyName = "niri";
+          comment = "Niri compositor managed by UWSM";
+          binPath = pkgs.writeShellScript "niri-session" ''
+            ${lib.getExe pkg} --session
+          '';
+        };
       };
     };
-    programs.niri = {
-      enable = true;
-      package = pkg;
-    };
     my.home = {
+      programs.niri = {
+        enable = true;
+        package = pkg;
+      };
       home.packages = with pkgs; [
         wlr-randr
         wl-clipboard
+        wl-clip-persist
         cliphist
         swaynotificationcenter
         nemo-with-extensions
@@ -70,7 +76,7 @@ in
       };
       programs.waybar = {
         enable = true;
-        systemd.enable = false;
+        systemd.enable = true;
       };
       xdg.configFile."waybar/config.jsonc".text = builtins.toJSON (import ./waybar/config.nix args);
       xdg.configFile."waybar/style.css" = {