Skip to content

Commit

Permalink
Get things to work
Browse files Browse the repository at this point in the history
  • Loading branch information
natsukagami committed Aug 15, 2024
1 parent e8424a0 commit 58a49a7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 35 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion home/modules/linux/graphical/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ in
pavucontrol # PulseAudio control panel
thunderbird # Email
sublime-music # For navidrome
cinny-desktop
# cinny-desktop
gajim
vivaldi
# Audio
Expand Down
45 changes: 14 additions & 31 deletions overlay.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ nixpkgs, nixpkgs-unstable, nur, ... }@inputs:
let
overlay-unstable = final: prev: {
stable = import nixpkgs { config.allowUnfree = true; system = prev.system; };
unstable = import nixpkgs-unstable { config.allowUnfree = true; system = prev.system; };
x86 = import nixpkgs-unstable { system = prev.system; config.allowUnsupportedSystem = true; };
};
Expand Down Expand Up @@ -86,6 +87,13 @@ let
})
];
};

# https://github.com/NixOS/nixpkgs/issues/334822
vulkan-validation-layers = prev.vulkan-validation-layers.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [
final.spirv-tools
];
});
};

overlay-libs = final: prev: {
Expand All @@ -108,35 +116,11 @@ let
};
};

overlay-aarch64-linux = final: prev:
let
optionalOverride = pkg: alt:
if prev.stdenv.isLinux && prev.stdenv.isAarch64 then alt else pkg;
in
{
# See https://github.com/sharkdp/fd/issues/1085
fd = optionalOverride prev.fd (prev.fd.overrideAttrs (attrs: {
preBuild = ''
export JEMALLOC_SYS_WITH_LG_PAGE=16
'';
}));
# See https://www.reddit.com/r/AsahiLinux/comments/zqejue/kitty_not_working_with_mesaasahiedge/
kitty = optionalOverride prev.kitty (final.writeShellApplication {
name = "kitty";
runtimeInputs = [ ];
text = ''
MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ${prev.kitty}/bin/kitty "$@"
'';
});
# Zotero does not have their own aarch64-linux build
zotero = optionalOverride prev.zotero (final.callPackage ./packages/aarch64-linux/zotero.nix { });
# Typora for aarch64-linux only
typora = optionalOverride
(builtins.abort "no support for non-aarch64-linux")
(final.callPackage ./packages/aarch64-linux/typora.nix { });
};

overlay-asahi = inputs.nixos-m1.overlays.default;
overlay-rust-is-dumb = final: prev: {
# Use stable delta compiled with old Rust version
delta = final.stable.delta;
deepfilternet = final.stable.deepfilternet;
};
in
[
# inputs.swayfx.inputs.scenefx.overlays.override
Expand All @@ -151,8 +135,7 @@ in
overlay-imported
overlay-versioning
overlay-libs
overlay-asahi
overlay-aarch64-linux
overlay-rust-is-dumb
nur.overlay

(import ./packages/common)
Expand Down

0 comments on commit 58a49a7

Please sign in to comment.