diff --git a/flake.lock b/flake.lock
index 11bc930..1bd519b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -925,11 +925,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1760950171,
-        "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=",
+        "lastModified": 1761623016,
+        "narHash": "sha256-C2+TErNmeHMCtodwVrMeA/uJg1GRdQbOntRI7DFullA=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f851a923137c0a54719412146fd63d24b3214e60",
+        "rev": "f0bfe0aaaa51378ace7492850290f8d2db6cc7f3",
         "type": "github"
       },
       "original": {
@@ -958,11 +958,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1760940149,
-        "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
+        "lastModified": 1761460429,
+        "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
+        "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b",
         "type": "github"
       },
       "original": {
@@ -1156,11 +1156,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1760862643,
-        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+        "lastModified": 1761468971,
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
         "type": "github"
       },
       "original": {
@@ -1390,7 +1390,7 @@
       "flake": false,
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-F3ysDLjeyNGHcZYOQHbw8kjBqf3L+ESrZs9XMRefOJQ=",
+        "narHash": "sha256-5i6dXIjMmBZZ4WusMd/kCPijOVQR9AkosndKF07QVIo=",
         "path": "./nvchad",
         "type": "path"
       },
@@ -1836,11 +1836,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1759707084,
-        "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",
+        "lastModified": 1761622056,
+        "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "a9188e70bd748118b4d56a529871b9de5adb9988",
+        "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756",
         "type": "github"
       },
       "original": {
diff --git a/home/david/modules/programs/nvchad.nix b/home/david/modules/programs/nvchad.nix
index 3328c65..c219d3c 100644
--- a/home/david/modules/programs/nvchad.nix
+++ b/home/david/modules/programs/nvchad.nix
@@ -18,6 +18,8 @@ in
       enable = true;
       extraPackages = with pkgs; [
         editor-runtime
+
+        pkg-config
       ];
       neovim = pkgs.neovim-nightly;
       backup = true;
diff --git a/nvchad/lua/options.lua b/nvchad/lua/options.lua
index e99d7d3..200ea2f 100644
--- a/nvchad/lua/options.lua
+++ b/nvchad/lua/options.lua
@@ -1,102 +1,99 @@
-require "nvchad.options"
-
-local o = vim.o
 local opt = vim.opt
 
-o.autoindent = true
-o.autoread = true
-opt.backspace = {
-  "indent",
-  "eol",
-  "start",
+local options = {
+  autoindent = true,
+  autoread = true,
+  backspace = {
+    "indent",
+    "eol",
+    "start",
+  },
+  backup = false,
+  breakindent = true,
+  breakindentopt = { "sbr" },
+  showbreak = "↪",
+  cdhome = true,
+  cmdheight = 1,
+  completeopt = {
+    "fuzzy",
+    "menuone",
+    "noselect",
+    "popup",
+  },
+  concealcursor = { ["v"] = true },
+  confirm = true,
+  cursorline = true,
+  cursorlineopt = { "number", "screenline" },
+  diffopt = {
+    "algorithm:minimal",
+    "closeoff",
+    "context:20",
+    "followwrap",
+    "internal",
+    "linematch:40",
+  },
+  errorbells = true,
+  expandtab = true,
+  exrc = true,
+  foldcolumn = "auto",
+  fsync = true,
+  gdefault = false,
+  helplang = {
+    "zh",
+    "en",
+  },
+  history = 10000,
+  hlsearch = true,
+  ignorecase = true,
+  smartcase = true,
+  inccommand = "split",
+  list = true,
+  listchars = {
+    tab = "--→",
+    trail = "·",
+    multispace = " ",
+    nbsp = "⍽",
+    space = "·",
+  },
+  magic = true,
+  more = true,
+  mouse = "a",
+  number = true,
+  numberwidth = 4,
+  relativenumber = true,
+  scrollback = 100000,
+  scrolloff = 5,
+  shiftround = true,
+  shiftwidth = 2,
+  showmode = false,
+  signcolumn = "yes",
+  smoothscroll = true,
+  splitbelow = true,
+  splitright = true,
+  startofline = true,
+  swapfile = false,
+  tabclose = {
+    "uselast",
+  },
+  tabstop = 2,
+  termguicolors = true,
+  undofile = true,
+  undolevels = 100000,
+  virtualedit = {
+    "block",
+    "onemore",
+  },
+  whichwrap = { b = true, s = true, ["<"] = true, [">"] = true },
+  wildmenu = true,
+  wildmode = { "full" },
+  wildoptions = {
+    "fuzzy",
+    "pum",
+  },
+  winborder = "solid",
+  wrap = true
 }
-o.backup = false
 
-opt.breakindent = true
-opt.breakindentopt = { "sbr" }
-o.showbreak = "↪"
-
-o.cdhome = true
-o.cmdheight = 1
-opt.completeopt = {
-  "fuzzy",
-  "menuone",
-  "noselect",
-  "popup",
-}
-opt.concealcursor = { ["v"] = true }
-o.confirm = true
-o.cursorline = true
-opt.cursorlineopt = { "number", "screenline" }
-opt.diffopt = {
-  "algorithm:minimal",
-  "closeoff",
-  "context:20",
-  "followwrap",
-  "internal",
-  "linematch:40",
-}
-o.errorbells = true
-o.expandtab = true
-o.exrc = true
-o.foldcolumn = "auto"
-o.fsync = true
-o.gdefault = false
-opt.helplang = {
-  "zh",
-  "en",
-}
-o.history = 10000
-o.hlsearch = true
-
-o.ignorecase = true
-o.smartcase = true
-
-o.inccommand = "split"
-o.list = true
-opt.listchars = {
-  tab = "--→",
-  trail = "·",
-  multispace = " ",
-  nbsp = "⍽",
-  space = "·",
-}
-o.magic = true
-o.more = true
-o.mouse = "a"
-
-o.number = true
-o.numberwidth = 4
-o.relativenumber = true
-
-o.scrollback = 100000
-o.scrolloff = 5
-o.shiftround = true
-o.shiftwidth = 2
-o.showmode = false
-o.signcolumn = "yes"
-o.smoothscroll = true
-o.splitbelow = true
-o.splitright = true
-o.startofline = true
-o.swapfile = false
-opt.tabclose = {
-  "uselast",
-}
-o.tabstop = 2
-o.termguicolors = true
-o.undofile = true
-o.undolevels = 100000
-opt.virtualedit = {
-  "block",
-  "onemore",
-}
-opt.whichwrap = { b = true, s = true, ["<"] = true, [">"] = true }
-o.wildmenu = true
-opt.wildmode = { "full" }
-opt.wildoptions = {
-  "fuzzy",
-  "pum",
-}
-o.winborder = "solid"
-o.wrap = true
+for key, value in pairs(options) do
+  opt[key] = value
+end