diff --git a/flake.nix b/flake.nix index 6c53e75..46210fa 100644 --- a/flake.nix +++ b/flake.nix @@ -61,11 +61,11 @@ flake = false; }; }; - outputs = { flake-parts, agenix, nixpkgs, ... }@inputs: + outputs = { flake-parts, agenix, nixpkgs, self, ... }@inputs: flake-parts.lib.mkFlake { inherit inputs; } ( let ssh.publicKeys.yubikey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIUkESu5NnBi1M0+ZjYrkp6/rIFuwc3aguspf98jmOydNce6l65cnS3GRzc9oWx4lu11ahi87ZuE+pYV+gaHm4="; - specialArgs = { inherit inputs ssh; }; + specialArgs = { inherit inputs ssh self; }; inherit (nixpkgs) lib; in { diff --git a/home/common/default.nix b/home/common/default.nix index 5b334e5..0a23b8d 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: -{ +{ config, lib, pkgs, inputs, self, ... }: { nixpkgs.config.allowUnfree = true; imports = [ ../gnome ../custom-programs ./neovim ./dnote.nix ]; @@ -70,7 +69,7 @@ programs = { nh = { enable = true; - flake = "/etc/nixos"; + flake = self; }; dnote.enable = true; home-manager.enable = true; diff --git a/home/default.nix b/home/default.nix index 3c96f1c..e4bb429 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,11 @@ -{ inputs, ... }: +{ inputs, self, ... }: { home-manager = { users = { jokke = import ./jokke; moco = import ./moco; }; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs self; }; sharedModules = [ (import ./common) ]; useUserPackages = true; useGlobalPkgs = true;