From cdabd0cc44a87094968a58ed4ea7b24c9ca34f87 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 11 Jul 2021 19:24:05 +0200 Subject: [PATCH] fix hmModule --- home/modules/default.nix | 39 ++++++++++++++++++++------------------- nixos/modules/default.nix | 1 + outputs.nix | 6 +++--- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/home/modules/default.nix b/home/modules/default.nix index 17d41d6..674289f 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,21 +1,22 @@ +{ self, ... }@inputs: { - alacritty = ./alacritty; - colors = ./colors.nix; - direnv = ./direnv.nix; - fish = ./fish.nix; - git = ./git.nix; - gpg = ./gpg.nix; - gtk = ./gtk.nix; - keyring = ./keyring.nix; - kitty = ./kitty; - mako = ./mako.nix; - session = ./session.nix; - ssh = ./ssh.nix; - sway = ./sway; - syncthing = ./syncthing.nix; - termite = ./termite.nix; - tmux = ./tmux.nix; - vim = ./vim; - xdg = ./xdg.nix; - zsh = ./zsh.nix; + alacritty = import ./alacritty; + colors = import ./colors.nix; + direnv = import ./direnv.nix; + fish = import ./fish.nix; + git = import ./git.nix; + gpg = import ./gpg.nix; + gtk = import ./gtk.nix; + keyring = import ./keyring.nix; + kitty = import ./kitty; + mako = import ./mako.nix; + session = import ./session.nix; + ssh = import ./ssh.nix; + sway = import ./sway; + syncthing = import ./syncthing.nix; + termite = import ./termite.nix; + tmux = import ./tmux.nix; + vim = import ./vim; + xdg = import ./xdg.nix; + zsh = import ./zsh.nix; } diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 8e2b55a..522fbd5 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,3 +1,4 @@ +{ ... }@inputs: { admin = import ./admin.nix; backup = import ./backup.nix; diff --git a/outputs.nix b/outputs.nix index c2c3b0f..3eafa42 100644 --- a/outputs.nix +++ b/outputs.nix @@ -6,7 +6,7 @@ , nixos-hardware , nvd , ... -}: +}@inputs: (flake-utils.lib.eachSystem ["x86_64-linux"] (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -57,12 +57,12 @@ hmConfigurations = import ./home/configurations.nix { inherit self nixpkgs home-manager nvd; }; - hmModules = import ./home/modules; + hmModules = import ./home/modules inputs; nixosConfigurations = import ./nixos/configurations.nix { nixosSystem = nixpkgs.lib.nixosSystem; inherit self nixpkgs home-manager nixos-hardware; }; - nixosModules = import ./nixos/modules; + nixosModules = import ./nixos/modules inputs; overlays = import ./overlays; pythonPackages = import ./pkgs/python-pkgs;