diff --git a/.stylua.toml b/.stylua.toml
new file mode 100644
index 0000000..0435f67
--- /dev/null
+++ b/.stylua.toml
@@ -0,0 +1,2 @@
+indent_type = "Spaces"
+indent_width = 2
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..69cff61
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,49 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1783221248,
+        "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-26.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1783148766,
+        "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 8da4136..0a045a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     };
   };
 
-  outputs = { nixpkgs, ... }:
+  outputs = { nixpkgs, home-manager, ... }:
   let
     system = "x86_64-linux";
   in {
@@ -16,7 +16,7 @@
       syedm = nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
-          ./hosts/common
+          ./hosts/common.nix
           ./hosts/syedm
 
           home-manager.nixosModules.home-manager
@@ -27,7 +27,7 @@
       tardis = nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
-          ./hosts/common
+          ./hosts/common.nix
           ./hosts/tardis
 
           home-manager.nixosModules.home-manager
diff --git a/home/fish/default.nix b/home/fish/default.nix
index e8ca4e8..3f138a6 100644
--- a/home/fish/default.nix
+++ b/home/fish/default.nix
@@ -12,7 +12,7 @@
       s = "python3 -m http.server 8080";
       vi = "nvim";
       vim = "nvim";
-      g = "gitui"
+      g = "gitui";
     };
 
     interactiveShellInit = builtins.readFile ./config.fish;
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 30765cc..300b247 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -14,14 +14,6 @@
       rainbow-delimiters-nvim
       neo-tree-nvim
       lualine-nvim
-      nvim-treesitter.withPlugins (p: [
-        p.lua
-        p.c
-        p.cpp
-        p.nix
-        p.ruby
-        p.fish
-      ])
       nvim-cursorline
       conform-nvim
       nvim-cmp
@@ -40,6 +32,14 @@
           rev = "5114853ed8f24661e48b726135bf78860d9339d5";
         };
       })
+
+      (nvim-treesitter.withPlugins (p: [
+        p.c
+        p.nix
+        p.ruby
+        p.lua
+        p.cpp
+      ]))
     ];
 
     extraPackages = with pkgs; [
@@ -48,6 +48,6 @@
       stylua
     ];
 
-    extraLuaConfig = builtins.readFile ./init.lua;
+    initLua = builtins.readFile ./init.lua;
   };
 }
diff --git a/home/nvim/init.lua b/home/nvim/init.lua
index 736fa3c..9411116 100644
--- a/home/nvim/init.lua
+++ b/home/nvim/init.lua
@@ -1,10 +1,12 @@
 -- Options
 local o = vim.opt
-vim.g.mapleader = " "
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_ruby_provider = 0
-vim.g.clipboard = 'osc52'
+local g = vim.g
+g.mapleader = " "
+g.loaded_perl_provider = 0
+g.loaded_ruby_provider = 0
+g.clipboard = "osc52"
 o.number = true
+o.winborder = "rounded"
 o.expandtab = true
 o.shiftwidth = 2
 o.tabstop = 4
@@ -31,17 +33,11 @@ o.mousescroll = "ver:0,hor:0"
 
 vim.lsp.semantic_tokens.enable = false
 
-vim.lsp.handlers.hover = function(_, result, ctx, config)
-  config = config or {}
-  config.border = "rounded"
-  return vim.lsp.handlers.hover(_, result, ctx, config)
-end
-
-vim.lsp.handlers.signature_help = function(_, result, ctx, config)
-  config = config or {}
-  config.border = "rounded"
-  return vim.lsp.handlers.signature_help(_, result, ctx, config)
-end
+vim.diagnostic.config({
+  float = {
+    border = "rounded",
+  },
+})
 
 vim.g.rainbow_delimiters = {
   highlight = {
@@ -73,13 +69,31 @@ vim.diagnostic.config({
 -- LSP config
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
-require("lspconfig").lua_ls.setup({
+vim.lsp.config("lua_ls", {
+  capabilities = capabilities,
+  settings = {
+    Lua = {
+      diagnostics = {
+        globals = {
+          "vim",
+        },
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+})
+
+vim.lsp.config("clangd", {
   capabilities = capabilities,
 })
 
-require("lspconfig").clangd.setup({
-  capabilities = capabilities,
-})
+vim.lsp.enable("lua_ls")
+vim.lsp.enable("clangd")
 
 -- Plugins
 require("picvim").setup({})
@@ -124,12 +138,6 @@ require("lualine").setup({
   },
 })
 
-require("nvim-treesitter.configs").setup({
-  highlight = {
-    enable = true,
-  },
-})
-
 require("nvim-cursorline").setup({
   cursorline = {
     enable = true,
@@ -244,7 +252,6 @@ map("n", "<C-Down>", function()
   neoscroll.scroll(0.1, { move_cursor = false, duration = 50 })
 end)
 
-
 -- Vimscript stuff
 vim.cmd([[
 aunmenu PopUp
diff --git a/hosts/syedm/default.nix b/hosts/syedm/default.nix
index d71e5b6..e446268 100644
--- a/hosts/syedm/default.nix
+++ b/hosts/syedm/default.nix
@@ -7,7 +7,7 @@
 
       ../../modules/cloudflare-ddns
       ../../modules/gitea
-      ../../modules/msjd
+      ../../modules/msjd.nix
     ];
 
   networking.hostName = "syedm";
diff --git a/modules/msjd.nix b/modules/msjd.nix
index b13dd34..7bcab22 100644
--- a/modules/msjd.nix
+++ b/modules/msjd.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   systemd.services.msjd = {