diff --git a/configurations/default.nix b/configurations/default.nix index 0f40de70..11c268b4 100644 --- a/configurations/default.nix +++ b/configurations/default.nix @@ -1,4 +1,4 @@ -{ home, nix, nixpkgs, flake, ... }: +{ home, nixpkgs, flake, ... }: let utils = import ../lib/utils.nix { lib = nixpkgs.lib; }; @@ -17,7 +17,6 @@ let global = { networking.hostName = self; - nix.package = nix.defaultPackage."${system}"; nix.nixPath = [ "nixpkgs=${nixpkgs}" "nixos-config=/etc/nixos/configuration.nix" diff --git a/flake.lock b/flake.lock index a18874fc..2427ee9d 100644 --- a/flake.lock +++ b/flake.lock @@ -13,19 +13,6 @@ "originalUrl": "github:nrdxp/home-manager/flakes", "url": "github:nrdxp/home-manager/4aed75b903140a3e7f5ccc4528f1748391543475" }, - "nix": { - "inputs": { - "nixpkgs": { - "inputs": {}, - "narHash": "sha256-ZzR2l1dovxeZ555KXxz7SAXrC72BfaR4BeqvJzRdmwQ=", - "originalUrl": "nixpkgs/release-19.09", - "url": "github:edolstra/nixpkgs/d37927a77e70a2b3408ceaa2e763b6df1f4d941a" - } - }, - "narHash": "sha256-8Y2swdV7/T7jjhGAKVrMRkAn7y4qTSjKNIW7NUe7V5s=", - "originalUrl": "nix", - "url": "github:NixOS/nix/90d2cf6ff98fc970c9abeae6c37dd323fd0ef953" - }, "nixpkgs": { "inputs": {}, "narHash": "sha256-rw7iL71iTpzgKfXGiRRGDHkbjtpK8N6+Pt0Ur00PphQ=", diff --git a/flake.nix b/flake.nix index f9d9d45e..ecdac19b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,18 +6,17 @@ inputs.nixpkgs.url = "github:nrdxp/nixpkgs/fork"; inputs.home.url = "github:nrdxp/home-manager/flakes"; - outputs = { self, home, nixpkgs, nix }: { + outputs = { self, home, nixpkgs }: { nixosConfigurations = let configs = import ./configurations { - inherit nix nixpkgs; + inherit nixpkgs; flake = self; home = home.nixosModules.home-manager; }; in configs; - }; } diff --git a/profiles/core.nix b/profiles/core.nix index 7008e982..66ba64e5 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -6,6 +6,7 @@ let in { + nix.package = pkgs.nixFlakes; imports = [ ../local/locale.nix