From 5340fd3d644975ec6a58a306013af50d455203ea Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 27 Mar 2023 14:59:32 +0200 Subject: [PATCH] Use unstable home-manager for darwin --- darwin/configuration.nix | 2 ++ flake.lock | 39 ++++++++++++++++++++++++++++++++++++++- flake.nix | 4 +++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index a71c708..fb69b98 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -10,6 +10,8 @@ environment.systemPackages = [ ]; + environment.shells = with pkgs; [ fish ]; + # Use a custom configuration.nix location. # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; diff --git a/flake.lock b/flake.lock index 68223b1..c9534f4 100644 --- a/flake.lock +++ b/flake.lock @@ -192,6 +192,27 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ], + "utils": "utils_3" + }, + "locked": { + "lastModified": 1679786039, + "narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "kak-lsp": { "flake": false, "locked": { @@ -451,7 +472,7 @@ "inputs": { "naersk": "naersk", "nixpkgs": "nixpkgs_5", - "utils": "utils_3" + "utils": "utils_4" }, "locked": { "lastModified": 1669555118, @@ -474,6 +495,7 @@ "deploy-rs": "deploy-rs", "flake-utils": "flake-utils_2", "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "kak-lsp": "kak-lsp", "kakoune": "kakoune", "nix-gaming": "nix-gaming", @@ -622,6 +644,21 @@ } }, "utils_3": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", diff --git a/flake.nix b/flake.nix index eb5f096..a1b4f96 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; home-manager.url = "github:natsukagami/home-manager/release-22.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager-unstable.url = "github:nix-community/home-manager"; + home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs"; @@ -100,7 +102,7 @@ # Set nix path haskellDotNix (nixpkgsAsRegistry_ nixpkgs-unstable) - home-manager.darwinModules.home-manager + inputs.home-manager-unstable.darwinModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;