diff options
| -rw-r--r-- | flake.lock | 65 | ||||
| -rw-r--r-- | flake.nix | 22 |
2 files changed, 28 insertions, 59 deletions
diff --git a/flake.lock b/flake.lock index 8e21c1fb..d98470be 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "darwin": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { - "lastModified": 1664210064, - "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", + "lastModified": 1665392861, + "narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", + "rev": "ef56fd8979b5f4e800c4716f62076e00600b1172", "type": "github" }, "original": { @@ -24,16 +24,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "utils": "utils" }, "locked": { - "lastModified": 1665119273, - "narHash": "sha256-neL/ZRrwk47Ke1nfjk8ltlIm+NRZyA3MBcNbqEGSBeE=", + "lastModified": 1665476539, + "narHash": "sha256-NDs0qfTSfG+vEvB3HN2GOOZgMBPAYBpFeIC4hrN5wjk=", "owner": "nix-community", "repo": "home-manager", - "rev": "9fcae11ff29ca5f959b05c206f3724486c28ff07", + "rev": "b37a909508edb8d7fdcd04ac90761b2cfa2a5f28", "type": "github" }, "original": { @@ -42,29 +42,13 @@ "type": "github" } }, - "nixos": { - "locked": { - "lastModified": 1664883812, - "narHash": "sha256-wqBAcVRBxls2nVaNeQaOy9SRg/bvEUiD26TQDprIg8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe76645aaf2fac3baaa2813fd0089930689c53b5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1665040200, - "narHash": "sha256-glqL6yj3aUm40y92inzRmowGt9aIrUrpBX7eBAMic4I=", + "lastModified": 1665321371, + "narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47fd70289491c1f0c0d9a1f44fb5a9e2801120c9", + "rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c", "type": "github" }, "original": { @@ -73,13 +57,13 @@ "type": "github" } }, - "nixos-unstable": { + "nixpkgs": { "locked": { - "lastModified": 1664989420, - "narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "37bd39839acf99c5b738319f42478296f827f274", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "type": "github" }, "original": { @@ -89,29 +73,12 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1665088587, - "narHash": "sha256-6FSRuzx4ztMt859CT7WCKQR/TdsTziw1zAse3QfC1Ps=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d387fb2e3fbda450f66cbb01e421dd9045043ef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "darwin": "darwin", "home-manager": "home-manager", - "nixos": "nixos", "nixos-hardware": "nixos-hardware", - "nixos-unstable": "nixos-unstable", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } }, "utils": { diff --git a/flake.nix b/flake.nix index f5314a26..eb5eecd8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,29 +1,31 @@ { inputs = { - nixos.url = github:NixOS/nixpkgs/nixos-22.05; - nixos-unstable.url = github:NixOS/nixpkgs/nixos-unstable; - nixpkgs-unstable.url = github:NixOS/nixpkgs; + nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; nixos-hardware.url = github:NixOS/nixos-hardware; darwin.url = github:lnl7/nix-darwin/master; - darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; + darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = github:nix-community/home-manager; - home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, darwin, home-manager, nixos-unstable, ... }@attrs: { - nixosConfigurations.prefect = nixos-unstable.lib.nixosSystem { + outputs = { self, darwin, home-manager, nixpkgs, ... }@attrs: + let + darwinSystem = + "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation + darwinPkgs = nixpkgs.legacyPackages.${darwinSystem}; + in { + nixosConfigurations.prefect = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; modules = [ ./system/prefect.nix ]; }; darwinConfigurations.mba = darwin.lib.darwinSystem { - system = "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation + system = darwinSystem; specialArgs = attrs; modules = [ ./system/mba.nix ]; }; homeConfigurations.mba = home-manager.lib.homeManagerConfiguration { - system = "x86_64-darwin"; - specialArgs = attrs; + pkgs = darwinPkgs; modules = [ ./user/mba.nix ]; }; }; |