diff --git a/flake.nix b/flake.nix index db98184..da93c48 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ iot-data nixfiles-add-secret nixfiles-generate-backup-secrets + nixfiles-generate-config nixfiles-updated-inputs nixfiles-update-ssh-host-keys pyexcel-xlsx diff --git a/modules/nixfiles/default.nix b/modules/nixfiles/default.nix index 07fcfc9..03e1bc5 100644 --- a/modules/nixfiles/default.nix +++ b/modules/nixfiles/default.nix @@ -2,16 +2,7 @@ with lib; -let - nixfiles-generate-config = pkgs.writeShellApplication { - name = "nixfiles-generate-config"; - text = builtins.readFile ./nixfiles-generate-config.sh; - runtimeInputs = [ - pkgs.git - ]; - checkPhase = ""; - }; -in { +{ options.clerie.nixfiles.enable = mkEnableOption "clerie nixfiles tools"; config = mkIf config.clerie.nixfiles.enable { system.nixos-generate-config.configuration = '' @@ -37,7 +28,7 @@ in { } ''; - environment.systemPackages = [ + environment.systemPackages = with pkgs; [ nixfiles-generate-config ]; }; diff --git a/pkgs/nixfiles/nixfiles-generate-config.nix b/pkgs/nixfiles/nixfiles-generate-config.nix new file mode 100644 index 0000000..4c98b3b --- /dev/null +++ b/pkgs/nixfiles/nixfiles-generate-config.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +pkgs.writeShellApplication { + name = "nixfiles-generate-config"; + text = builtins.readFile ./nixfiles-generate-config.sh; + runtimeInputs = with pkgs; [ + git + ]; + checkPhase = ""; +} diff --git a/modules/nixfiles/nixfiles-generate-config.sh b/pkgs/nixfiles/nixfiles-generate-config.sh old mode 100644 new mode 100755 similarity index 100% rename from modules/nixfiles/nixfiles-generate-config.sh rename to pkgs/nixfiles/nixfiles-generate-config.sh diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index af97541..c3327ae 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -4,6 +4,7 @@ self: super: { iot-data = self.python3.pkgs.callPackage ./iot-data {}; nixfiles-add-secret = self.callPackage ./nixfiles/nixfiles-add-secret.nix {}; nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; + nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {}; nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {}; nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {};