diff --git a/flake.nix b/flake.nix index 72ff227..e44bcf4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,12 @@ { - inputs.modules.url = "path:modules/"; - inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + inputs = { + modules = { + url = "path:modules/"; + }; + nixos-hardware = { + url = "github:NixOS/nixos-hardware/master"; + }; + }; outputs = { self, modules, nixos-hardware }: let diff --git a/modules/flake.lock b/modules/flake.lock new file mode 100644 index 0000000..a53ea32 --- /dev/null +++ b/modules/flake.lock @@ -0,0 +1,69 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/flake.nix b/modules/flake.nix index c54c746..a9c54c8 100644 --- a/modules/flake.nix +++ b/modules/flake.nix @@ -1,7 +1,9 @@ { description = "Main Flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs = { + url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -12,7 +14,8 @@ }; }; outputs = { self, home-manager, nix-darwin, nixpkgs }: { - lib = { + default + lib = { makeImports = { ... }@attrs: [ (import ./main.nix attrs) ]; makeNixOsModule = { system, configuration ? null, ... }@attrs: nixpkgs.lib.nixosSystem {