diff --git a/flake.lock b/flake.lock index 6f489ae..4ccf848 100644 --- a/flake.lock +++ b/flake.lock @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1767556355, - "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", + "lastModified": 1767702900, + "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", + "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1767576576, - "narHash": "sha256-PW0qkMDuHRsaWYOFCkDpez0aPtXDGDKTGbWvMj3OlFk=", + "lastModified": 1767709335, + "narHash": "sha256-ntw1+fsftk9aI6+yxLieAjdIl6duGN39bxR3sqC0x7s=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "df47df9f7e8d536e138b5213d79f9d2dd4598193", + "rev": "0cbe1f6240ac153641db06eb8dc0231d611924b2", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1767576397, - "narHash": "sha256-BDECp5UR5m0t4YJU5hbTABsWLrMzSlPX2fcYDWRNDP4=", + "lastModified": 1767712646, + "narHash": "sha256-hsJ5htjYlfSM0WBQ00s2wTgM4UOzdN3LM1z6DLeNq9g=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "8eba6ebee29c5a09159c77f171c4c9534b240e86", + "rev": "ecc81a8fdf92eb39acfe73b2a018b664761e8cca", "type": "github" }, "original": { @@ -821,11 +821,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1767493793, - "narHash": "sha256-MWEsIcQZXrjvvFyPNiK5LKrWu6Xo9AKnjo4OgS4NVjU=", + "lastModified": 1767665581, + "narHash": "sha256-eGWrFsXOkJMahFhxtPSFQf1VSjafE0ka2T/dTwk+byk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0f7e75f772be341d8e461162c0bcf0f5b971cb86", + "rev": "905f111884f76ab6c1f6cdf1387d663696ccc369", "type": "github" }, "original": { @@ -889,11 +889,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1767465220, - "narHash": "sha256-P5qVna7ptT0BPQI6EesszfK25znFNpR9xiEJpqheo0M=", + "lastModified": 1767637567, + "narHash": "sha256-njwPfL5gM/KRGLJ29CbQ4nLBoEkNPMvEHBAAPOP8BZc=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "b6e97a42d409155bc70f2d211ab1029338a37523", + "rev": "530aa73aa9a21a078ff861b84767ae1d469715fa", "type": "github" }, "original": { @@ -1073,6 +1073,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1762977756, @@ -1091,16 +1107,16 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -1397,6 +1413,7 @@ "nixos-raspberrypi": "nixos-raspberrypi", "nixpkgs": "nixpkgs_11", "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", @@ -1530,11 +1547,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767559556, - "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "nix-community", "repo": "stylix", - "rev": "b135edbdd403896d1ef507934c045f716deb5609", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 85db420..8c03822 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,10 @@ { - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = rec { + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs = nixpkgs-stable; + # The name "snowfall-lib" is required due to how Snowfall Lib processes your # flake's inputs. snowfall-lib = { diff --git a/modules/nixos/nix/ccache/default.nix b/modules/nixos/nix/ccache/default.nix index a6e42c3..8ab8b07 100644 --- a/modules/nixos/nix/ccache/default.nix +++ b/modules/nixos/nix/ccache/default.nix @@ -34,7 +34,7 @@ "opencv" "opencv4" "opencv4WithoutCuda" - "pipewire" + # "pipewire" "qemu" "qemu_kvm" "qemu_full" diff --git a/modules/nixos/nix/ccache/overlays.nix b/modules/nixos/nix/ccache/overlays.nix index 8041e77..9e46c06 100644 --- a/modules/nixos/nix/ccache/overlays.nix +++ b/modules/nixos/nix/ccache/overlays.nix @@ -90,11 +90,6 @@ (_self: super: { mesa = super.mesa.override { buildPackages.stdenv = super.ccacheStdenv; }; }) - (_self: super: { - electron = super.stable.electron-bin; - electron_36 = super.stable.electron_36-bin; - electron_37 = super.stable.electron_37-bin; - }) # (_self: super: { # "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; # }) @@ -109,16 +104,6 @@ # (self: super: { # "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg = super.ffmpeg_7.override { stdenv = super.ccacheStdenv; }; }; # }) - - # todo: make these work - (_self: super: { - rocmPackages = super.stable.rocmPackages; - uv = super.stable.uv; - piper-tts = super.stable.piper-tts; - python3Packages = super.python3Packages // { - torch = super.stable.python3Packages.torch; - }; - }) # (_self: super: { # rocmPackages = super.rocmPackages // { # hipblaslt = super.rocmPackages.hipblaslt.override { diff --git a/overlays/age-plugin-yubikey/default.nix b/overlays/age-plugin-yubikey/default.nix deleted file mode 100644 index 0bbb05b..0000000 --- a/overlays/age-plugin-yubikey/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - inputs, - self, - ... -}: -final: prev: -{ - # age-plugin-yubikey = final.stable.age-plugin-yubikey; - # librsvg = final.stable.librsvg; - fish = final.stable.fish; - vesktop = final.stable.vesktop; - showtime = final.stable.showtime; - rustPlatform = final.unstable.rustPlatform // { - cargo-deps-vendor = final.stable.rustPlatform.cargo-deps-vendor; - }; - python3Packages = final.unstable.python3Packages // { - aiohttp = final.stable.python3Packages.aiohttp; - torch = final.stable.python3Packages.torch; - }; - rocmPackages = final.stable.rocmPackages; - uv = final.stable.uv; - piper-tts = final.stable.piper-tts; - elfutils = final.stable.elfutils; -} diff --git a/overlays/mesa/default.nix b/overlays/mesa/default.nix new file mode 100644 index 0000000..ce09bc7 --- /dev/null +++ b/overlays/mesa/default.nix @@ -0,0 +1,7 @@ +{ ... }: +final: _prev: { + mesa = final.unstable.mesa; + driversi686Linux = final.stable.driversi686Linux // { + mesa = final.unstable.driversi686Linux.mesa; + }; +} diff --git a/overlays/proton-cachyos/default.nix b/overlays/proton-cachyos/default.nix index d117d7e..10513fc 100644 --- a/overlays/proton-cachyos/default.nix +++ b/overlays/proton-cachyos/default.nix @@ -10,12 +10,15 @@ in { ${namespace} = prev.${namespace} // { proton-cachyos-v3 = prev.${namespace}.proton-cachyos.override { + versionFilename = "cachyos-v3-version.json"; tarballSuffix = "-x86_64_v3.tar.xz"; }; proton-cachyos-v2 = prev.${namespace}.proton-cachyos.override { + versionFilename = "cachyos-v2-version.json"; tarballSuffix = "-x86_64_v2.tar.xz"; }; proton-cachyos-v1 = prev.${namespace}.proton-cachyos.override { + versionFilename = "cachyos-version.json"; tarballSuffix = "-x86_64.tar.xz"; }; }; diff --git a/overlays/redis/default.nix b/overlays/redis/default.nix index e8e7282..891a3aa 100644 --- a/overlays/redis/default.nix +++ b/overlays/redis/default.nix @@ -1,17 +1,4 @@ { ... }: final: _prev: { redis = final.valkey; - onnxruntime = final.stable.onnxruntime; - firefox = final.stable.firefox; - webkitgtk_6_0 = final.stable.webkitgtk_6_0; - webkitgtk_4_1 = final.stable.webkitgtk_4_1; - alvr = final.stable.alvr; - openvr = final.stable.openvr; - cargo-auditable = final.stable.cargo-auditable; - # postgresql = final.stable.postgresql; - immich-machine-learning = final.stable.immich-machine-learning; - python3Packages = final.stable.python3Packages // { - ctranslate2 = final.stable.python3Packages.ctranslate2; - pglast = final.stable.python3Packages.pglast; - }; } diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix index 27d12ab..8d068f9 100644 --- a/overlays/unstable/default.nix +++ b/overlays/unstable/default.nix @@ -1,6 +1,6 @@ { inputs, ... }: final: _prev: { - unstable = import inputs.nixpkgs { + unstable = import inputs.nixpkgs-unstable { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; diff --git a/packages/proton-cachyos/cachyos-v2-version.json b/packages/proton-cachyos/cachyos-v2-version.json index dd72fde..589a887 100644 --- a/packages/proton-cachyos/cachyos-v2-version.json +++ b/packages/proton-cachyos/cachyos-v2-version.json @@ -1,5 +1,5 @@ { "base": "10.0", "release": "20251222", - "hash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + "hash": "sha256-S5i8RBbrPAlsYYavzzhTFanLU3uyLT3OQRpX9S6pPE0=" } diff --git a/packages/proton-cachyos/cachyos-v3-version.json b/packages/proton-cachyos/cachyos-v3-version.json index dd72fde..69318dc 100644 --- a/packages/proton-cachyos/cachyos-v3-version.json +++ b/packages/proton-cachyos/cachyos-v3-version.json @@ -1,5 +1,5 @@ { "base": "10.0", "release": "20251222", - "hash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + "hash": "sha256-tw1/uX4qZX3cQKyzsss8l+wHKLoJF2/8B+6RUIQt4oQ=" } diff --git a/packages/proton-cachyos/cachyos-version.json b/packages/proton-cachyos/cachyos-version.json index dd72fde..aaaae72 100644 --- a/packages/proton-cachyos/cachyos-version.json +++ b/packages/proton-cachyos/cachyos-version.json @@ -1,5 +1,5 @@ { "base": "10.0", "release": "20251222", - "hash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + "hash": "sha256-W7cC4pi8WED4rOEXYVXIio1tiUNvArzqsTl6xKwy/mY=" } diff --git a/systems/aarch64-linux/pi4/boot.nix b/systems/aarch64-linux/pi4/boot.nix index 8575041..306d93f 100755 --- a/systems/aarch64-linux/pi4/boot.nix +++ b/systems/aarch64-linux/pi4/boot.nix @@ -12,7 +12,7 @@ # }; # kernelPackages = kernelBundle.linuxPackages_rpi4; # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.unstable.linuxPackages_latest; supportedFilesystems = lib.mkForce [ ]; }; diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix index 659a825..5ba6b8b 100755 --- a/systems/aarch64-linux/pi5/boot.nix +++ b/systems/aarch64-linux/pi5/boot.nix @@ -10,7 +10,7 @@ # bootloader = "kernel"; # firmwarePackage = pkgs.raspberrypifw; # }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.unstable.linuxPackages_latest; supportedFilesystems = lib.mkForce [ ]; };