3 files changed, 40 insertions, 30 deletions

diff --git a/flake.lock b/flake.lock
index cb0e326..d4559d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,9 @@
   "nodes": {
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1723015306,
@@ -20,22 +22,6 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722185531,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
         "lastModified": 1722987190,
         "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
         "owner": "nixos",
@@ -53,7 +39,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 06b7aa4..f344e40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,22 +1,36 @@
 {
-        description = "simple nixos flake";
+        description = "my nixos configuration";
 
         inputs = {
                 nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-                home-manager.url = "github:nix-community/home-manager";
+
+                home-manager = {
+                        url = "github:nix-community/home-manager";
+                        inputs.nixpkgs.follows = "nixpkgs";
+                };
         };
 
-        outputs = { self, nixpkgs, ... }@attrs: {
+        outputs = { self, home-manager, nixpkgs, ... }@attrs: {
                 # TODO: deduplicate this
-                nixosConfigurations.demiurge = nixpkgs.lib.nixosSystem {
-                        system = "x86_64-linux";
-                        specialArgs = attrs;
-                        modules = [ ./hosts/demiurge ];
-                };
-                nixosConfigurations.lappy = nixpkgs.lib.nixosSystem {
-                        system = "x86_64-linux";
-                        specialArgs = attrs;
-                        modules = [ ./hosts/lappy ];
+                nixosConfigurations = {
+                        demiurge = nixpkgs.lib.nixosSystem {
+                                system = "x86_64-linux";
+                                specialArgs = attrs;
+                                modules = [ ./hosts/demiurge ];
+                        };
+
+                        lappy = nixpkgs.lib.nixosSystem {
+                                system = "x86_64-linux";
+                                specialArgs = attrs;
+                                modules = [
+                                        ./hosts/lappy
+                                        home-manager.nixosModules.home-manager {
+                                                home-manager.useGlobalPkgs = true;
+                                                home-manager.useUserPackages = true;
+                                                home-manager.users.vin = import ./home.nix;
+                                        }
+                                ];
+                        };
                 };
         };
 }
diff --git a/home.nix b/home.nix
new file mode 100644
index 0000000..c84ce53
--- /dev/null
+++ b/home.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+        home.username = "vin";
+        home.homeDirectory = "/home/vin";
+
+        home.stateVersion = "24.05";
+
+        programs.home-manager.enable = true;
+}