teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

flake: initial NUR support

Browse source
This commit is contained in:
Timothy DeHerrera 2020-01-10 00:10:59 -07:00
parent 7e58e0457e
commit 506e810b9f
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
4 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configuration.nix
View file

@ -1,7 +1,7 @@
# this file is an impure recreation of the flake profile currently deployed # this file is an impure recreation of the flake profile currently deployed
# based on the systems hostname. The purpose is so tools which do not yet have # based on the systems hostname. The purpose is so tools which do not yet have
# flake support (e.g `nixos-option`), can work as expected. # flake support (e.g `nixos-option`), can work as expected.
{ lib, ... }: { lib, pkgs, ... }:
let let
inherit (builtins) attrNames readDir; inherit (builtins) attrNames readDir;
@ -30,5 +30,12 @@ in {
nixpkgs.overlays = let nixpkgs.overlays = let
overlays = map (name: import (./overlays + "/${name}")) overlays = map (name: import (./overlays + "/${name}"))
(attrNames (readDir ./overlays)); (attrNames (readDir ./overlays));
in overlays; in overlays ++ [
(final: prev: {
nur = import (builtins.fetchTarball
"https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
})
];
} }

13
flake.lock
View file

@ -18,6 +18,19 @@
"narHash": "sha256-4p9gqMJTVmyH7eSq1euGZWusldWoBfKfi/VwZEPL2Mw=", "narHash": "sha256-4p9gqMJTVmyH7eSq1euGZWusldWoBfKfi/VwZEPL2Mw=",
"originalUrl": "github:nrdxp/nixpkgs/fork", "originalUrl": "github:nrdxp/nixpkgs/fork",
"url": "github:nrdxp/nixpkgs/1e232452ed4c57e9968f4342d9ba044d36403928" "url": "github:nrdxp/nixpkgs/1e232452ed4c57e9968f4342d9ba044d36403928"
},
"nur": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-4p9gqMJTVmyH7eSq1euGZWusldWoBfKfi/VwZEPL2Mw=",
"originalUrl": "nixpkgs",
"url": "github:nrdxp/nixpkgs/1e232452ed4c57e9968f4342d9ba044d36403928"
}
},
"narHash": "sha256-i+NZZWnhNcxl73e2FjfgKUn3sW42ZKiVeXNKv72MN14=",
"originalUrl": "github:nrdxp/NUR/flake",
"url": "github:nrdxp/NUR/c632e4112b19a1b2fa05242a8cc971091d12e154"
} }
}, },
"version": 3 "version": 3

3
flake.nix
View file

@ -5,8 +5,9 @@
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";
inputs.nur.url = "github:nrdxp/NUR/flake";
outputs = args@{ self, home, nixpkgs }: outputs = args@{ self, home, nixpkgs, nur }:
let let
inherit (builtins) listToAttrs baseNameOf attrNames readDir; inherit (builtins) listToAttrs baseNameOf attrNames readDir;
inherit (nixpkgs.lib) removeSuffix; inherit (nixpkgs.lib) removeSuffix;

4
hosts/default.nix
View file

@ -11,6 +11,8 @@ let
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.usr = utils; specialArgs.usr = utils;
specialArgs.nurModules = args.nur.nixosModules;
specialArgs.nurOverlays = args.nur.overlays;
modules = let modules = let
core = ../profiles/core.nix; core = ../profiles/core.nix;
@ -24,7 +26,7 @@ let
]; ];
system.configurationRevision = self.rev; system.configurationRevision = self.rev;
nixpkgs.overlays = self.overlays; nixpkgs.overlays = self.overlays ++ [ args.nur.overlay ];
}; };
local = import "${toString ./.}/${this}.nix"; local = import "${toString ./.}/${this}.nix";