diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index fb8e294..6c3cb17 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -88,7 +88,7 @@ _: { */ bitwarden.enable = false; # Bitwarden: password manager (desktop) iotas.enable = true; # Iotas: lightweight notes manager - logseq.enable = false; # Logseq: knowledge base and outliner + # appImages.logseq.enable = false; # Logseq: knowledge base and outliner /* Media & Graphics diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix index 2b5381a..db2cadf 100644 --- a/hosts/Garand-Laptop/system-modules.nix +++ b/hosts/Garand-Laptop/system-modules.nix @@ -88,7 +88,7 @@ _: { */ bitwarden.enable = false; # Bitwarden: password manager (desktop) iotas.enable = true; # Iotas: lightweight notes manager - logseq.enable = false; # Logseq: knowledge base and outliner + # appImages.logseq.enable = false; # Logseq: knowledge base and outliner /* Media & Graphics diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix index 4fb353d..c1cab76 100644 --- a/hosts/default/system-modules.nix +++ b/hosts/default/system-modules.nix @@ -88,7 +88,7 @@ _: { */ bitwarden.enable = false; # Bitwarden: password manager (desktop) iotas.enable = false; # Iotas: lightweight notes manager - logseq.enable = false; # Logseq: knowledge base and outliner + # appImages.logseq.enable = false; # Logseq: knowledge base and outliner /* Media & Graphics diff --git a/modules/core/packages/appimages/default.nix b/modules/core/packages/appimages/default.nix index f27688c..b825935 100644 --- a/modules/core/packages/appimages/default.nix +++ b/modules/core/packages/appimages/default.nix @@ -14,6 +14,7 @@ appImagePackages = { fluxer = pkgs.callPackage ./fluxer.nix {}; helium = pkgs.callPackage ./helium.nix {}; + # logseq = pkgs.callPackage ./logseq.nix {}; losslesscut = pkgs.callPackage ./losslesscut.nix {}; }; in { diff --git a/modules/core/packages/appimages/logseq.nix b/modules/core/packages/appimages/logseq.nix new file mode 100644 index 0000000..a3ca4f7 --- /dev/null +++ b/modules/core/packages/appimages/logseq.nix @@ -0,0 +1,40 @@ +{ + lib, + appimageTools, + fetchurl, +}: let + pname = "logseq"; + version = "0.10.15"; + hash = "sha256-i5EQUvSW1ix+8NT8nCs6mGH2B9xF7G4mB7vBhDJ7JdE="; + + src = fetchurl { + url = "https://github.com/logseq/logseq/releases/download/${version}/Logseq-linux-x64-${version}.AppImage"; + sha256 = hash; + }; + appimageContents = appimageTools.extract {inherit pname version src;}; + + iconSize = "512x512"; +in + appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + # mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/${iconSize}/apps/${pname}.png \ + $out/share/icons/hicolor/${iconSize}/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Logseq"; + homepage = "https://github.com/logseq/logseq"; + license = licenses.gpl3; + platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + maintainers = with lib.maintainers; [garand_plg]; + }; + } +# https://github.com/logseq/logseq/releases/download/0.10.15/Logseq-linux-x64-0.10.15.AppImage + diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 9b6f933..a3453ac 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -19,7 +19,7 @@ gnomeCalculator = gnome-calculator; gedit = gedit; iotas = iotas; - logseq = logseq; + # logseq = logseq; mattermost = mattermost-desktop; slack = slack; tutanota = tutanota-desktop;