diff --git a/flake.lock b/flake.lock index 51c9340..9eaf831 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", - "owner": "ryantm", - "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "beautysh": { "inputs": { "nixpkgs": [ @@ -45,28 +23,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -219,27 +175,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -454,8 +389,7 @@ }, "root": { "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index d9bc639..ffcce7b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,11 +24,6 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -38,7 +33,6 @@ impermanence, lanzaboote, nixvim, - agenix, } @ inputs: let secrets = import ./secrets-legacy.nix; in { @@ -51,7 +45,7 @@ config = { allowUnfree = true; }; - overlays = [(import ./packages) agenix.overlays.default]; + overlays = [(import ./packages)]; }; specialArgs = inputs // {inherit secrets;}; modules = [ @@ -62,7 +56,6 @@ home-manager.nixosModules.home-manager impermanence.nixosModules.impermanence lanzaboote.nixosModules.lanzaboote - agenix.nixosModules.default ./common ./hosts/skipper @@ -76,7 +69,6 @@ imports = [ impermanence.nixosModules.home-manager.impermanence nixvim.homeManagerModules.nixvim - agenix.homeManagerModules.default ./home ]; }; @@ -91,7 +83,6 @@ config = { allowUnfree = true; }; - overlays = [agenix.overlays.default]; }; specialArgs = inputs // {inherit secrets;}; modules = [ @@ -100,7 +91,6 @@ } nixvim.nixosModules.nixvim - agenix.nixosModules.default ./common ./hosts/rico2 diff --git a/home/programs/default.nix b/home/programs/default.nix index 57f9c30..785e489 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -24,7 +24,6 @@ home.packages = with pkgs; [ _1password-gui - agenix discord evince gnome.eog diff --git a/hosts/rico2/programs/default.nix b/hosts/rico2/programs/default.nix index a319b88..067b7de 100644 --- a/hosts/rico2/programs/default.nix +++ b/hosts/rico2/programs/default.nix @@ -8,6 +8,5 @@ programs.git.enable = true; environment.systemPackages = with pkgs; [ - agenix ]; }