diff --git a/configurations/bbsteamie/hardware-configuration.nix b/configurations/bbsteamie/hardware-configuration.nix index 2674c6da..a4795444 100644 --- a/configurations/bbsteamie/hardware-configuration.nix +++ b/configurations/bbsteamie/hardware-configuration.nix @@ -2,10 +2,26 @@ config, jovian, modulesPath, + pkgs, ... }: { nixpkgs.hostPlatform = "x86_64-linux"; - nixpkgs.overlays = [jovian.overlays.default]; + + nixpkgs.overlays = [ + jovian.overlays.default + + # Overlays for gamescope don't get applied properly for some reason + (final: prev: { + inherit + (jovian.legacyPackages.${pkgs.system}) + gamescope + gamescope-session + gamescope-wsi + pkgsi686Linux + ; + }) + ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") jovian.nixosModules.default diff --git a/configurations/nos/modules/docker/forgejo/images/act_runner.nix b/configurations/nos/modules/docker/forgejo/images/act_runner.nix index da545d9b..2c50dc2d 100644 --- a/configurations/nos/modules/docker/forgejo/images/act_runner.nix +++ b/configurations/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:048d2fd69f4af63a69cb3ae7d8e76777a0cc128acac89a3299c45e80a6670a98"; - hash = "sha256-BRCRedRPJcmtBafd/b067JMPEFwRCgd+NjdV4qVXhiQ="; + imageDigest = "sha256:8ae2791e150cf9d5378e14f7345b3f3ac46c6f16903d9a8338ffcea19e0f060e"; + hash = "sha256-q8UD4M1nrxCTaJo+3sq29dagYC2nhyXSNfm8xuNeCZI="; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/configurations/nos/modules/docker/forgejo/images/postgres.nix b/configurations/nos/modules/docker/forgejo/images/postgres.nix index 617b5725..ae63d000 100644 --- a/configurations/nos/modules/docker/forgejo/images/postgres.nix +++ b/configurations/nos/modules/docker/forgejo/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "postgres"; - imageDigest = "sha256:84dee213c689b6dfcc0e2692ddd66adcd7314057175ea7aa05500c527e0f807a"; - hash = "sha256-ZojtW6DMB0rsW1ywVdSg26S727ru2S5o/dsC50RKmOE="; + imageDigest = "sha256:2a453914efff6156786247b2399e6f9f18d7fc37e1ca5574a23aba172cf37d3e"; + hash = "sha256-9B1g88LSeLpyAxMF4C2EMoGPJRRYQk65ICPIOHjwBrA="; finalImageName = imageName; finalImageTag = "14"; } diff --git a/configurations/nos/modules/docker/freshrss/images/postgres.nix b/configurations/nos/modules/docker/freshrss/images/postgres.nix index 617b5725..ae63d000 100644 --- a/configurations/nos/modules/docker/freshrss/images/postgres.nix +++ b/configurations/nos/modules/docker/freshrss/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "postgres"; - imageDigest = "sha256:84dee213c689b6dfcc0e2692ddd66adcd7314057175ea7aa05500c527e0f807a"; - hash = "sha256-ZojtW6DMB0rsW1ywVdSg26S727ru2S5o/dsC50RKmOE="; + imageDigest = "sha256:2a453914efff6156786247b2399e6f9f18d7fc37e1ca5574a23aba172cf37d3e"; + hash = "sha256-9B1g88LSeLpyAxMF4C2EMoGPJRRYQk65ICPIOHjwBrA="; finalImageName = imageName; finalImageTag = "14"; } diff --git a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index 82741e1c..162aab79 100644 --- a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:035d245d5f4e541451ce737d994c51d69506e50759f9e3bc6f2491668caed1f6"; - hash = "sha256-TZXKlpjSnj1Dl8CvsS7pGW3rCrVlPqfNypor7bdSQyI="; + imageDigest = "sha256:11c0748af64453e7cce670c47a6f2f7b2f6724ee3c6bf5cd87c7ad85b98e0070"; + hash = "sha256-5EmopZBvKKKpKp8wnrR57wCrBiDPgg5lFlgQGL83OtQ="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix b/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix index 69ed82c7..f67397c5 100644 --- a/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix +++ b/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "nextcloud"; - imageDigest = "sha256:07c4bfc1c38a3326e3ee777cbe6691de74424486bdc21ac31d291902c041296f"; + imageDigest = "sha256:1654f68700a482a13feca52c3235b949d8771624d738c17e9c82e437fe5de5ec"; hash = "sha256-xYqfCZAOBERPerr2Nd0c5dyh6q9UdyGGFtHwMIVVGMY="; finalImageName = imageName; finalImageTag = "fpm"; diff --git a/configurations/nos/modules/docker/resume/images/postgres.nix b/configurations/nos/modules/docker/resume/images/postgres.nix index 580b6093..faec2f1b 100644 --- a/configurations/nos/modules/docker/resume/images/postgres.nix +++ b/configurations/nos/modules/docker/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "postgres"; - imageDigest = "sha256:93a6166360be8f1d116b7ea97ebb8dea9e2c9c746349e952738bbba72a961d7c"; - hash = "sha256-jcjDWwm0HST3HSlmNxPXsewsaikvW3DA9+IAfVCpL2I="; + imageDigest = "sha256:a58cec2ba7a60b4c08d51f2ca93c1ad65fbf96e75cf0c89b7c0d2684860d3bb3"; + hash = "sha256-U3TASqUWqsaqy+V3/RcwyfwVbefoCegDGkRlBC1jG5Y="; finalImageName = imageName; finalImageTag = "15-alpine"; } diff --git a/flake.lock b/flake.lock index d5c1df43..2d467c00 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 32abf0ad..48661553 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs/default.nix b/inputs/default.nix index 5fedaeec..646dae36 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -229,9 +229,6 @@ let jovian = mkInput { owner = "Jovian-Experiments"; repo = "Jovian-NixOS"; - - # FIXME: gamescope build failure on latest - rev = "77fb0818cb42ca0db98839d47bbc6a317c286282"; }; }; diff --git a/scopedPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix index f2a38ab8..894082e7 100644 --- a/scopedPackages/firefox-addons/generated-firefox-addons.nix +++ b/scopedPackages/firefox-addons/generated-firefox-addons.nix @@ -103,10 +103,10 @@ }; "floccus" = buildFirefoxXpiAddon { pname = "floccus"; - version = "5.4.3"; + version = "5.4.4"; addonId = "floccus@handmadeideas.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4424739/floccus-5.4.3.xpi"; - sha256 = "065abb908cb9194e612c792a8dd2fc97fce2782ee1b0ebdbf890dc8e92f9059a"; + url = "https://addons.mozilla.org/firefox/downloads/file/4431645/floccus-5.4.4.xpi"; + sha256 = "ca8c70c1fe9f61b7c112934099b1827ae9700f682ba5fe7173279dfbc215114b"; meta = with lib; { homepage = "https://floccus.org"; description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive.";