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

chore(logseq): use from unstable and drop flake input

Browse source
This commit is contained in:
steveej 2023-08-08 20:39:41 +02:00
parent 018c5fdef0
commit eaadacd8c7
3 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -330,18 +330,6 @@
"type": "github"
}
},
"logseqNightly": {
"flake": false,
"locked": {
"narHash": "sha256-xQid/L7eDf9Ie2pVULh8NA4u7Jr32Vd+HsTNL8PLRec=",
"type": "file",
"url": "https://github.com/logseq/logseq/releases/download/0.9.11/Logseq-linux-x64-0.9.11.AppImage"
},
"original": {
"type": "file",
"url": "https://github.com/logseq/logseq/releases/download/0.9.11/Logseq-linux-x64-0.9.11.AppImage"
}
},
"magmawm": {
"flake": false,
"locked": {
@ -557,6 +545,22 @@
"type": "github"
}
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1691472822,
"narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": {
"inputs": {
"flake-compat": "flake-compat_3",
@ -623,7 +627,6 @@
"flake-parts": "flake-parts",
"get-flake": "get-flake",
"jay": "jay",
"logseqNightly": "logseqNightly",
"magmawm": "magmawm",
"nixos-anywhere": "nixos-anywhere",
"nixpkgs": [
@ -632,6 +635,7 @@
"nixpkgs-2211": "nixpkgs-2211",
"nixpkgs-2305": "nixpkgs-2305",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"nixpkgs-wayland": "nixpkgs-wayland",
"ofi-pass": "ofi-pass",
"salut": "salut",

6
flake.nix
View file

@ -5,6 +5,7 @@
nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs.follows = "nixpkgs-2305";
flake-parts.url = "github:hercules-ci/flake-parts";
get-flake.url = "github:ursi/get-flake";
@ -66,11 +67,6 @@
url = "gitlab:snakedye/salut";
flake = false;
};
logseqNightly = {
url = "https://github.com/logseq/logseq/releases/download/0.9.11/Logseq-linux-x64-0.9.11.AppImage";
flake = false;
};
};
outputs = inputs @ {

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

@ -11,7 +11,7 @@
pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system};
# pkgs2211 = repoFlakeInputs'.nixpkgs-2211.legacyPackages;
pkgsUnstableSmallRepo = repoFlake.nixpkgs-unstable-small.${pkgs.system}.legacyPackages;
in {
imports = [
../profiles/common.nix
@ -240,13 +240,7 @@ in {
pcmanfm
# mendeley
evince
((pkgsMaster.logseq.overrideAttrs (finalAttrs: previousAttrs: {
version = "nightly";
src = repoFlake.inputs.logseqNightly;
}))
.override (_: {
electron = pkgs.electron_24;
}))
pkgsUnstableSmall.logseq
# File Synchronzation
maestral