fix: cascade of failling becaus of stupid git overlay
This commit is contained in:
parent
d8ad4e916d
commit
6f831d833e
5 changed files with 19 additions and 6 deletions
16
flake.nix
16
flake.nix
|
|
@ -49,8 +49,22 @@
|
||||||
}).git;
|
}).git;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Overlay to skip syrupy tests (broken in nixpkgs unstable)
|
||||||
|
# Uses pythonPackagesExtensions to apply to all Python versions
|
||||||
|
syrupyOverlay = final: prev: {
|
||||||
|
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
|
(pyFinal: pyPrev: {
|
||||||
|
syrupy = pyPrev.syrupy.overrideAttrs (old: { doCheck = false; });
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
overlaysList =
|
overlaysList =
|
||||||
[ ghostty.overlays.default chaotic.overlays.default gitOverlay ];
|
[ ghostty.overlays.default
|
||||||
|
chaotic.overlays.default
|
||||||
|
gitOverlay
|
||||||
|
syrupyOverlay
|
||||||
|
];
|
||||||
|
|
||||||
mkPkgs = system:
|
mkPkgs = system:
|
||||||
import nixpkgs {
|
import nixpkgs {
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ in {
|
||||||
"bitwarden"
|
"bitwarden"
|
||||||
"brave-browser"
|
"brave-browser"
|
||||||
"firefox"
|
"firefox"
|
||||||
|
"font-jetbrains-mono"
|
||||||
"pgadmin4"
|
"pgadmin4"
|
||||||
"spotify"
|
"spotify"
|
||||||
"vesktop"
|
"vesktop"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
imports = [ ./homebrew.nix ./devtools.nix ];
|
imports = [ ./homebrew.nix ./devtools.nix ];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixVersions.nix_2_28;
|
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
keep-outputs = true
|
keep-outputs = true
|
||||||
|
|
|
||||||
|
|
@ -39,11 +39,12 @@
|
||||||
|
|
||||||
rsydn.devTools = {
|
rsydn.devTools = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
|
# Note: jetbrains-mono removed - installed via Homebrew cask (font-jetbrains-mono)
|
||||||
|
# due to nixpkgs-unstable syrupy test failures breaking the font's Python build deps
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
cloudflared
|
cloudflared
|
||||||
fzf
|
fzf
|
||||||
htop
|
htop
|
||||||
jetbrains-mono
|
|
||||||
jq
|
jq
|
||||||
jujutsu
|
jujutsu
|
||||||
lazygit
|
lazygit
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,4 @@
|
||||||
let
|
let
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
system = pkgs.stdenv.hostPlatform.system;
|
||||||
llmPkgs = llm-agents.packages.${system};
|
llmPkgs = llm-agents.packages.${system};
|
||||||
in {
|
in { opencode = llmPkgs.opencode; }
|
||||||
opencode = llmPkgs.opencode;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue