From 553749fea46009f03fad02081de7f42360a6fb3e Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 6 Jul 2021 23:26:24 +0200 Subject: [PATCH] add nvd --- flake.lock | 54 ++++++++++++++++++++++++++++++++++++++++- flake.nix | 1 + home/configurations.nix | 6 +++-- home/home/pkgs.nix | 1 + outputs.nix | 3 ++- 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e5ba335..c198017 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" @@ -78,12 +93,49 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1625512941, + "narHash": "sha256-P2POZzfG+Hp8ktIWwkOs/OMB8jSsQvIPQaLO0swpgZo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e0ce8c5d478d06b37a4faa7a4cc8642c6bb97de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nvd": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1625605432, + "narHash": "sha256-nsFkuko8XqfMMIiszRw2AerDUyZ33ohniEbleqMoHs4=", + "ref": "init-flake", + "rev": "51fab994bcb8898a5e7c6e95608cd64d0a18d6a5", + "revCount": 12, + "type": "git", + "url": "https://gitlab.com/dadada_/nvd.git" + }, + "original": { + "ref": "init-flake", + "type": "git", + "url": "https://gitlab.com/dadada_/nvd.git" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nvd": "nvd" } } }, diff --git a/flake.nix b/flake.nix index 167ee01..8550cb7 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; home-manager.url = github:nix-community/home-manager; nixos-hardware.url = github:NixOS/nixos-hardware/master; + nvd.url = git+https://gitlab.com/dadada_/nvd.git?ref=init-flake; }; outputs = { ... } @ args: import ./outputs.nix args; diff --git a/home/configurations.nix b/home/configurations.nix index 66ffe89..0df592e 100644 --- a/home/configurations.nix +++ b/home/configurations.nix @@ -1,6 +1,7 @@ { self , nixpkgs , home-manager +, nvd }: let hmConfiguration = @@ -27,8 +28,9 @@ in { home = hmConfiguration { extraModules = [ ./home ]; - overlays = with self.overlays; [ - scripts + overlays = [ + self.overlays.scripts + (final: prev: { n = nvd; }) ]; stateVersion = "20.09"; }; diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index 626eddc..de578e5 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -56,6 +56,7 @@ with pkgs; [ nfs-utils niv nmap + nvd openssl p7zip pass diff --git a/outputs.nix b/outputs.nix index 3e6ecab..2f7ed10 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,6 +4,7 @@ , nixpkgs , home-manager , nixos-hardware +, nvd , ... }: (flake-utils.lib.eachSystem ["x86_64-linux"] (system: @@ -54,7 +55,7 @@ }; })) // { hmConfigurations = import ./home/configurations.nix { - inherit self nixpkgs home-manager; + inherit self nixpkgs home-manager nvd; }; hmModules = import ./home/modules; nixosConfigurations = import ./nixos/configurations.nix {