more refactors

This commit is contained in:
Ivan Dimitrov 2023-11-18 09:27:55 +02:00
parent e1dde23e3d
commit 351e067f7f
3 changed files with 14 additions and 19 deletions

View File

@ -28,12 +28,15 @@
my-overlay = self: super: { my-overlay = self: super: {
scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; }); scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; });
}; };
home = import ./home/default.nix pkgs = import nixpkgs {
{ inherit system;
inherit system nixpkgs my-overlay home-manager ide; overlays = [ my-overlay ];
modules = import ./modules {
inherit system nixpkgs ide my-overlay;
}; };
modules = import ./modules {
inherit system pkgs ide my-overlay;
};
home = import ./home {
inherit system pkgs modules home-manager;
}; };
in in
{ {

View File

@ -1,23 +1,18 @@
{ system, nixpkgs, my-overlay, home-manager, modules, ... }: { { system, pkgs, home-manager, modules, ... }: {
ivand = home-manager.lib.homeManagerConfiguration { ivand = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ modules = [
./ivand ./ivand
modules.programs modules.programs
modules.packages modules.packages
modules.nvim modules.nvim
]; ];
pkgs = import nixpkgs {
inherit system;
overlays = [ my-overlay ];
};
}; };
vid = home-manager.lib.homeManagerConfiguration { vid = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ modules = [
./home/vid ./home/vid
modules.programs modules.programs
]; ];
pkgs = import nixpkgs {
inherit system;
};
}; };
} }

View File

@ -1,7 +1,4 @@
{ system, nixpkgs, ide, my-overlay, ... }: { system, pkgs, ide, my-overlay, ... }:
let
pkgs = import nixpkgs { inherit system; overlays = [ my-overlay ]; };
in
{ {
gaming = import ./gaming { }; gaming = import ./gaming { };
dnscrypt = import ./dnscrypt { }; dnscrypt = import ./dnscrypt { };