flake: remove nixpkgs-{logseq,kanidm}

flake.lock

@@ -706,11 +706,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1733363815,
+        "lastModified": 1740852064,
-        "narHash": "sha256-J2XTeJ0xQMPPo2QnPLM1ewhqCh/Okgfonr5N6Pdt7b8=",
+        "narHash": "sha256-A2zUu1n8Bg505s/GUIYUSQFLmYJAvx/01A2OkGAkevk=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "ffe6b403ba758f8a057a227de2f7235ef3dc61c0",
+        "rev": "1b34da949d188b205b4132c2b726415fa19d5086",
         "type": "github"
       },
       "original": {
@@ -928,11 +928,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713805509,
+        "lastModified": 1740547748,
-        "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
+        "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
+        "rev": "3a05eebede89661660945da1f151959900903b6a",
         "type": "github"
       },
       "original": {
@@ -990,22 +990,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-kanidm": {
-      "locked": {
-        "lastModified": 1729071019,
-        "narHash": "sha256-c4J/ZiMbjMf98FawO5XJaTWqvrvIXpxnIpxu4OV3CGA=",
-        "owner": "steveej-forks",
-        "repo": "nixpkgs",
-        "rev": "984b1d5a286d3a072b840b30ec49d96878d01e64",
-        "type": "github"
-      },
-      "original": {
-        "owner": "steveej-forks",
-        "ref": "kanidm",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1733096140,
@@ -1033,22 +1017,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-logseq": {
-      "locked": {
-        "lastModified": 1735042470,
-        "narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=",
-        "owner": "steveej-forks",
-        "repo": "nixpkgs",
-        "rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834",
-        "type": "github"
-      },
-      "original": {
-        "owner": "steveej-forks",
-        "ref": "logseq-linux-arm64-selfbuilt-appimage",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1739446958,
@@ -1313,8 +1281,6 @@
         "nixpkgs-2211": "nixpkgs-2211",
         "nixpkgs-2411": "nixpkgs-2411",
         "nixpkgs-gimp": "nixpkgs-gimp",
-        "nixpkgs-kanidm": "nixpkgs-kanidm",
-        "nixpkgs-logseq": "nixpkgs-logseq",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixpkgs-vscodium": "nixpkgs-vscodium",
         "nixpkgs-wayland": "nixpkgs-wayland",

flake.nix

@@ -81,14 +81,13 @@
       flake = false;
     };
 
-    nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage";
+    # nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage";
 
     espanso = {
       flake = false;
       url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b";
     };
 
-    nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
     nix4vscode = {
       url = "github:nix-community/nix4vscode";
       # inputs.nixpkgs.follows = "nixpkgs";

nix/home-manager/configuration/graphical-fullblown.nix

@@ -245,7 +245,8 @@ in
       # libretro.snes9x2010
       # retroarchFull
 
-      (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { })
+      pkgs.logseq-bin
+      # (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq-bin/package.nix" { })
     ])
     ++ (with repoFlake.packages.${pkgs.system}; [ gimp ])
     ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [

nix/home-manager/profiles/common.nix

@@ -15,14 +15,12 @@
     allowInsecurePredicate =
       pkg:
       builtins.elem (lib.getName pkg) [
-        "electron-28.3.3"
+        "electron-32.3.3"
-        "electron-27.3.11"
         "electron"
       ];
 
     permittedInsecurePackages = [
-      "electron-28.3.3"
+      "electron-32.3.3"
-      "electron-27.3.11"
       "electron"
     ];
 

nix/pkgs/logseq/Containerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     zip
 
 # install NodeJS & yarn
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && apt-get update && apt-get install -y nodejs yarn