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

Some tiny tweaks

Browse source
This commit is contained in:
Natsu Kagami 2023-02-27 16:10:45 +01:00
parent ea4fa0ffef
commit 9412c57a05
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
5 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/macbook-nixos.nix
View file

@ -76,6 +76,7 @@ in
dwt = "enabled"; dwt = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
natural_scroll = "enabled"; natural_scroll = "enabled";
scroll_factor = "2.5";
pointer_accel = "0.5"; pointer_accel = "0.5";
tap = "disabled"; tap = "disabled";
}; };

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

@ -30,6 +30,7 @@ in
deluge # Torrent client deluge # Torrent client
pavucontrol # PulseAudio control panel pavucontrol # PulseAudio control panel
thunderbird thunderbird
zotero
## CLI stuff ## CLI stuff
dex # .desktop file management, startup dex # .desktop file management, startup
@ -38,7 +39,6 @@ in
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [ ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
mailspring mailspring
unstable.slack unstable.slack
zotero
])); ]));
nki.programs.discord.enable = pkgs.stdenv.isx86_64; nki.programs.discord.enable = pkgs.stdenv.isx86_64;

1
kagami-air-m1/configuration.nix
View file

@ -182,6 +182,7 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
}; };
## Bluetooth ## Bluetooth

4
overlay.nix
View file

@ -27,11 +27,13 @@ let
if prev.stdenv.isLinux && prev.stdenv.isAarch64 then alt else pkg; if prev.stdenv.isLinux && prev.stdenv.isAarch64 then alt else pkg;
in in
{ {
# See https://github.com/sharkdp/fd/issues/1085
fd = optionalOverride prev.fd (prev.fd.overrideAttrs (attrs: { fd = optionalOverride prev.fd (prev.fd.overrideAttrs (attrs: {
preBuild = '' preBuild = ''
export JEMALLOC_SYS_WITH_LG_PAGE=16 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 { kitty = optionalOverride prev.kitty (final.writeShellApplication {
name = "kitty"; name = "kitty";
runtimeInputs = [ ]; runtimeInputs = [ ];
@ -39,6 +41,8 @@ let
MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ${prev.kitty}/bin/kitty "$@" 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 = final.callPackage ./packages/aarch64-linux/zotero.nix { };
}; };
overlay-asahi = inputs.nixos-m1.overlays.default; overlay-asahi = inputs.nixos-m1.overlays.default;

19
packages/aarch64-linux/zotero.nix Normal file
View file

@ -0,0 +1,19 @@
{ pkgs, runCommand, zstd, lib, buildFHSUserEnv }:
let
zotero-tar = builtins.fetchurl {
url = "https://repo.archlinuxcn.org/aarch64/zotero-6.0.20-1-aarch64.pkg.tar.zst";
sha256 = "sha256:1fqvcbffqfrnmfz7rcmbngik37wz9dh11q9shrd9cwkq6zay9b6k";
};
zotero-src = runCommand "zotero-src" { } ''
mkdir -p $out
export PATH=${zstd}/bin:$PATH
tar xvf ${zotero-tar} -C $out
'';
in
buildFHSUserEnv {
name = "zotero";
targetPkgs = pkgs: with pkgs; [ gtk3 dbus-glib libstartup_notification libpaper ] ++ (with pkgs.xorg; [ libX11 libXt ]);
runScript = "env QT_SCALE_FACTOR=2 ${zotero-src}/usr/lib/zotero/zotero";
}