add nvd #5

Merged
dadada merged 1 commit from add-nvd into main 2021-07-06 23:28:39 +02:00
5 changed files with 61 additions and 4 deletions

54
flake.lock generated
View file

@ -15,6 +15,21 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -78,12 +93,49 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"nvd": "nvd"
} }
} }
}, },

View file

@ -6,6 +6,7 @@
nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
nixos-hardware.url = github:NixOS/nixos-hardware/master; 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; outputs = { ... } @ args: import ./outputs.nix args;

View file

@ -1,6 +1,7 @@
{ self { self
, nixpkgs , nixpkgs
, home-manager , home-manager
, nvd
}: }:
let let
hmConfiguration = hmConfiguration =
@ -27,8 +28,9 @@ in
{ {
home = hmConfiguration { home = hmConfiguration {
extraModules = [ ./home ]; extraModules = [ ./home ];
overlays = with self.overlays; [ overlays = [
scripts self.overlays.scripts
(final: prev: { n = nvd; })
]; ];
stateVersion = "20.09"; stateVersion = "20.09";
}; };

View file

@ -56,6 +56,7 @@ with pkgs; [
nfs-utils nfs-utils
niv niv
nmap nmap
nvd
openssl openssl
p7zip p7zip
pass pass

View file

@ -4,6 +4,7 @@
, nixpkgs , nixpkgs
, home-manager , home-manager
, nixos-hardware , nixos-hardware
, nvd
, ... , ...
}: }:
(flake-utils.lib.eachSystem ["x86_64-linux"] (system: (flake-utils.lib.eachSystem ["x86_64-linux"] (system:
@ -54,7 +55,7 @@
}; };
})) // { })) // {
hmConfigurations = import ./home/configurations.nix { hmConfigurations = import ./home/configurations.nix {
inherit self nixpkgs home-manager; inherit self nixpkgs home-manager nvd;
}; };
hmModules = import ./home/modules; hmModules = import ./home/modules;
nixosConfigurations = import ./nixos/configurations.nix { nixosConfigurations = import ./nixos/configurations.nix {