RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00
Code Issues Activity

Don't do inputsRaw hack

Browse source
This commit is contained in:
RGBCube 2023-12-14 10:53:56 +03:00
parent 33e3ebd11a
commit 2615d405c8
No known key found for this signature in database
2 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
flake.nix
View file

@ -1,5 +1,23 @@
let {
inputsRaw = { description = "All my NixOS configurations.";
nixConfig = {
extra-substituters = ''
https://nix-community.cachix.org/
https://hyprland.cachix.org/
https://cache.privatevoid.net/
https://cache.garnix.io/
'';
extra-trusted-public-keys = ''
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=
cache.privatevoid.net-1:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=
cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
'';
};
inputs = {
nixSuper = { nixSuper = {
url = "github:privatevoid-net/nix-super"; url = "github:privatevoid-net/nix-super";
}; };
@ -53,26 +71,6 @@ let
url = "github:RGBCube/ThemeNix"; url = "github:RGBCube/ThemeNix";
}; };
}; };
in {
description = "All my NixOS configurations.";
nixConfig = {
extra-substituters = ''
https://nix-community.cachix.org/
https://hyprland.cachix.org/
https://cache.privatevoid.net/
https://cache.garnix.io/
'';
extra-trusted-public-keys = ''
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=
cache.privatevoid.net-1:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=
cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
'';
};
inputs = inputsRaw;
outputs = { outputs = {
nixSuper, nixSuper,
@ -129,7 +127,7 @@ in {
in lib.nixosSystem { in lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputsRaw inputs ulib upkgs theme; }; specialArgs = { inherit inputs ulib upkgs theme; };
modules = [ modules = [
homeManager.nixosModules.default homeManager.nixosModules.default
defaultConfiguration defaultConfiguration

8
modules/nix/default.nix
View file

@ -1,4 +1,4 @@
{ inputsRaw, inputs, lib, ulib, upkgs, ... }: with ulib; { inputs, lib, ulib, upkgs, ... }: with ulib;
systemConfiguration { systemConfiguration {
nix = { nix = {
@ -18,9 +18,9 @@ systemConfiguration {
registry = (lib.filterAttrs registry = (lib.filterAttrs
(name: value: value != {}) (name: value: value != {})
(builtins.mapAttrs (builtins.mapAttrs
(name: value: lib.mkIf value.flake or true { (name: value: lib.mkIf (value ? "sourceInfo") {
flake = inputs.${name}; flake = value;
}) inputsRaw)) // { default.flake = inputs.nixpkgs; }; }) inputs)) // { default.flake = inputs.nixpkgs; };
settings.experimental-features = [ settings.experimental-features = [
"fetch-tree" "fetch-tree"