diff --git a/configuration.nix b/configuration.nix
index 31f814d..642e8a2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,7 +5,7 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./home.nix
+      # ./home.nix
       ./hardware-configuration.nix
       ./gnome-extensions.nix
     ];
@@ -177,7 +177,6 @@
       gh
       ghidra
       gimp
-      git
       gnome.gnome-boxes
       gnome.gnome-tweaks
       gnome-secrets
@@ -280,6 +279,7 @@
     aircrack-ng
     bat
     exa
+    git
     helix
     iw
     macchanger
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..66e6dcc
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1692763155,
+        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1692794066,
+        "narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fc944919f743bb22379dddf18dcb72db6cff84aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.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
new file mode 100644
index 0000000..d47e1fa
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,23 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  outputs = { nixpkgs, home-manager, ... }: {
+    nixosConfigurations.cafe = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./configuration.nix
+        home-manager.nixosModules.home-manager {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.h = import ./home.nix;
+        }
+      ];
+    };
+    
+  };
+}
diff --git a/home.nix b/home.nix
index 04bf450..d4ed51f 100644
--- a/home.nix
+++ b/home.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports  = [
-    # nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
-    # nix-channel --update
-    <home-manager/nixos>
-  ];
 
   home-manager.users.h = {
     home.stateVersion = "23.05";