From 111849d9a462561ba752cdc3c2a9006b4463b593 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 24 Jul 2021 20:01:36 +0300 Subject: [PATCH] fix again --- flake.lock | 6 ++++++ flake.nix | 2 +- modules/module-list.nix | 1 - profiles/core/default.nix | 12 +++++++----- users/patriot/default.nix | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 modules/module-list.nix diff --git a/flake.lock b/flake.lock index 5040dee..3382a44 100644 --- a/flake.lock +++ b/flake.lock @@ -100,9 +100,11 @@ "flake-compat": "flake-compat", "naersk": "naersk", "nixpkgs": [ + "digga", "nixpkgs" ], "utils": [ + "digga", "flake-utils" ] }, @@ -163,6 +165,7 @@ }, "original": { "owner": "divnix", + "ref": "main", "repo": "digga", "type": "github" } @@ -201,6 +204,7 @@ "flake-utils-plus": { "inputs": { "flake-utils": [ + "digga", "flake-utils" ] }, @@ -312,9 +316,11 @@ "nixos-generators": { "inputs": { "nixlib": [ + "digga", "nixlib" ], "nixpkgs": [ + "digga", "blank" ] }, diff --git a/flake.nix b/flake.nix index bb2ecd7..01370f4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ nixos.url = "nixpkgs/nixos-unstable"; latest.url = "nixpkgs"; - digga.url = "github:divnix/digga"; + digga.url = "github:divnix/digga/main"; digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixlib.follows = "nixos"; digga.inputs.home-manager.follows = "home"; diff --git a/modules/module-list.nix b/modules/module-list.nix deleted file mode 100644 index e94ccd5..0000000 --- a/modules/module-list.nix +++ /dev/null @@ -1 +0,0 @@ -[ ./security/mitigations.nix ] diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 3cfcac8..2e6f42e 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -1,7 +1,7 @@ -{ self, inputs, config, pkgs, lib, ourLib, ... }: +{ self, inputs, config, pkgs, lib, ... }: let inherit (lib) fileContents mkIf; - pkgBin = ourLib.pkgBinNoDep pkgs; + pkgBin = lib.our.pkgBinNoDep pkgs; coreBin = v: "${pkgs.coreutils}/bin/${v}"; nixBin = "${config.nix.package}/bin/nix"; @@ -143,9 +143,11 @@ in nix = let registry = - builtins.mapAttrs - (_: v: { flake = v; }) - (lib.filterAttrs (_: v: v ? outputs) inputs); + builtins.removeAttrs + (builtins.mapAttrs + (_: v: { flake = v; }) + (lib.filterAttrs (_: v: v ? outputs) inputs)) + [ "bud" ]; in { autoOptimiseStore = true; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 6945e77..212acfc 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -1,8 +1,8 @@ -{ config, pkgs, lib, ourLib, ... }: +{ config, pkgs, lib, ... }: let inherit (lib) mapAttrs' nameValuePair; inherit (builtins) readDir fetchGit; - pkgBin = ourLib.pkgBinNoDep pkgs; + pkgBin = lib.our.pkgBinNoDep pkgs; nixosConfig = config; in