diff --git a/flake.nix b/flake.nix index bde8b1a..2263f4a 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + resticprofile = { + url = "path:./homeManagerModules/restic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, ... }@inputs: @@ -55,6 +59,7 @@ homeManagerModules.default = { imports = [ ./homeManagerModules + inputs.resticprofile.homeManagerModules.default ]; }; diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix index a825b4c..4005e01 100644 --- a/homeManagerModules/default.nix +++ b/homeManagerModules/default.nix @@ -13,7 +13,8 @@ ../nixosModules/options.nix # inputs._1password-shell-plugins.hmModules.default # Commented out because it tries to configure fish shell which we don't use - ] ++ lib.optional (inputs ? resticprofile) inputs.resticprofile.homeManagerModules.default; + # resticprofile is imported in jsl-home/flake.nix homeManagerModules.default + ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" diff --git a/homeManagerModules/restic/flake.nix b/homeManagerModules/restic/flake.nix index 1c64115..e607017 100644 --- a/homeManagerModules/restic/flake.nix +++ b/homeManagerModules/restic/flake.nix @@ -53,7 +53,7 @@ in { imports = [ ./resticprofile.nix ]; config = lib.mkIf config.programs.resticprofile.enable { - programs.resticprofile.package = lib.mkDefault resticprofilePackage; + programs.resticprofile.package = lib.mkForce resticprofilePackage; }; }; default = self.homeManagerModules.resticprofile;