Try to pass inputs into home-manager

This commit is contained in:
Artemis Tosini 2021-11-21 18:53:51 +00:00
parent 4c66a618ed
commit 2824907ab6
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
3 changed files with 7 additions and 8 deletions

View file

@ -20,19 +20,16 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro }: outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro, ... } @ inputs:
let let
defaultModules = [ defaultModules = [
({ pkgs, ... }: {
nixpkgs.overlays = [ rustybar.overlay ];
})
private.nixosModules.base private.nixosModules.base
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
]; ];
makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate
{ {
specialArgs = { specialArgs = {
inherit rustybar; inherit inputs;
}; };
} }
conf); conf);

View file

@ -1,4 +1,4 @@
{ ... }: { inputs, ... }:
{ {
home-manager = { home-manager = {
@ -6,6 +6,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
}; };
home-manager.users.artemis = { home-manager.users.artemis = {
extraSpecialArgs.inputs = inputs;
imports = [ imports = [
./git.nix ./git.nix
./mpv.nix ./mpv.nix

View file

@ -1,5 +1,6 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, inputs, ... }:
let let
rustybar = inputs.rustybar.defaultPackage."${pkgs.system}";
cfg = config.wayland.windowManager.sway; cfg = config.wayland.windowManager.sway;
mod = cfg.config.modifier; mod = cfg.config.modifier;
extraWorkspaces = { extraWorkspaces = {
@ -88,7 +89,7 @@ in
window.titlebar = true; window.titlebar = true;
bars = [{ bars = [{
statusCommand = "${pkgs.rustybar}/bin/rustybar"; statusCommand = "${rustybar}/bin/rustybar";
position = "top"; position = "top";
fonts = cfg.config.fonts; fonts = cfg.config.fonts;
colors = { colors = {