steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

chore: use logseq from my own branch

Browse source
This commit is contained in:
steveej 2022-06-25 16:03:40 +02:00
parent 2f5c043e89
commit 6ce36aaf9c
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -203,7 +203,7 @@ in {
mendeley mendeley
# zotero # zotero
pandoc pandoc
unstablepkgs.logseq logseq
# has an EOL version of electron # has an EOL version of electron
# obsidian # obsidian

5
nix/overlays/overrides.nix
View file

@ -3,8 +3,11 @@
self: super: self: super:
let let
sources = import ../../nix/sources.nix;
nixpkgs-master = import <nixpkgs-master> { inherit (super) config; }; nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; }; nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; };
nixpkgs-staging-steveej = import sources.nixpkgs_staging_steveej { inherit (super) config; };
in { in {
inherit nixpkgs-master; inherit nixpkgs-master;
@ -29,6 +32,8 @@ in {
]); ]);
}); });
logseq = nixpkgs-staging-steveej.logseq;
# btrbk = super.btrbk.overrideAttrs(attrs: rec { # btrbk = super.btrbk.overrideAttrs(attrs: rec {
# version = "0.32.1"; # version = "0.32.1";
# src = builtins.fetchurl { # src = builtins.fetchurl {

22
nix/sources.json
View file

@ -1,14 +1,26 @@
{ {
"nixpkgs": { "nixpkgs": {
"branch": "release-21.11", "branch": "release-22.05",
"description": "DEPRECATED! Use NixOS/nixpkgs repository instead.", "description": "Nix Packages collection",
"homepage": "https://github.com/NixOS/nixpkgs", "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d17d8ddc4c12bae0cd750eb2bb51ee813a5301", "rev": "7a1700745cc58f29003bd7ac43229a585dddde4f",
"sha256": "1n0dqvvjzq5iswdrn6hs3fsczy2cyd8d2riphnh8vsdkipc2nxxs", "sha256": "02f59hgfd7kwqgdgqn6vkf38pksxaknlb1rhrj2xzsvbpj44b9j7",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }