fix again

This commit is contained in:
dusk 2021-07-24 20:01:36 +03:00
parent 98e8ff16b2
commit 111849d9a4
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
5 changed files with 16 additions and 9 deletions

View File

@ -100,9 +100,11 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"digga",
"nixpkgs" "nixpkgs"
], ],
"utils": [ "utils": [
"digga",
"flake-utils" "flake-utils"
] ]
}, },
@ -163,6 +165,7 @@
}, },
"original": { "original": {
"owner": "divnix", "owner": "divnix",
"ref": "main",
"repo": "digga", "repo": "digga",
"type": "github" "type": "github"
} }
@ -201,6 +204,7 @@
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"digga",
"flake-utils" "flake-utils"
] ]
}, },
@ -312,9 +316,11 @@
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": [ "nixlib": [
"digga",
"nixlib" "nixlib"
], ],
"nixpkgs": [ "nixpkgs": [
"digga",
"blank" "blank"
] ]
}, },

View File

@ -10,7 +10,7 @@
nixos.url = "nixpkgs/nixos-unstable"; nixos.url = "nixpkgs/nixos-unstable";
latest.url = "nixpkgs"; latest.url = "nixpkgs";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga/main";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";

View File

@ -1 +0,0 @@
[ ./security/mitigations.nix ]

View File

@ -1,7 +1,7 @@
{ self, inputs, config, pkgs, lib, ourLib, ... }: { self, inputs, config, pkgs, lib, ... }:
let let
inherit (lib) fileContents mkIf; inherit (lib) fileContents mkIf;
pkgBin = ourLib.pkgBinNoDep pkgs; pkgBin = lib.our.pkgBinNoDep pkgs;
coreBin = v: "${pkgs.coreutils}/bin/${v}"; coreBin = v: "${pkgs.coreutils}/bin/${v}";
nixBin = "${config.nix.package}/bin/nix"; nixBin = "${config.nix.package}/bin/nix";
@ -143,9 +143,11 @@ in
nix = nix =
let let
registry = registry =
builtins.mapAttrs builtins.removeAttrs
(_: v: { flake = v; }) (builtins.mapAttrs
(lib.filterAttrs (_: v: v ? outputs) inputs); (_: v: { flake = v; })
(lib.filterAttrs (_: v: v ? outputs) inputs))
[ "bud" ];
in in
{ {
autoOptimiseStore = true; autoOptimiseStore = true;

View File

@ -1,8 +1,8 @@
{ config, pkgs, lib, ourLib, ... }: { config, pkgs, lib, ... }:
let let
inherit (lib) mapAttrs' nameValuePair; inherit (lib) mapAttrs' nameValuePair;
inherit (builtins) readDir fetchGit; inherit (builtins) readDir fetchGit;
pkgBin = ourLib.pkgBinNoDep pkgs; pkgBin = lib.our.pkgBinNoDep pkgs;
nixosConfig = config; nixosConfig = config;
in in