From 8242426c6641cad0f6a626bfbdf37a0d3fd85d89 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 4 Jul 2024 19:33:33 -0400 Subject: [PATCH] chore: update flake.lock --- devices/bbsteamie/modules/desktop.nix | 7 ++- devices/binto/modules/nix-gaming.nix | 14 +---- .../arion/forgejo/images/act_runner.nix | 4 +- .../modules/arion/forgejo/images/forgejo.nix | 6 +- .../arion/freshrss/images/rss-bridge.nix | 4 +- .../arion/media/sabnzbd/images/sabnzbd.nix | 4 +- flake.lock | 62 +++++++++---------- modules/nvidia.nix | 12 ++-- 8 files changed, 52 insertions(+), 61 deletions(-) diff --git a/devices/bbsteamie/modules/desktop.nix b/devices/bbsteamie/modules/desktop.nix index 25767b4a..117d2c14 100644 --- a/devices/bbsteamie/modules/desktop.nix +++ b/devices/bbsteamie/modules/desktop.nix @@ -144,9 +144,10 @@ in { libpulseaudio ]; - extraPythonPackages = pythonPackages: with pythonPackages; [ - python - ]; + extraPythonPackages = pythonPackages: + with pythonPackages; [ + python + ]; }; # Takes way too long to shutdown diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix index 0c932174..931fcf66 100644 --- a/devices/binto/modules/nix-gaming.nix +++ b/devices/binto/modules/nix-gaming.nix @@ -1,13 +1,8 @@ { - config, nix-gaming, pkgs, ... -}: let - inherit (config.vars) mainUser; - - wine = nix-gaming.packages.${pkgs.system}.wine-ge; -in { +}: { imports = [ nix-gaming.nixosModules.platformOptimizations ]; @@ -31,16 +26,11 @@ in { # List library dependencies here ]; extraPkgs = pkgs: [ - wine + # List extra packages available to lutris here ]; }) pkgs.r2modman pkgs.ryujinx ]; - - # Give wine a constant path for lutris - home-manager.users.${mainUser}.home.file = { - ".bin/wine".source = "${wine}/bin/wine"; - }; } diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 8f1b3af9..7b3a54ec 100644 --- a/devices/nos/modules/arion/forgejo/images/act_runner.nix +++ b/devices/nos/modules/arion/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:d9fc651a23753d162efbea320990cae5c605062843a8845a4a8449d5efe100ae"; - sha256 = "10xwjwif09zl9c1dim5q9vzn7lkzxbfp0w2yqijm6w4p8pgaqgfz"; + imageDigest = "sha256:01f8359d5e1bbb7aa614acffebf81bea6ffce4f9fb9e57872466df381103a4bd"; + sha256 = "0khlyh7naff3yl5mmww154z48l4ykgnql30d3msqpzd3g1j08jw7"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/forgejo/images/forgejo.nix b/devices/nos/modules/arion/forgejo/images/forgejo.nix index f8dc73a7..d1d12bfc 100644 --- a/devices/nos/modules/arion/forgejo/images/forgejo.nix +++ b/devices/nos/modules/arion/forgejo/images/forgejo.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "codeberg.org/forgejo/forgejo"; - imageDigest = "sha256:fd0411ca373739a6513d82887ab44915f5732adbc5c21dfa1e01d4f4779f7e09"; - sha256 = "0jimix4rq7ic56b1dy61jlv3k7wmc25pjdgv7blhjg81zis21ylc"; + imageDigest = "sha256:6f4620d8fb4bb8288315b07ca65286da958745d623fc9eaef4bb4e0e34c68b3d"; + sha256 = "0k9nx7z20b60kavyawdhp7lk3abgy40lsbxl5p2qzgkhrc67bb31"; finalImageName = "codeberg.org/forgejo/forgejo"; - finalImageTag = "7.0.4"; + finalImageTag = "7.0.5"; } diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 2a75fe4c..92005262 100644 --- a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:522e520bfd118592ae1a4b0b7c866eb5c3de8cab7827edfa737d886e0c3809f6"; - sha256 = "1qri4rcn7ivxj9gcmcchc3pxrpb2xpm7ph11ikdq9hzlrrbi0646"; + imageDigest = "sha256:7959360e979ef467242c80beec6c1c4d8e69561aedaa87a73c4c905fce74108a"; + sha256 = "0ykd67iddg3b7saz9pqdzkn9py3sxaf0mn8wc6jfml9vq98q3mkn"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix index 337f2741..59c9c541 100644 --- a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:36bdeef099e87a0da24e5b87d88abde93cd188a24511a4bfb214372824201f00"; - sha256 = "0n8d1rnc9d4yccgh65hxxp4mfpadhhgsqf5jg4lm4zng03yrnr0x"; + imageDigest = "sha256:134199776cc6e750896c40a2eae547713ecd8c1bc7912369046b19382283c176"; + sha256 = "0d5d39a5l9kb5gm24xwjxsqxiayk052lx7j04argllbb4b18bi5k"; finalImageName = "ghcr.io/linuxserver/sabnzbd"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 64a390a3..bdc62895 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1719903981, - "narHash": "sha256-gTQTju8TECJzaDQ82JrnWESffZgLhYntw4uMJamfHuI=", + "lastModified": 1720076837, + "narHash": "sha256-PnT5CCO6lpdcwpNHBeBIZ9CNi/YbhJqM5Z5QTeKxEAk=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "ed3b81f95fa44af25ed864b5271f223eaeb528c8", + "rev": "3e6819b53a1ee75858b84ab0995d9335106d631a", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1720025180, - "narHash": "sha256-YqbLbkuy8KgMdjJED5e+BPbtmNiPWWHHVReb0R9dLeY=", + "lastModified": 1720033620, + "narHash": "sha256-7JxjhUZVkif3nd2Eylt0xOJDh4Zo62A0swxaxhnZmkE=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "8bbf82967d5f685b93f4128a17516b32824a829f", + "rev": "a116c34241506a9f45646da8e758b9f32106bc2c", "type": "github" }, "original": { @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -934,11 +934,11 @@ ] }, "locked": { - "lastModified": 1719992360, - "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", + "lastModified": 1720135141, + "narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", + "rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2", "type": "github" }, "original": { @@ -1030,11 +1030,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719949580, - "narHash": "sha256-HDZpI+/LR4fh6TCqByoZrP5/cN3iSiDO0JqG/yKWDWQ=", + "lastModified": 1720092067, + "narHash": "sha256-ebMlTz4wm+Md5BkCk6uGcRUvOvyjtc4bENvVSO5jrBI=", "ref": "refs/heads/main", - "rev": "8bb75a223db3ea9471d05d74fbed3328334a9f78", - "revCount": 4904, + "rev": "0a6e83005f1910b5c1ec78476fcffc05af47833a", + "revCount": 4906, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1371,11 +1371,11 @@ ] }, "locked": { - "lastModified": 1719971132, - "narHash": "sha256-/u/dRd43l8WHW8WIEAtMf4KnayefCLpB3VpLF2FBEno=", + "lastModified": 1720081952, + "narHash": "sha256-6aIon+XTPmhvNS0khhuFgQlLyXnYHlnNFedX53Mi2KY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "97bbe0cc1dc3d8962a9d15404a3c41da0ad2a3b3", + "rev": "5d8db923f7aa90a73dd33de5491874b527c073c8", "type": "github" }, "original": { @@ -1387,11 +1387,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719963642, - "narHash": "sha256-2+K/i8t4FkGCHEanISE8Q/SbLmWKp1dtpGlf44/x4m0=", + "lastModified": 1720058091, + "narHash": "sha256-Mx/mkqZIm/6iq++bZmk2DDq7or+BnQXsRF77EA4hLBU=", "owner": "neovim", "repo": "neovim", - "rev": "d413038b4fd71b7a335b6653aa64d2cb6daeac7b", + "rev": "033ea63b2fa2c0ce1a47bafd97df482871aafef5", "type": "github" }, "original": { @@ -1684,11 +1684,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -1861,11 +1861,11 @@ ] }, "locked": { - "lastModified": 1720023756, - "narHash": "sha256-FzsYBfW04D+jUzORiSqQKTYrNpkSn1LbCz30hVTt7TI=", + "lastModified": 1720120531, + "narHash": "sha256-KjP4pA5SrraJntpD8bSGPNWhOdI1csCa4eZHE1O4ACk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "38c8401633bea97ba1047e3ad54eb6e620d1c29f", + "rev": "7ed377f5984eb55113c5f04c89916ae68810105b", "type": "github" }, "original": { @@ -2023,11 +2023,11 @@ ] }, "locked": { - "lastModified": 1719990335, - "narHash": "sha256-nGX7dPhesdm89CD28m9KGoGQK7ab0vryBDg25GMTzeU=", + "lastModified": 1720076782, + "narHash": "sha256-5CdZQ7vqnj/n1ecapyqwVmf3CWl4JCzw/1s4RToYKww=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "121c248d881568e779c386921df763d26d2849b7", + "rev": "dfd81c53e91a79865aeee86a77c8f81e8480749b", "type": "github" }, "original": { diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 99d012ff..eaddb277 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -66,12 +66,12 @@ in { else # Get newest beta driver version for better Wayland support config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.58"; - sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; - sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE="; - openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c="; - settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; - persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw="; + version = "555.58.02"; + sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; + sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; + openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; + settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; + persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; }; };