diff --git a/flake.lock b/flake.lock index 9dd0d6f..bfdefcc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,50 @@ { "nodes": { + "agenix-el": { + "inputs": { + "bash-strict-mode": "bash-strict-mode", + "flake-parts": "flake-parts", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1687197914, + "narHash": "sha256-GsgBDopvhE0v7SNNJv+PYVJDgs7SMbDIrlexdszlQuI=", + "owner": "t4ccer", + "repo": "agenix.el", + "rev": "775eeedbd2b5b6a023d307cb08db5f8ec74eab00", + "type": "github" + }, + "original": { + "owner": "t4ccer", + "repo": "agenix.el", + "type": "github" + } + }, + "bash-strict-mode": { + "inputs": { + "flake-utils": "flake-utils", + "home-manager": "home-manager", + "nixpkgs": [ + "agenix-el", + "nixpkgs" + ], + "shellcheck-nix-attributes": "shellcheck-nix-attributes" + }, + "locked": { + "lastModified": 1673387613, + "narHash": "sha256-q5lyL21JBSpuDNNRQt65IzWD1Gra7LNf7nw3KkpSn78=", + "owner": "sellout", + "repo": "bash-strict-mode", + "rev": "4802d968b31bb5c748d3032f299f91a8d6d1280e", + "type": "github" + }, + "original": { + "owner": "sellout", + "repo": "bash-strict-mode", + "type": "github" + } + }, "combobulate": { "flake": false, "locked": { @@ -18,8 +63,8 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -37,6 +82,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "agenix-el", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673362319, + "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -55,6 +121,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -72,6 +153,53 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix-el", + "bash-strict-mode", + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-22.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "agenix-el", + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-22.11", + "repo": "home-manager", + "type": "github" + } + }, "indent-bars": { "flake": false, "locked": { @@ -107,16 +235,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1673391659, + "narHash": "sha256-iz4359AMaEhCIZPaLfOX2jLwMWxbLnKwiAp5l+s06nE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "9e00bb203130943ea98eb215950bbb42ceeef380", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -171,14 +299,47 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { + "agenix-el": "agenix-el", "combobulate": "combobulate", "emacs-overlay": "emacs-overlay", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "indent-bars": "indent-bars", "nix-ts-mode": "nix-ts-mode", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" + } + }, + "shellcheck-nix-attributes": { + "flake": false, + "locked": { + "lastModified": 1586929030, + "narHash": "sha256-a0WyWaz+nMYFWI43Ip9EUnPuBW0O4EIiTzYZKGqNjss=", + "owner": "Fuuzetsu", + "repo": "shellcheck-nix-attributes", + "rev": "51b49d5fe65ece69eb5e2003396bf096083ec281", + "type": "github" + }, + "original": { + "owner": "Fuuzetsu", + "repo": "shellcheck-nix-attributes", + "type": "github" } }, "systems": { @@ -195,6 +356,36 @@ "repo": "default", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c982002..2a166b0 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ # url = "github:aciceri/combobulate/nix"; flake = false; }; + agenix-el.url = "github:t4ccer/agenix.el"; }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/hmModules/default.nix b/hmModules/default.nix index cc0115c..aa92e47 100644 --- a/hmModules/default.nix +++ b/hmModules/default.nix @@ -50,10 +50,10 @@ fd hunspell python3 - imagemagick - ffmpegthumbnailer - mediainfo - unzipNLS + imagemagick + ffmpegthumbnailer + mediainfo + unzipNLS pkgs.tree-sitter-grammars.tree-sitter-nix ] ++ (with hunspellDicts; [ diff --git a/packages/agenix-el.nix b/packages/agenix-el.nix new file mode 100644 index 0000000..8f881c2 --- /dev/null +++ b/packages/agenix-el.nix @@ -0,0 +1,10 @@ +{ + trivialBuild, + src, + ... +}: +trivialBuild { + inherit src; + version = "git"; + pname = "agenix-el"; +} diff --git a/packages/default.nix b/packages/default.nix index 9126696..d162b87 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -20,6 +20,7 @@ indent-bars-source = inputs.indent-bars; nix-ts-mode-source = inputs.nix-ts-mode; combobulate-source = inputs.combobulate; + agenix-el-source = inputs.agenix-el; # tree-sitter-grammars = # super.tree-sitter-grammars # // { diff --git a/packages/packages.nix b/packages/packages.nix index b6ea383..7ed7423 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -57,6 +57,8 @@ with epkgs; [ }) org-roam consult-org-roam - - ement + (pkgs.callPackage ./agenix-el.nix { + src = pkgs.agenix-el-source; + inherit (epkgs) trivialBuild; + }) ]