diff --git a/flake.lock b/flake.lock
index 7e0959e..b2f066e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,24 +18,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1787559586,
-        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -86,21 +68,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1785031560,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1788039129,
@@ -117,30 +84,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1786719841,
-        "narHash": "sha256-QcpQOT0NQEFkI77t+YXPZqDJc35iIodG7zinieOwFUg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8be7bd0c83f12e2e3bbba07c9044d6fed9e66f7f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "base16": "base16",
-        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "tt-schemes": "tt-schemes",
-        "wrappers": "wrappers"
+        "tt-schemes": "tt-schemes"
       }
     },
     "tt-schemes": {
@@ -158,24 +107,6 @@
         "repo": "schemes",
         "type": "github"
       }
-    },
-    "wrappers": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1787722691,
-        "narHash": "sha256-bWBt7v2FhgG6WTLgSi8nYGi1zXaTdA+vTdCRdvR2vcw=",
-        "owner": "BirdeeHub",
-        "repo": "nix-wrapper-modules",
-        "rev": "04ef216559b18214853879df862f493a9e6bb8cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "BirdeeHub",
-        "repo": "nix-wrapper-modules",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index c64f856..b356df3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,8 +31,10 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
-            imports = [
+            home-manager.users.lucy.imports = [
               ./modules/programs/emacs.nix
+              ./modules/programs/niri.nix
+              ./modules/home.nix
             ];
           }
         ];
diff --git a/modules/home.nix b/modules/home.nix
index e73ed4e..9093a86 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -8,6 +8,12 @@ let
 in
 {
   home-manager.users.lucy = {
+    home.packages = with pkgs; [
+      nixd
+      nixfmt
+      clang
+      kdePackages.qtdeclarative
+    ];
     home.stateVersion = "26.05";
     gtk = {
       enable = true;
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 7e6a759..e79dfe4 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -1,13 +1,11 @@
 {
-  pkgs,
-  lib,
   config,
   ...
 }:
 {
-  programs.emacs = {
+  home-manager.users.lucy.programs.emacs = {
     enable = true;
-    emacsPackages =
+    extraPackages =
       epkgs: with epkgs.melpaPackages; [
         corfu
         cape
@@ -18,13 +16,7 @@
         base16-theme
       ];
 
-    runtimePkgs = with pkgs; [
-      nixd
-      nixfmt
-      qt6.qtdeclarative
-    ];
-    constructFiles.early-init.content = lib.mkBefore ";;; -*- lexical-binding: t; -*-";
-    configFile = ''
+    extraConfig = ''
       ;;; -*- lexical-binding: t; -*-
       (setq make-backup-files nil)
       (load-theme 'base16-${config.scheme.scheme-slug} t)
diff --git a/modules/programs/niri.nix b/modules/programs/niri.nix
new file mode 100644
index 0000000..f3a528a
--- /dev/null
+++ b/modules/programs/niri.nix
@@ -0,0 +1,8 @@
+{ pkgs, config, ...}:
+let
+  c = config.scheme.withHashtag;
+in
+{
+  home-manager.users.lucy.wayland.windowManager.niri = {};
+
+}