From 9412c57a05c6778cff5f6a70d358d8795d2e6a84 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 27 Feb 2023 16:10:45 +0100
Subject: [PATCH] Some tiny tweaks

---
 home/macbook-nixos.nix                   |  1 +
 home/modules/linux/graphical/default.nix |  2 +-
 kagami-air-m1/configuration.nix          |  1 +
 overlay.nix                              |  4 ++++
 packages/aarch64-linux/zotero.nix        | 19 +++++++++++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 packages/aarch64-linux/zotero.nix

diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index 51258c6..a49f2e9 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -76,6 +76,7 @@ in
     dwt = "enabled";
     middle_emulation = "enabled";
     natural_scroll = "enabled";
+    scroll_factor = "2.5";
     pointer_accel = "0.5";
     tap = "disabled";
   };
diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index 3e435c2..fa05499 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -30,6 +30,7 @@ in
       deluge # Torrent client
       pavucontrol # PulseAudio control panel
       thunderbird
+      zotero
 
       ## CLI stuff
       dex # .desktop file management, startup
@@ -38,7 +39,6 @@ in
     ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
       mailspring
       unstable.slack
-      zotero
     ]));
 
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
diff --git a/kagami-air-m1/configuration.nix b/kagami-air-m1/configuration.nix
index 5d9cfc1..f236abb 100644
--- a/kagami-air-m1/configuration.nix
+++ b/kagami-air-m1/configuration.nix
@@ -182,6 +182,7 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
+    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
   };
 
   ## Bluetooth
diff --git a/overlay.nix b/overlay.nix
index be6ea4c..889799a 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -27,11 +27,13 @@ let
         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 = [ ];
@@ -39,6 +41,8 @@ let
           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;
diff --git a/packages/aarch64-linux/zotero.nix b/packages/aarch64-linux/zotero.nix
new file mode 100644
index 0000000..243a40e
--- /dev/null
+++ b/packages/aarch64-linux/zotero.nix
@@ -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";
+}