diff --git a/app/nvim/default.nix b/app/nvim/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/flake.lock b/flake.lock
index 6e49a16..f845a6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -20,6 +38,28 @@
         "type": "github"
       }
     },
+    "nix4nvchad": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nvchad-starter": "nvchad-starter"
+      },
+      "locked": {
+        "lastModified": 1746419967,
+        "narHash": "sha256-0Rst+it8hsUS08UyS0YtUUsFfDX0zkpflOhHzcMz5Zw=",
+        "owner": "nix-community",
+        "repo": "nix4nvchad",
+        "rev": "468b8f9a00e7fddb3cf031bb4e968c3d08562e4e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix4nvchad",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1746328495,
@@ -52,12 +92,45 @@
         "type": "github"
       }
     },
+    "nvchad-starter": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1746346803,
+        "narHash": "sha256-+z0LG/N+dCQY0vFCKEeBSifvzOB7+KFKtAZGJMKQpT0=",
+        "owner": "NvChad",
+        "repo": "starter",
+        "rev": "2b4293a4c10a29cb52eefc430d3d77582c1a24fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NvChad",
+        "ref": "main",
+        "repo": "starter",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix4nvchad": "nix4nvchad",
         "nixpkgs": "nixpkgs",
         "nixpkgsveryold": "nixpkgsveryold"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index a4607e0..36a640b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,10 @@
 
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nix4nvchad = {
+      url = "github:nix-community/nix4nvchad";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   #outputs = { self, nixpkgs, nixpkgsveryold }:
@@ -22,28 +26,23 @@
     #  };
     #};
 
-  outputs = { self, nixpkgs, home-manager, ... } @ inputs:
+  outputs = { nixpkgs, home-manager, ... } @ inputs:
     let
-      system = "x86_64-linux";
-      lib = nixpkgs.lib;
-      extraSpecialArgs = { inherit system inputs; };
-      specialArgs = { inherit system inputs; };
-    in {
-	nixosConfigurations = {
-		biscuit = lib.nixosSystem {
-  			system = "x86_64-linux";
-  			specialArgs = extraSpecialArgs;
-  			modules = [
-    				./nixos/configuration.nix
-    				home-manager.nixosModules.home-manager {
-					home-manager = {
-        					useGlobalPkgs = true;
-        					users.biscuit = import ./home-manager/home.nix;
-      					};
-    				}			
-  			];
+       system = "x86_64-linux";
+       pkgs = import nixpkgs {
+		inherit system;
+		config = {
+			allowUnfree = false;
 		};
-
-       	};
-    };
+	};
+    in {
+		nixosConfigurations = {
+			biscuit = nixpkgs.lib.nixosSystem {
+				specialArgs = { inherit inputs system; };
+				modules = [
+					./nixos/configuration.nix
+				];
+			};
+		};
+       };
 }
diff --git a/home-manager/.home.nix.swp b/home-manager/.home.nix.swp
new file mode 100644
index 0000000..8e0dd67
Binary files /dev/null and b/home-manager/.home.nix.swp differ
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a17572e..6c82dc5 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,10 +1,32 @@
-{ inputs, config, pkgs, ... }:
-
 {
-  home.username = "biscuit";
-  home.homeDirectory = "/home/biscuit";
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.nvchad4nix.homeManagerModule
+  ];
 
-  programs.bash.enable = true;
-  home.stateVersion = "23.11"; # Adjust to your system version
+  home = {
+    username = "biscuit";
+    homeDirectory = "/home/biscuit";
+  };
+
+  home.packages = [];
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    };
+
+  programs.home-manager.enable = true;
+  programs.git.enable = true;
+  programs.nvchad.enable - true;
+
+
+  systemd.user.startServices = "sd-switch";
+
+  home.stateVersion = "23.11";
 }
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c418558..49e5f03 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -43,7 +43,6 @@
     isNormalUser = true;
     description = "Biscuit";
     extraGroups = [ "networkmanager" "wheel" ];
-    initialPassword = "biscuitforeveryone";
     packages = with pkgs; 
     [];
   };
@@ -53,6 +52,8 @@
     vim  # Default editor
     wget
     git
+    neovim
+    home-manager
   ];
 
   # Enable the OpenSSH daemon.
@@ -60,7 +61,13 @@
 
   # Enable experimental features
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
+nixpkgs = {
+  overlays = [
+    (final: prev: {
+      nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad;
+    })
+  ];
+};
   # System state version
   system.stateVersion = "24.11"; # Ensure this matches your NixOS version
 }