remove scripts package and use flake

This commit is contained in:
Tim Schubert 2021-08-01 19:28:28 +02:00
parent 7ff1c1922f
commit 1e56cd9c83
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
4 changed files with 8 additions and 6 deletions

View file

@ -22,6 +22,10 @@
url = git+https://gitlab.com/khumba/nvd.git; url = git+https://gitlab.com/khumba/nvd.git;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
scripts = {
url = git+https://git.dadada.li/dadada/scripts.git?ref=main;
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { ... } @ args: import ./outputs.nix args; outputs = { ... } @ args: import ./outputs.nix args;

View file

@ -3,6 +3,7 @@
, home-manager , home-manager
, nix-doom-emacs , nix-doom-emacs
, nvd , nvd
, scripts
}@inputs: }@inputs:
let let
hmConfiguration = hmConfiguration =
@ -30,7 +31,7 @@ in
home = hmConfiguration { home = hmConfiguration {
extraModules = [ ./home ]; extraModules = [ ./home ];
overlays = [ overlays = [
self.overlays.scripts (final: prev: { s = scripts; })
(final: prev: { n = nvd; }) (final: prev: { n = nvd; })
]; ];
stateVersion = "20.09"; stateVersion = "20.09";

View file

@ -6,6 +6,7 @@
, nix-doom-emacs , nix-doom-emacs
, nixos-hardware , nixos-hardware
, nvd , nvd
, scripts
, ... , ...
}@inputs: }@inputs:
(flake-utils.lib.eachDefaultSystem (system: (flake-utils.lib.eachDefaultSystem (system:
@ -51,14 +52,13 @@
}; };
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
deploy = pkgs.callPackage ./pkgs/deploy.nix { }; deploy = pkgs.callPackage ./pkgs/deploy.nix { };
scripts = pkgs.callPackage ./pkgs/scripts.nix { };
keys = pkgs.callPackage ./pkgs/keys { }; keys = pkgs.callPackage ./pkgs/keys { };
homePage = pkgs.callPackage ./pkgs/homePage { }; homePage = pkgs.callPackage ./pkgs/homePage { };
recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd; recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
}; };
})) // { })) // {
hmConfigurations = import ./home/configurations.nix { hmConfigurations = import ./home/configurations.nix {
inherit self nixpkgs home-manager nix-doom-emacs nvd; inherit self nixpkgs home-manager nix-doom-emacs nvd scripts;
}; };
hmModules = import ./home/modules inputs; hmModules = import ./home/modules inputs;
nixosConfigurations = import ./nixos/configurations.nix { nixosConfigurations = import ./nixos/configurations.nix {

View file

@ -9,9 +9,6 @@ in
homePage = final: prev: { homePage = final: prev: {
homePage = prev.callPackage ../pkgs/homePage { }; homePage = prev.callPackage ../pkgs/homePage { };
}; };
scripts = final: prev: {
scipts = prev.callPackage ../pkgs/scripts.nix { };
};
recipemd = final: prev: { recipemd = final: prev: {
recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd; recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
}; };