refactor: prepare for home-manager module & cleanup

This commit is contained in:
NotAShelf 2023-02-06 21:57:52 +03:00
parent 89be2b9d37
commit 4874df92b6
No known key found for this signature in database
GPG key ID: 5B5C8895F28445F1

View file

@ -189,7 +189,7 @@
in in
{ {
lib = { lib = {
nvim = (import ./modules/lib/stdlib-extended.nix nixpkgs.lib).nvim; nvim = (import ./lib/stdlib-extended.nix nixpkgs.lib).nvim;
inherit neovimConfiguration; inherit neovimConfiguration;
}; };
@ -200,7 +200,8 @@
neovim-tidal = buildPkg prev [tidalConfig]; neovim-tidal = buildPkg prev [tidalConfig];
}; };
} }
// (flake-utils.lib.eachDefaultSystem (system: let // (flake-utils.lib.eachDefaultSystem (
system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
@ -217,6 +218,7 @@
nmdSrc = inputs.nmd; nmdSrc = inputs.nmd;
}; };
# Available Configurations
tidalPkg = buildPkg pkgs [tidalConfig]; tidalPkg = buildPkg pkgs [tidalConfig];
nixPkg = buildPkg pkgs [nixConfig]; nixPkg = buildPkg pkgs [nixConfig];
maximalPkg = buildPkg pkgs [maximalConfig]; maximalPkg = buildPkg pkgs [maximalConfig];
@ -248,9 +250,13 @@
packages = packages =
{ {
# Documentation
docs = docs.manual.html;
docs-html = docs.manual.html; docs-html = docs.manual.html;
docs-manpages = docs.manPages; docs-manpages = docs.manPages;
docs-json = docs.options.json; docs-json = docs.options.json;
# Available Configurations
default = nixPkg; default = nixPkg;
nix = nixPkg; nix = nixPkg;
maximal = maximalPkg; maximal = maximalPkg;
@ -262,7 +268,17 @@
} }
else {} else {}
); );
}));
nixosModules.hm-module = {
imports = [
./lib/hm.nix
# {nixpkgs.overlays = [inputs.self.overlays.default];} what?
];
};
}
));
# Flake inputs
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";