nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Get things to work

Browse source
This commit is contained in:
Natsu Kagami 2024-08-15 18:11:33 +02:00
parent e8424a0d21
commit 58a49a71a8
Signed by: nki
GPG key ID: 55A032EB38B49ADB
3 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -794,11 +794,11 @@
"kak-lsp": { "kak-lsp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719761259, "lastModified": 1723206901,
"narHash": "sha256-2cnjweEU/NgQffF2gav9b6EIXmV9TcSd7214FzW7ekY=", "narHash": "sha256-wPCu/VxAMIB+zI0+eDq7lJ/rHJZfe0whYzdoiwrixCc=",
"owner": "kakoune-lsp", "owner": "kakoune-lsp",
"repo": "kakoune-lsp", "repo": "kakoune-lsp",
"rev": "484b19c2e373988ee5ab9afc54ecd6383b8da9bc", "rev": "ebd370f43cb6e7af634e5f8cadb99cc8c16e1efe",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/modules/linux/graphical/default.nix
View file

@ -60,7 +60,7 @@ in
pavucontrol # PulseAudio control panel pavucontrol # PulseAudio control panel
thunderbird # Email thunderbird # Email
sublime-music # For navidrome sublime-music # For navidrome
cinny-desktop # cinny-desktop
gajim gajim
vivaldi vivaldi
# Audio # Audio

45
overlay.nix
View file

@ -1,6 +1,7 @@
{ nixpkgs, nixpkgs-unstable, nur, ... }@inputs: { nixpkgs, nixpkgs-unstable, nur, ... }@inputs:
let let
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
stable = import nixpkgs { config.allowUnfree = true; system = prev.system; };
unstable = import nixpkgs-unstable { 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; }; x86 = import nixpkgs-unstable { system = prev.system; config.allowUnsupportedSystem = true; };
}; };
@ -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: { overlay-libs = final: prev: {
@ -108,35 +116,11 @@ let
}; };
}; };
overlay-aarch64-linux = final: prev: overlay-rust-is-dumb = final: prev: {
let # Use stable delta compiled with old Rust version
optionalOverride = pkg: alt: delta = final.stable.delta;
if prev.stdenv.isLinux && prev.stdenv.isAarch64 then alt else pkg; deepfilternet = final.stable.deepfilternet;
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;
in in
[ [
# inputs.swayfx.inputs.scenefx.overlays.override # inputs.swayfx.inputs.scenefx.overlays.override
@ -151,8 +135,7 @@ in
overlay-imported overlay-imported
overlay-versioning overlay-versioning
overlay-libs overlay-libs
overlay-asahi overlay-rust-is-dumb
overlay-aarch64-linux
nur.overlay nur.overlay
(import ./packages/common) (import ./packages/common)