From 8beb5617d4c839cac46d771c88eecaa544bb79a7 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner <contact@ingolf-wagner.de> Date: Wed, 19 Feb 2025 13:47:32 +0700 Subject: [PATCH 1/2] :package: install healthchecks package --- flake.lock | 6 +++--- flake.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bfecc18..43c67dd 100644 --- a/flake.lock +++ b/flake.lock @@ -595,11 +595,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1739598659, - "narHash": "sha256-HcR9D2T1EZyb4l83UIodxqbxe+hE+ahseWuW3+Mg+Uw=", + "lastModified": 1739943981, + "narHash": "sha256-TUh8qjyr7ql56kBzHgkKUGtgVjtfd6lOym2uxouRYBI=", "owner": "mrvandalo", "repo": "nixos-healthchecks", - "rev": "91d79a446bc2e0bab83731bda4b64aa9992e04bd", + "rev": "5997ffc78fa1d8eee84818fe899cd7f0f8cb0644", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2637295..1ef51e7 100644 --- a/flake.nix +++ b/flake.nix @@ -150,6 +150,7 @@ tasksh taskwarrior-hooks ; + healthchecks = self.packages.${system}.healthchecks; inherit (self.packages.${system}) otpmenu nsxiv @@ -308,6 +309,7 @@ boot.loader.grub.configurationLimit = lib.mkDefault 10; environment.systemPackages = [ pkgs.systemctl-find-service-config + pkgs.healthchecks ]; } ) From ba7c20647959efd7a00d074619bc7c78b199d24b Mon Sep 17 00:00:00 2001 From: Ingolf Wagner <contact@ingolf-wagner.de> Date: Wed, 19 Feb 2025 13:47:54 +0700 Subject: [PATCH 2/2] :pencil2: fix systemctl-find-service-config typo --- homes/palo/git.nix | 1 + .../systemctl-find-service-config/default.nix | 2 +- .../systemctl-find-service-config.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/homes/palo/git.nix b/homes/palo/git.nix index 219803e..74babec 100644 --- a/homes/palo/git.nix +++ b/homes/palo/git.nix @@ -14,6 +14,7 @@ with pkgs; "*.swp" "*~" ".idea" + "*.iml" ".*penis.*" "result" ".envrc" diff --git a/nix/packages/systemctl-find-service-config/default.nix b/nix/packages/systemctl-find-service-config/default.nix index ddf68b8..413a524 100644 --- a/nix/packages/systemctl-find-service-config/default.nix +++ b/nix/packages/systemctl-find-service-config/default.nix @@ -1,5 +1,5 @@ { pkgs }: -pkgs.writers.writeBashBin "sysetmctl-find-service-config" ( +pkgs.writers.writeBashBin "systemctl-find-service-config" ( pkgs.lib.fileContents ./systemctl-find-service-config.sh ) diff --git a/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh b/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh index 04ab2a1..3cdb120 100644 --- a/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh +++ b/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh @@ -8,12 +8,19 @@ display_usage() { exit 1 } -# Prüfen, ob genügend Argumente übergeben wurden -if [ $# -ne 2 ]; then +# Prüfen, ob mindestens ein Argument übergeben wurde +if [ $# -lt 1 ] || [ $# -gt 2 ]; then display_usage fi SERVICE=$1 + +# Spezialfall: Wenn nur ein Argument übergeben wurde +if [ $# -eq 1 ]; then + systemctl cat "$SERVICE" + exit 0 +fi + REGEX=$2 # Holen der Service-Konfiguration