diff --git a/flake.lock b/flake.lock index c87044b..deccc28 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "agenix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1641576265, @@ -72,15 +74,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1618628710, - "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=", - "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source", - "rev": "7919518f0235106d050c77837df5e338fb94de5d", - "type": "path" + "lastModified": 1643659724, + "narHash": "sha256-Nbqsx8F6zQ4McvtYZirMQnGGZKK/toBN+D/KAotlFJY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "020d63c7e9734fda828f34513be02aa1b103c501", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-21.11-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-21_05": { @@ -113,27 +118,11 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11-small", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "hm": "hm", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "snm": "snm", "utils": "utils_2" } diff --git a/flake.nix b/flake.nix index 2642774..ea4121d 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,10 @@ }; # age for nix to store encrypted passwords conveniently - agenix.url = "github:ryantm/agenix"; + agenix ={ + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, hm, nixpkgs, agenix, ... }@inputs: { inherit self inputs; diff --git a/home/cli.nix b/home/cli.nix index 06f6e37..209592e 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -40,6 +40,7 @@ hledger-iadd hledger-ui smos + #haskellPackages.patat # terminal based presentations using pandoc # editors emacs @@ -57,6 +58,7 @@ haskellPackages.cabal-fmt haskellPackages.stylish-haskell haskellPackages.ormolu + haskellPackages.hpack ]; home.extraOutputsToInstall = [ "doc" "info" "devdoc" ];