From fa707b492e10a75cc879f08b6be034011ab180ac Mon Sep 17 00:00:00 2001 From: ska Date: Mon, 22 Dec 2025 10:45:31 +0000 Subject: [PATCH] Update configuration.nix --- configuration.nix | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/configuration.nix b/configuration.nix index c1536bb..37bd972 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ { ############################################################ - # BOOTLOADER – GRUB (HYBRID BIOS + UEFI, REMOVABLE) test + # BOOTLOADER – GRUB (HYBRID BIOS + UEFI, REMOVABLE) ############################################################ boot.loader.grub = { @@ -41,17 +41,12 @@ }; ############################################################ - # FIRMWARE – EQUIVALENT TO DEBIAN firmware-* + # FIRMWARE – FULL HARDWARE SUPPORT ############################################################ - # This replaces ALL of: - # firmware-linux, firmware-iwlwifi, firmware-realtek, - # firmware-amd-graphics, firmware-intel-sound, etc. - hardware.enableAllFirmware = true; hardware.enableRedistributableFirmware = true; - # CPU microcode (safe for USB systems) hardware.cpu.intel.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true; @@ -70,7 +65,7 @@ }; ############################################################ - # NETWORKING / WIFI (DEBIAN NetworkManager EQUIVALENT) + # NETWORKING / LOCALE ############################################################ networking.networkmanager.enable = true; @@ -80,7 +75,7 @@ console.keyMap = "de"; ############################################################ - # BLUETOOTH (OPTIONAL BUT COMMON) + # BLUETOOTH ############################################################ hardware.bluetooth.enable = true; @@ -93,6 +88,7 @@ services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + services.xserver.xkb.layout = "de"; services.xserver.libinput.enable = true; @@ -159,20 +155,23 @@ environment.etc."update-nixos-config.sh".text = '' #!/run/current-system/sw/bin/bash set -e + PATH="/run/current-system/sw/bin" + 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" - else - cd "$DIR" - git fetch origin - if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/main)" ]; then - git reset --hard origin/main - nixos-rebuild switch || true - fi + fi + + 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 '';