From 6ce36aaf9cdde4fb06aa62b3a0c892c1f68bb69e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 25 Jun 2022 16:03:40 +0200
Subject: [PATCH] chore: use logseq from my own branch

---
 .../configuration/graphical-fullblown.nix     |  2 +-
 nix/overlays/overrides.nix                    |  5 +++++
 nix/sources.json                              | 22 ++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 406499f..90252d7 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -203,7 +203,7 @@ in {
       mendeley
       # zotero
       pandoc
-      unstablepkgs.logseq
+      logseq
 
       # has an EOL version of electron
       # obsidian
diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix
index e92c1a8..ef1a130 100644
--- a/nix/overlays/overrides.nix
+++ b/nix/overlays/overrides.nix
@@ -3,8 +3,11 @@
 self: super:
 
 let
+  sources = import ../../nix/sources.nix;
+
   nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
   nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; };
+  nixpkgs-staging-steveej = import sources.nixpkgs_staging_steveej { inherit (super) config; };
 
 in {
   inherit nixpkgs-master;
@@ -29,6 +32,8 @@ in {
     ]);
   });
 
+  logseq = nixpkgs-staging-steveej.logseq;
+
   # btrbk = super.btrbk.overrideAttrs(attrs: rec {
   #   version = "0.32.1";
   #   src =  builtins.fetchurl {
diff --git a/nix/sources.json b/nix/sources.json
index 58a92f1..b7d39be 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,14 +1,26 @@
 {
     "nixpkgs": {
-        "branch": "release-21.11",
-        "description": "DEPRECATED! Use NixOS/nixpkgs repository instead.",
+        "branch": "release-22.05",
+        "description": "Nix Packages collection",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00d17d8ddc4c12bae0cd750eb2bb51ee813a5301",
-        "sha256": "1n0dqvvjzq5iswdrn6hs3fsczy2cyd8d2riphnh8vsdkipc2nxxs",
+        "rev": "7a1700745cc58f29003bd7ac43229a585dddde4f",
+        "sha256": "02f59hgfd7kwqgdgqn6vkf38pksxaknlb1rhrj2xzsvbpj44b9j7",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/00d17d8ddc4c12bae0cd750eb2bb51ee813a5301.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/7a1700745cc58f29003bd7ac43229a585dddde4f.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs_staging_steveej": {
+        "branch": "staging-steveej",
+        "description": "Nix Packages collection",
+        "homepage": "https://github.com/steveeJ-forks/nixpkgs",
+        "owner": "steveeJ-forks",
+        "repo": "nixpkgs",
+        "rev": "3c96daed60b1cf7c8e044a659bf28c06cbf92dfb",
+        "sha256": "1rsgsfr317d9df8yyf1rhrk40v6gbqyhf9si9y28fidgq537nmrb",
+        "type": "tarball",
+        "url": "https://github.com/steveeJ-forks/nixpkgs/archive/3c96daed60b1cf7c8e044a659bf28c06cbf92dfb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }