diff --git a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix index 6d1dff4d..4e57e987 100644 --- a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:86ad012fc31e974dcf0147900a202443d92d12f4334a9e4ec89baa2052fb12fa"; - sha256 = "0077wr063dfgd1s8a58ck1srm98j653b11qcihjlm2nj9y53787p"; + imageDigest = "sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd"; + sha256 = "0k72wmxp4hfy9v1l6bjlrrhg6q5knlg6h48mvbw3y9sg2hy95kvp"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre-web.nix b/devices/nos/modules/arion/media/calibre/images/calibre-web.nix index 0ed59bd2..13e32b99 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre-web.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre-web.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre-web"; - imageDigest = "sha256:2de4ab91f2768c6db32d083a5935663fcc0eded1a67a4fdc2c1f705f7bb24d2d"; - sha256 = "02z2dscq6fdyra3y92zbswaqy8qdlzw62bb67x75ypn3a5s5rydj"; + imageDigest = "sha256:73aa52c663537a21d0b2e5315ba1080aeaecff1fa29dc7c020a4107f64e96490"; + sha256 = "14mzhfq5pybv6dq4wvbgrk2iw3jq2hwyi095ymhb7qzwrvggmidx"; finalImageName = "ghcr.io/linuxserver/calibre-web"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix b/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix index 5f26e5ee..e9a1d301 100644 --- a/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix +++ b/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "craumix/jmusicbot"; - imageDigest = "sha256:3d93112ea5318eb527b9dd599e7fd5540fee8e6f481769a86f225e6d715d91b2"; - sha256 = "0b2p9zy51k9yknh3dc4vpvjq6f8a40avpkcfaiii6wipnq40g0s7"; + imageDigest = "sha256:560d380cbe9e90fd51e420eb060d5780dca07a5e04457b221f72e89210d23eb2"; + sha256 = "0nncbacmwqm7qynzz6shmnibid9lfkaqyivh6nlkakpvhv78b46x"; finalImageName = "craumix/jmusicbot"; finalImageTag = "0.4.1"; } diff --git a/devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix b/devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix index 815a62b7..24fcd093 100644 --- a/devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix +++ b/devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "quay.io/vaultwarden/server"; - imageDigest = "sha256:edb8e2bab9cbca22e555638294db9b3657ffbb6e5d149a29d7ccdb243e3c71e0"; - sha256 = "1a8wp3p1zgviqi85lb4gp10wajagx6bqizfk524v42c49x1qpfpm"; + imageDigest = "sha256:4e28425bad4bd13568e1779f682ff7e441eca2ecd079bd77cfcba6e4eaf1b999"; + sha256 = "1iq3siiwya4qg65h07fpnvfm0isj1h86addaljk76bqi1ms9kk2j"; finalImageName = "quay.io/vaultwarden/server"; finalImageTag = "latest"; } diff --git a/devices/wim/hardware-configuration.nix b/devices/wim/hardware-configuration.nix index 67dbecdc..f4dc46ad 100644 --- a/devices/wim/hardware-configuration.nix +++ b/devices/wim/hardware-configuration.nix @@ -63,12 +63,11 @@ uinput.enable = true; sensor.iio.enable = true; + amdgpu.initrd.enable = true; + graphics = { enable = true; - extraPackages = - if pkgs ? rocmPackages.clr - then with pkgs.rocmPackages; [clr clr.icd] - else with pkgs; [rocm-opencl-icd rocm-opencl-runtime]; + enable32Bit = true; }; bluetooth = { diff --git a/devices/wim/modules/security.nix b/devices/wim/modules/security.nix index e808d6f0..9b72e8fd 100644 --- a/devices/wim/modules/security.nix +++ b/devices/wim/modules/security.nix @@ -16,7 +16,28 @@ auth sufficient pam_unix.so try_first_pass nullok ''; in { - services.fprintd.enable = true; + services.fprintd = { + enable = true; + + # FIXME: https://github.com/NixOS/nixpkgs/issues/325836 + package = pkgs.fprintd.overrideAttrs (o: rec { + version = "1.94.3"; + src = pkgs.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "v${version}"; + sha256 = "sha256-shH+ctQAx4fpTMWTmo3wB45ZS38Jf8RknryPabfZ6QE="; + }; + patches = []; + mesonCheckFlags = [ + "--no-suite" + "fprintd:PAM" + "--no-suite" + "fprintd:TestPamFprintd" + ]; + }); + }; # https://www.reddit.com/r/NixOS/comments/z7i83r/fingertip_tip_start_fprintd_at_boot_for_a_quick/ systemd.services.fprintd = { diff --git a/flake.lock b/flake.lock index bb7b7500..06badd2f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1718642173, - "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=", + "lastModified": 1720553729, + "narHash": "sha256-9aM4MCBJn4UstcsSdukOFTxg79keUMTw9Kmqr7Wsfmw=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7", + "rev": "e8662093ae5b6e13a3cf1145d21d4804a3e84aeb", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1720376459, - "narHash": "sha256-7BmikJsEItlCGd3ppAB6sn8EXNB08U4pRXttoSQGN0Q=", + "lastModified": 1720508834, + "narHash": "sha256-A1gms/3YZLz+6E2RQoR/aCRApz6imSy9KOlct8QY1hs=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "d01718cae1920c0304dba16c8a579d7e309dd91e", + "rev": "012ca035ff0e7eb8d8663674645e00f8cea5757e", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720450253, + "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96", "type": "github" }, "original": { @@ -840,11 +840,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1720470846, + "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "type": "github" }, "original": { @@ -890,11 +890,11 @@ ] }, "locked": { - "lastModified": 1718450675, - "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", + "lastModified": 1720108799, + "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", + "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", "type": "github" }, "original": { @@ -936,11 +936,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1720380438, - "narHash": "sha256-PYS26pnocPkh0fIPzGEjKXhI7fJ5Y57D6q6NyLfxUiQ=", + "lastModified": 1720453602, + "narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=", "ref": "refs/heads/main", - "rev": "22138ac259b2f4253be29311f6b60fbd675074b4", - "revCount": 4911, + "rev": "b03f41efec14273cf25c42d4cef326acc36cb319", + "revCount": 4913, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -995,11 +995,11 @@ ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "type": "github" }, "original": { @@ -1049,11 +1049,11 @@ ] }, "locked": { - "lastModified": 1719316102, - "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", + "lastModified": 1720203444, + "narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", + "rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87", "type": "github" }, "original": { @@ -1074,11 +1074,11 @@ ] }, "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", "type": "github" }, "original": { @@ -1131,11 +1131,11 @@ ] }, "locked": { - "lastModified": 1720205505, - "narHash": "sha256-KqGnYAKWxwRgWxc/78HbL3PHeuDJOSS/9+Pkm5doUk8=", + "lastModified": 1720432056, + "narHash": "sha256-rw8s4EsRSVtlAGNd5ttO4Ynb/eq0rMJsqG9zyREK3sk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fdcaab38857f221eea20a0073f891feb36ea8e99", + "rev": "5d1928b925da7390eae3e369e6808d64cf916ed7", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1720256686, - "narHash": "sha256-ihHXj+fp/BVpc86rCNN+Qbnpg6OrbeI+jxz6VRyzcy0=", + "lastModified": 1720483510, + "narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9822e0611d49ae70278ac20c9d7b68e4797b2fab", + "rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1720175946, - "narHash": "sha256-9tiW0rkQZGhnNaIP6gWj7N/iTlCLFdD5r37R1jVOs3s=", + "lastModified": 1720478486, + "narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=", "owner": "neovim", "repo": "neovim", - "rev": "3c53e8f78511d6db9a6c804e5a479ba38c33102d", + "rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a", "type": "github" }, "original": { @@ -1590,11 +1590,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -1751,11 +1751,11 @@ ] }, "locked": { - "lastModified": 1720365451, - "narHash": "sha256-DMmXUEesU/CGtnOiXkMZYJvXf+TJNZnKxIuiuA6ssZs=", + "lastModified": 1720471092, + "narHash": "sha256-05wIPweI6ts1BtVaMYbdL5KEelMfM4g5f/Z/xQzXRQI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "2e42a42b46fd0e79306cf9207b00a7364e77c1ab", + "rev": "813f608e25bc14b16053c005b05ebf8b18d25503", "type": "github" }, "original": { @@ -2148,11 +2148,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1720321395, - "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { @@ -2420,11 +2420,11 @@ ] }, "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", + "lastModified": 1720194466, + "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", + "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", "type": "github" }, "original": { diff --git a/modules/arion/default.nix b/modules/arion/default.nix index 9e683e26..6918ce38 100644 --- a/modules/arion/default.nix +++ b/modules/arion/default.nix @@ -112,12 +112,11 @@ in { CURRENT_DIGEST=$(sed -n 's/.*imageDigest = "\([^"]*\).*/\1/p' "$FILE") NEW_DIGEST=$(skopeo inspect "docker://$IMAGE:$TAG" | jq '.Digest' -r) - echo "$IMAGE $TAG" + output="$IMAGE $TAG" if ! grep "Locked" "$FILE"; then - if [[ "$CURRENT_DIGEST" == "$NEW_DIGEST" ]]; then - echo "Already up-to-date" - else + if [[ "$CURRENT_DIGEST" != "$NEW_DIGEST" ]]; then + echo -e "• $output:\n $CURRENT_DIGEST\n → $NEW_DIGEST\n" PREFETCH=$(nix-prefetch-docker "$IMAGE" "$TAG") echo -e "pkgs:\npkgs.dockerTools.pullImage $PREFETCH" > "$FILE" fi diff --git a/modules/printer.nix b/modules/printer.nix index 43fd5fd6..f97cd29e 100644 --- a/modules/printer.nix +++ b/modules/printer.nix @@ -4,7 +4,10 @@ printing = { enable = true; drivers = with pkgs; [ - hplip + (hplip.override { + # FIXME: https://github.com/NixOS/nixpkgs/pull/325682 + python3Packages = python311Packages; + }) ]; }; }; diff --git a/updateSha.sh b/update.sh similarity index 92% rename from updateSha.sh rename to update.sh index 5df38db4..106c0913 100755 --- a/updateSha.sh +++ b/update.sh @@ -84,12 +84,26 @@ updateVuetorrent() { doAll() { - nix flake update - updateDocker + flakeUpdates="$(nix flake update |& grep -v "warning: updating lock file")" + dockerUpdates="$(updateDocker)" updateFFZ updateFirefoxAddons updateVuetorrent nix-fast-build + + echo 'Commit messages: + ' +msg=$(cat <