From 2068e953a38983c648f5213cd14d109f80ab1263 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 24 Dec 2024 13:34:21 +0100
Subject: [PATCH] workaround(logseq): use self-built aarch64-linux appimage

---
 flake.lock                                             | 8 ++++----
 flake.nix                                              | 2 +-
 nix/home-manager/configuration/graphical-fullblown.nix | 6 +-----
 nix/os/devices/sj-srv1/flake.nix                       | 3 ---
 nix/pkgs/logseq/Containerfile                          | 1 +
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index be310a5..7a82d26 100644
--- a/flake.lock
+++ b/flake.lock
@@ -998,16 +998,16 @@
     },
     "nixpkgs-logseq": {
       "locked": {
-        "lastModified": 1732454357,
-        "narHash": "sha256-HIGUjCmPRHdjHHnq8Jb7Nr+atCZ5fIX15fNruoFwY0U=",
+        "lastModified": 1735042470,
+        "narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=",
         "owner": "steveej-forks",
         "repo": "nixpkgs",
-        "rev": "5eac36380d52534313b1c139c07a04bd0fcb3fdf",
+        "rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834",
         "type": "github"
       },
       "original": {
         "owner": "steveej-forks",
-        "ref": "logseq-linux-arm64",
+        "ref": "logseq-linux-arm64-selfbuilt-appimage",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 17c8f97..02c982c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,7 +81,7 @@
       flake = false;
     };
 
-    nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64";
+    nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage";
 
     espanso = {
       flake = false;
diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 77ea7c9..78d8ff3 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -11,10 +11,6 @@ let
   pkgsUnstable =
     pkgs.pkgsUnstable
       or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; });
-
-  pkgsLogseq =
-    pkgs.pkgsLogseq
-      or (import repoFlake.inputs.nixpkgs-logseq { inherit (pkgs) system config overlays; });
 in
 {
   imports = [
@@ -250,7 +246,7 @@ in
       # libretro.snes9x2010
       # retroarchFull
 
-      pkgsLogseq.logseq
+      (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" {})
     ])
     ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
       pkgsUnstable.ledger-live-desktop
diff --git a/nix/os/devices/sj-srv1/flake.nix b/nix/os/devices/sj-srv1/flake.nix
index 44bc6db..f5f7b6e 100644
--- a/nix/os/devices/sj-srv1/flake.nix
+++ b/nix/os/devices/sj-srv1/flake.nix
@@ -8,8 +8,5 @@
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  inputs.nixos-dns.url = "github:Janik-Haag/nixos-dns";
-  inputs.nixos-dns.inputs.nixpkgs.follows = "nixpkgs";
-
   outputs = _: { };
 }
diff --git a/nix/pkgs/logseq/Containerfile b/nix/pkgs/logseq/Containerfile
index ba1afd8..339d58e 100644
--- a/nix/pkgs/logseq/Containerfile
+++ b/nix/pkgs/logseq/Containerfile
@@ -10,6 +10,7 @@ FROM clojure:temurin-11-tools-deps-bullseye-slim as builder
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install reqs
+RUN echo 1
 RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     ca-certificates \