remove scripts package and use flake
This commit is contained in:
parent
7ff1c1922f
commit
1e56cd9c83
4 changed files with 8 additions and 6 deletions
|
@ -22,6 +22,10 @@
|
|||
url = git+https://gitlab.com/khumba/nvd.git;
|
||||
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;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, home-manager
|
||||
, nix-doom-emacs
|
||||
, nvd
|
||||
, scripts
|
||||
}@inputs:
|
||||
let
|
||||
hmConfiguration =
|
||||
|
@ -30,7 +31,7 @@ in
|
|||
home = hmConfiguration {
|
||||
extraModules = [ ./home ];
|
||||
overlays = [
|
||||
self.overlays.scripts
|
||||
(final: prev: { s = scripts; })
|
||||
(final: prev: { n = nvd; })
|
||||
];
|
||||
stateVersion = "20.09";
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, nix-doom-emacs
|
||||
, nixos-hardware
|
||||
, nvd
|
||||
, scripts
|
||||
, ...
|
||||
}@inputs:
|
||||
(flake-utils.lib.eachDefaultSystem (system:
|
||||
|
@ -51,14 +52,13 @@
|
|||
};
|
||||
packages = flake-utils.lib.flattenTree {
|
||||
deploy = pkgs.callPackage ./pkgs/deploy.nix { };
|
||||
scripts = pkgs.callPackage ./pkgs/scripts.nix { };
|
||||
keys = pkgs.callPackage ./pkgs/keys { };
|
||||
homePage = pkgs.callPackage ./pkgs/homePage { };
|
||||
recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
|
||||
};
|
||||
})) // {
|
||||
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;
|
||||
nixosConfigurations = import ./nixos/configurations.nix {
|
||||
|
|
|
@ -9,9 +9,6 @@ in
|
|||
homePage = final: prev: {
|
||||
homePage = prev.callPackage ../pkgs/homePage { };
|
||||
};
|
||||
scripts = final: prev: {
|
||||
scipts = prev.callPackage ../pkgs/scripts.nix { };
|
||||
};
|
||||
recipemd = final: prev: {
|
||||
recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue