From b09886dbb393fd9ab94c7cb939941aaec06d1f09 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 23 Mar 2025 17:23:20 +0100 Subject: [PATCH] update flake inputs; dustbowl: adapt to new nixos --- flake.lock | 6 +++--- nixos/dustbowl.nix | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 39599ff..dd2a8b6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix index 0da962b..6b96f58 100644 --- a/nixos/dustbowl.nix +++ b/nixos/dustbowl.nix @@ -220,7 +220,7 @@ wl-mirror # GUI software - emacs29-pgtk + emacs30-pgtk firefox thunderbird mpv @@ -308,11 +308,12 @@ # services.printing.enable = true; # services.printing.drivers = [ pkgs.hplipWithPlugin ]; - hardware.sane = { - enable = true; - brscan4.enable = true; - extraBackends = [ pkgs.hplipWithPlugin pkgs.sane-airscan ]; - }; + # TODO download failed with 403 + # hardware.sane = { + # enable = true; + # brscan4.enable = true; + # extraBackends = [ pkgs.hplipWithPlugin pkgs.sane-airscan ]; + # }; hardware.rtl-sdr.enable = true; @@ -393,6 +394,15 @@ support32Bit = true; }; pulse.enable = true; + package = pkgs.pipewire.overrideAttrs (finalAttrs: prevAttrs: { + src = pkgs.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "pipewire"; + rev = "1.2.7"; + sha256 = "sha256-TV+2nz44a742bUfGnWt7zJAnO15eED5kAwyAgE5CQZ0="; + }; + }); }; # Sway