From c42a86ebf08b2bf834f598bb17278f9f5ace90ba Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 3 Jul 2023 22:32:25 -0400 Subject: flake: update getchoo input --- flake.lock | 6 +++--- hosts/default.nix | 2 +- modules/flake/default.nix | 4 +--- modules/flake/dev.nix | 2 +- users/default.nix | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3481864..1221c64 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1687853364, - "narHash": "sha256-jO8BUJgZn95SUBmhA8b5AqXB9p8Yc86KKi9c+3kd4es=", + "lastModified": 1688323046, + "narHash": "sha256-yKbc5edpWivRlEJb0awfNMJ0ouTylTRr5CBUY+/XTbw=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "914c6d508a69d3b831c257fa3b5eb0ebc0e9147f", + "rev": "06c816569a82a9d012524245992fbd6798eeb746", "type": "github" }, "original": { diff --git a/hosts/default.nix b/hosts/default.nix index 863987e..af63c5a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,7 +7,7 @@ }: { flake = { nixosConfigurations = let - inherit (myLib.configs) mkNixOS; + inherit (myLib.configs inputs) mkNixOS; profiles = import ./profiles.nix {inherit self inputs;}; in { diff --git a/modules/flake/default.nix b/modules/flake/default.nix index 6d0f194..0f95612 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -4,9 +4,7 @@ ./dev.nix ]; - _module.args.myLib = inputs.getchoo.lib { - inherit inputs; - }; + _module.args.myLib = inputs.getchoo.lib; systems = [ "x86_64-linux" diff --git a/modules/flake/dev.nix b/modules/flake/dev.nix index 6543fdd..5453286 100644 --- a/modules/flake/dev.nix +++ b/modules/flake/dev.nix @@ -10,7 +10,7 @@ }: { checks = { pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { - src = ./.; + src = self; hooks = { actionlint.enable = true; alejandra.enable = true; diff --git a/users/default.nix b/users/default.nix index 5c7c7d6..4be79c3 100644 --- a/users/default.nix +++ b/users/default.nix @@ -4,7 +4,7 @@ ... }: { perSystem = {system, ...}: let - inherit (myLib.configs) mkHMUser; + inherit (myLib.configs inputs) mkHMUser; in { homeConfigurations = { seth = mkHMUser { -- cgit v1.2.3