diff --git a/flake.lock b/flake.lock index d213622..1090d84 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "type": "github" }, "original": { @@ -19,14 +19,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1640592198, - "narHash": "sha256-F5dWVGQMscmGyLTzNLocPB1v8Ijp8ONx8Nq9Dmi5PSw=", + "lastModified": 1656367977, + "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b197562ab7bf114dd5f6716f41d4b5be6ccd357", + "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1", "type": "github" }, "original": { @@ -37,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640418986, - "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", + "lastModified": 1656401090, + "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", + "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb", "type": "github" }, "original": { @@ -57,6 +58,21 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs" } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e00ce0f..82b7c9e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,13 +16,11 @@ { homeConfigurations = { walkah = home-manager.lib.homeManagerConfiguration { - system = system; - homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah"; - username = "walkah"; - stateVersion = "22.05"; - configuration = { config, pkgs, ... }: { - imports = [ ./home.nix ]; - }; + inherit pkgs; + + modules = [ + ./home.nix + ]; }; }; packages.default = diff --git a/home.nix b/home.nix index 01f0132..22b0483 100644 --- a/home.nix +++ b/home.nix @@ -4,8 +4,8 @@ # Home Manager needs a bit of information about you and the # paths it should manage. - # home.username = builtins.getEnv "USER"; - # home.homeDirectory = builtins.getEnv "HOME"; + home.username = "walkah"; + home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah"; home.sessionPath = [ "$HOME/.cargo/bin"