adding modularity

flake.nix

@@ -4,16 +4,44 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # probably home manager at some point
+    # Home manager
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, ... }@inputs: {
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    ...
+  } @ inputs: {
 
-    nixosConfigurations.spectre-x360-2018 = nixpkgs.lib.nixosSystem {
+    ## NixOS configurations are the main output of this flake
+    # HP Spectre x360 2018
+    nixosConfigurations.spectre = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./machines/spectre-x360-2018/configuration.nix
-      ];
-    };
+        ./hosts/spectre-x360-2018
+        home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            # home-manager.extraSpecialArgs = inputs // specialArgs;
+            home-manager.users.remy = import ./users/remy.nix;
+          }
+        ];
+      };
+
+    # nixosConfigurations.raspberry-pi = nixpkgs.lib.nixosSystem {
+    #   system = "aarch64-linux";
+    #   modules = [
+    #     ./hosts/raspberry-pi/configuration.nix
+    #   ];
+    # };
+
+    ## Home Manager configurations here?
+    # TODO
+
   };
 }