From 45c8f213b0e1f349e3940fa6a66ebf8b490ef9b1 Mon Sep 17 00:00:00 2001 From: ska Date: Mon, 22 Dec 2025 10:55:52 +0000 Subject: [PATCH] Update configuration.nix --- configuration.nix | 53 +++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5a9c262..49434a4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ { ############################################################ - # BOOTLOADER – GRUB (HYBRID BIOS + UEFI, REMOVABLE) test test + # BOOTLOADER – GRUB (HYBRID BIOS + UEFI, REMOVABLE) ############################################################ boot.loader.grub = { @@ -41,7 +41,7 @@ }; ############################################################ - # FIRMWARE – FULL HARDWARE SUPPORT + # FIRMWARE – MAXIMUM HARDWARE SUPPORT ############################################################ hardware.enableAllFirmware = true; @@ -149,38 +149,45 @@ programs.firefox.enable = true; ############################################################ - # AUTO‑UPDATE FROM GIT + # GIT AUTO‑UPDATE SCRIPT (RUNTIME‑EXECUTED) ############################################################ - environment.etc."update-nixos-config.sh".text = '' - #!/run/current-system/sw/bin/bash - set -e + environment.etc."update-nixos-config.sh" = { + mode = "0700"; + text = '' + #!/run/current-system/sw/bin/bash + set -e - PATH="/run/current-system/sw/bin" + PATH="/run/current-system/sw/bin" - DIR="/var/lib/nixos-config" - REPO="https://git.skarockoi.de/ska/nixos-production.git" + DIR="/var/lib/nixos-config" + REPO="https://git.skarockoi.de/ska/nixos-production.git" - if [ ! -d "$DIR/.git" ]; then - mkdir -p "$DIR" - git clone "$REPO" "$DIR" - fi + if [ ! -d "$DIR/.git" ]; then + mkdir -p "$DIR" + git clone "$REPO" "$DIR" + fi - cd "$DIR" - git fetch origin + cd "$DIR" + git fetch origin - if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/main)" ]; then - git reset --hard origin/main - nixos-rebuild switch - fi - ''; + if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/main)" ]; then + git reset --hard origin/main + nixos-rebuild switch + fi + ''; + }; - environment.etc."update-nixos-config.sh".mode = "0700"; + ############################################################ + # SYSTEMD SERVICE + TIMER (CORRECT EXECUTION) + ############################################################ systemd.services.nixos-git-update = { description = "Update NixOS config from git"; - script = "/etc/update-nixos-config.sh"; - serviceConfig.Type = "oneshot"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "/etc/update-nixos-config.sh"; + }; }; systemd.timers.nixos-git-update = {