From 73f3f28b13c7773153be6889a849fc4e0727ab09 Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Tue, 30 Jul 2024 09:27:28 +0100 Subject: [PATCH] Fixes to make it build. --- flake.lock | 25 +++++-------------------- flake.nix | 8 +++----- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index fbece26..d8596d1 100644 --- a/flake.lock +++ b/flake.lock @@ -4,19 +4,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1657396086, - "narHash": "sha256-4cQ6hEuewWoFkTBlu211JGxPQQ1Zyli8oEq1cu7cVeA=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "c645cc9f82c7753450d1fa4d1bc73b64960a9d7a", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -42,21 +42,6 @@ "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 e1719be..a84f8ab 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -12,7 +12,8 @@ outputs = { self, nixpkgs, home-manager }: let username = "ppetru"; - system = "x64_64-linux"; + homeDirectory = "/home/${username}"; + system = "x86_64-linux"; stateVersion = "24.05"; pkgs = import nixpkgs { @@ -23,9 +24,6 @@ }; }; - homeDirPrefix = if pkgs.stdenv.hostPlatform.isDarwin then "/Users" else "/home"; - homeDirectory = "/${homeDirPrefix}/${username}"; - home = (import ./home.nix { inherit homeDirectory pkgs stateVersion system username; });