diff --git a/flake.lock b/flake.lock index 56bbd1d..182d15f 100644 --- a/flake.lock +++ b/flake.lock @@ -45,16 +45,16 @@ ] }, "locked": { - "lastModified": 1782154529, - "narHash": "sha256-mVdyS2SxbPGNHTJX4n4EUMT/S2BPyZJ/ZR2UhkJcSF4=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "af11a877f238208676b596a5b6c3f3d8dcf5a86b", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index b3a50e7..f11e3a6 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ url = "github:zhaofengli/nix-homebrew"; }; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index ae28d50..86780f2 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -9,6 +9,7 @@ ids.gids.nixbld = 350; programs.fish.enable = true; environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; + nixpkgs.config.allowUnfree = true; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; @@ -19,7 +20,7 @@ # The platform the configuration will be used on. nixpkgs.hostPlatform = "aarch64-darwin"; users.users.nyxerinys = { - name = "Nyx"; - home = "/Users/nyxerinys"; + name = "nyxerinys"; + home = "/Users/nyxerinys"; }; } \ No newline at end of file diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index 1e4cbd6..f04c7f1 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -1,10 +1,15 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "nyxerinys"; - home.homeDirectory = "/home/nyxerinys"; + home.homeDirectory = ( + if pkgs.stdenv.isDarwin then + "/Users/nyxerinys" + else + "/home/nyxerinys" + ); home.packages = with pkgs; [ discord ];