axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: nix flake is broken, use pkgs.nixFlakes

Browse source
This commit is contained in:
Timothy DeHerrera 2019-12-17 15:56:02 -07:00
parent b94a880a69
commit 2bad76157e
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
4 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configurations/default.nix
View file

@ -1,4 +1,4 @@
{ home, nix, nixpkgs, flake, ... }: { home, nixpkgs, flake, ... }:
let let
utils = import ../lib/utils.nix { lib = nixpkgs.lib; }; utils = import ../lib/utils.nix { lib = nixpkgs.lib; };
@ -17,7 +17,6 @@ let
global = { global = {
networking.hostName = self; networking.hostName = self;
nix.package = nix.defaultPackage."${system}";
nix.nixPath = [ nix.nixPath = [
"nixpkgs=${nixpkgs}" "nixpkgs=${nixpkgs}"
"nixos-config=/etc/nixos/configuration.nix" "nixos-config=/etc/nixos/configuration.nix"

13
flake.lock
View file

@ -13,19 +13,6 @@
"originalUrl": "github:nrdxp/home-manager/flakes", "originalUrl": "github:nrdxp/home-manager/flakes",
"url": "github:nrdxp/home-manager/4aed75b903140a3e7f5ccc4528f1748391543475" "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": { "nixpkgs": {
"inputs": {}, "inputs": {},
"narHash": "sha256-rw7iL71iTpzgKfXGiRRGDHkbjtpK8N6+Pt0Ur00PphQ=", "narHash": "sha256-rw7iL71iTpzgKfXGiRRGDHkbjtpK8N6+Pt0Ur00PphQ=",

5
flake.nix
View file

@ -6,18 +6,17 @@
inputs.nixpkgs.url = "github:nrdxp/nixpkgs/fork"; inputs.nixpkgs.url = "github:nrdxp/nixpkgs/fork";
inputs.home.url = "github:nrdxp/home-manager/flakes"; inputs.home.url = "github:nrdxp/home-manager/flakes";
outputs = { self, home, nixpkgs, nix }: { outputs = { self, home, nixpkgs }: {
nixosConfigurations = nixosConfigurations =
let let
configs = import ./configurations { configs = import ./configurations {
inherit nix nixpkgs; inherit nixpkgs;
flake = self; flake = self;
home = home.nixosModules.home-manager; home = home.nixosModules.home-manager;
}; };
in in
configs; configs;
}; };
} }

1
profiles/core.nix
View file

@ -6,6 +6,7 @@ let
in in
{ {
nix.package = pkgs.nixFlakes;
imports = [ imports = [
../local/locale.nix ../local/locale.nix