diff --git a/flake.lock b/flake.lock
index f845a6f..d46c489 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "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": [
@@ -25,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746413188,
-        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
+        "lastModified": 1747106332,
+        "narHash": "sha256-mOdRWJzJAMp0hF8aSResyp8BeOO5VoSng1uqtEq+8xI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
+        "rev": "535a541b429c1e89f0955c160df1d6d2bfeaf802",
         "type": "github"
       },
       "original": {
@@ -38,35 +20,13 @@
         "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,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "lastModified": 1746904237,
+        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
         "type": "github"
       },
       "original": {
@@ -78,59 +38,26 @@
     },
     "nixpkgsveryold": {
       "locked": {
-        "lastModified": 1659446231,
-        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
+        "lastModified": 1704290814,
+        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
+        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "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 36a640b..343d62b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgsveryold.url = "github:nixos/nixpkgs?ref=nixos-21.11";
+    nixpkgsveryold.url = "github:nixos/nixpkgs?ref=nixos-23.05";
 
     home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    nix4nvchad = {
-      url = "github:nix-community/nix4nvchad";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    home-manager.inputs.nixpkgs.follows = "nixpkgs"; # ensures version follows nixpkgs
   };
 
   #outputs = { self, nixpkgs, nixpkgsveryold }:
@@ -26,23 +22,23 @@
     #  };
     #};
 
-  outputs = { nixpkgs, home-manager, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, ... }:
     let
-       system = "x86_64-linux";
-       pkgs = import nixpkgs {
-		inherit system;
-		config = {
-			allowUnfree = false;
+      lib = nixpkgs.lib;
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+    	nixosConfigurations = {
+		biscuit = lib.nixosSystem {
+			inherit system;
+			modules = [ ./nixos/configuration.nix ];
 		};
 	};
-    in {
-		nixosConfigurations = {
-			biscuit = nixpkgs.lib.nixosSystem {
-				specialArgs = { inherit inputs system; };
-				modules = [
-					./nixos/configuration.nix
-				];
-			};
+	homeConfigurations = {
+		biscuit = home-manager.lib.homeManagerConfiguration {
+			inherit pkgs;
+			modules = [ ./home-manager/home.nix ];
 		};
-       };
+	};
+    };
 }
diff --git a/home-manager/.home.nix.swp b/home-manager/.home.nix.swp
deleted file mode 100644
index 8e0dd67..0000000
Binary files a/home-manager/.home.nix.swp and /dev/null differ
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 6c82dc5..60a5e76 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,7 +7,7 @@
   ...
 }: {
   imports = [
-    inputs.nvchad4nix.homeManagerModule
+	# ../packages/nvim/default.nix
   ];
 
   home = {
@@ -15,18 +15,29 @@
     homeDirectory = "/home/biscuit";
   };
 
-  home.packages = [];
+  home.packages = [
+	# pkgs.neovim
+  ];
   home.sessionVariables = {
-    EDITOR = "nvim";
+    # EDITOR = "nvim";
     };
 
-  programs.home-manager.enable = true;
-  programs.git.enable = true;
-  programs.nvchad.enable - true;
+  home.file.".config/nvim" = {
+	source = ./nvchad;
+	recursive = true;
+	force = true;	
+  };	
 
+  programs.git.enable = true;
+  programs.neovim.enable = true;
+  programs.bash.shellAliases = {
+	enable = true;
+	ll = "ls -l";
+  };
 
   systemd.user.startServices = "sd-switch";
 
-  home.stateVersion = "23.11";
+  programs.home-manager.enable = true;
+  home.stateVersion = "23.05";
 }
 
diff --git a/home-manager/nvchad b/home-manager/nvchad
new file mode 160000
index 0000000..2b4293a
--- /dev/null
+++ b/home-manager/nvchad
@@ -0,0 +1 @@
+Subproject commit 2b4293a4c10a29cb52eefc430d3d77582c1a24fd
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 49e5f03..6e061c5 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -52,8 +52,8 @@
     vim  # Default editor
     wget
     git
-    neovim
     home-manager
+    # neovim
   ];
 
   # Enable the OpenSSH daemon.
@@ -61,13 +61,13 @@
 
   # Enable experimental features
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-nixpkgs = {
-  overlays = [
-    (final: prev: {
-      nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad;
-    })
-  ];
-};
+#nixpkgs = {
+ # overlays = [
+  #  (final: prev: {
+   #   nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad;
+    #})
+  #];
+#};
   # System state version
   system.stateVersion = "24.11"; # Ensure this matches your NixOS version
 }
diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix
new file mode 100644
index 0000000..ca35464
--- /dev/null
+++ b/packages/nvim/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+
+
+  home.file.".config/nvim" = {
+	source = ./nvchad;
+	recursive = true;
+	force = true;	
+  };	
+}
diff --git a/app/nvim/default.nix b/packages/zsh/default.nix
similarity index 100%
rename from app/nvim/default.nix
rename to packages/zsh/default.nix