diff --git a/configuration.nix b/configuration.nix index d17fb2c..e4974ee 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,95 +1,5 @@ { config, pkgs, ... }: -let - displayBrightness = pkgs.writeShellApplication { - name = "display-brightness"; - runtimeInputs = with pkgs; [ - brightnessctl - ddcutil - gawk - ]; - text = '' - set -euo pipefail - - direction="''${1:-}" - step="''${DISPLAY_BRIGHTNESS_STEP:-1}" - minimum="''${DISPLAY_BRIGHTNESS_MIN:-1}" - - is_uint() { - case "$1" in - "" | *[!0-9]*) - return 1 - ;; - *) - return 0 - ;; - esac - } - - if ! is_uint "$step" || [ "$step" -lt 1 ]; then - step=1 - fi - if ! is_uint "$minimum"; then - minimum=1 - fi - - case "$direction" in - down) - backlight_delta="''${step}%-" - ;; - up) - backlight_delta="''${step}%+" - ;; - *) - printf 'usage: display-brightness up|down\n' >&2 - exit 64 - ;; - esac - - brightnessctl --class=backlight --min-value set "$backlight_delta" >/dev/null 2>&1 || true - - ddc_displays="$( - ddcutil --brief detect 2>/dev/null \ - | awk '/^Display[[:space:]]+[0-9]+/ { print $2 }' \ - || true - )" - - for display in $ddc_displays; do - parsed="$( - ddcutil --brief --display "$display" getvcp 10 2>/dev/null \ - | awk '$1 == "VCP" && $2 == "10" && NF >= 5 { print $(NF - 1), $NF; exit }' \ - || true - )" - if [ -z "$parsed" ]; then - continue - fi - - read -r current maximum _ </dev/null 2>&1 || true - done - ''; - }; -in - { boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; @@ -199,7 +109,6 @@ in enable = true; enable32Bit = true; }; - hardware.i2c.enable = true; # Enable keyd for key remapping services.keyd = { @@ -222,8 +131,8 @@ in brightnessdown = "noop"; # ← Key 7: disabled brightnessup = "noop"; # ← Key 8: disabled # Key 9: display toggle (leftmeta+p) - disabled below - rfkill = "command(${displayBrightness}/bin/display-brightness down)"; # ← Key 10: brightness down - sysrq = "command(${displayBrightness}/bin/display-brightness up)"; # ← Key 11: brightness up + rfkill = "brightnessdown"; # ← Key 10: brightness down + sysrq = "brightnessup"; # ← Key 11: brightness up media = "sysrq"; # ← Key 12: screenshot }; }; @@ -234,7 +143,7 @@ in main = { brightnessdown = "noop"; # ← Key 7: disabled brightnessup = "noop"; # ← Key 8: disabled - rfkill = "command(${displayBrightness}/bin/display-brightness down)"; # ← Key 10: brightness down + rfkill = "brightnessdown"; # ← Key 10: brightness down }; }; }; @@ -418,7 +327,6 @@ in "wheel" "video" "render" - "i2c" "docker" "camera" "scanner" @@ -500,21 +408,18 @@ in "net.ipv4.tcp_congestion_control" = "bbr"; }; - environment.systemPackages = - (with pkgs; [ - bubblewrap - ddcutil - docker - docker-compose - exfatprogs - flatpak - nh - sane-airscan - sane-backends - simple-scan - wget - ]) - ++ [ displayBrightness ]; + environment.systemPackages = with pkgs; [ + bubblewrap + docker + docker-compose + exfatprogs + flatpak + nh + sane-airscan + sane-backends + simple-scan + wget + ]; programs.steam.enable = true; programs.nix-index-database.comma.enable = true; diff --git a/flake.nix b/flake.nix index 468d23e..d0330c8 100644 --- a/flake.nix +++ b/flake.nix @@ -63,13 +63,8 @@ inputs.nur.overlays.default inputs.ghostty.overlays.default inputs.helix.overlays.default - (_final: prev: { - opencode = opencode.packages.${prev.stdenv.hostPlatform.system}.opencode.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace package.json \ - --replace-fail '"packageManager": "bun@1.3.14"' '"packageManager": "bun@1.3.13"' - ''; - }); + (final: prev: { + opencode = opencode.packages.${prev.stdenv.hostPlatform.system}.opencode; }) ]; }