diff --git a/flake.lock b/flake.lock index 167e2f9..e323be9 100644 --- a/flake.lock +++ b/flake.lock @@ -144,22 +144,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", @@ -190,7 +174,9 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index aa908e0..8e2192e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,10 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # secret encryption - sops-nix.url = "github:Mic92/sops-nix"; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # self hosted repo of secrets file to further protect files in case of future encryption vunrabilities secrets = { @@ -48,6 +51,7 @@ nixpkgs, disko, nixos-hardware, + home-manager, ... } @ inputs: let forEachSystem = nixpkgs.lib.genAttrs [ @@ -66,8 +70,14 @@ specialArgs = {inherit inputs;}; modules = [ ./hosts/horizon/configuration.nix - inputs.home-manager.nixosModules.default nixos-hardware.nixosModules.framework-11th-gen-intel + home-manager.nixosModules.default + # { + # home-manager.useGlobalPkgs = true; + # home-manager.useUserPackages = true; + # home-manager.extraSpecialArgs = { inherit inputs; }; + # home-manager.users = import ./users; + # } ]; }; # Leyla Desktop @@ -75,7 +85,7 @@ specialArgs = {inherit inputs;}; modules = [ ./hosts/twilight/configuration.nix - inputs.home-manager.nixosModules.default + home-manager.nixosModules.default ]; }; # NAS Service